diff --git a/config/config.php b/config/config.php index a1d4e73760..4b1b010146 100644 --- a/config/config.php +++ b/config/config.php @@ -180,4 +180,8 @@ $extConfigFiles = glob(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'ext/*.php'); if($extConfigFiles) foreach($extConfigFiles as $extConfigFile) include $extConfigFile; /* Set version. */ -if($config->edition != 'open') $config->version = $config->edition . $config->{$config->edition . 'Version'}; +if($config->edition != 'open') +{ + $config->version = $config->edition . $config->{$config->edition . 'Version'}; + if($config->edition != 'max') unset($config->maxVersion); +} diff --git a/extension/lite/project/ext/control/execution.php b/extension/lite/project/ext/control/execution.php index 2e78ca1e4f..e989151d0c 100644 --- a/extension/lite/project/ext/control/execution.php +++ b/extension/lite/project/ext/control/execution.php @@ -3,6 +3,10 @@ class project extends control { public function execution($status = 'all', $projectID = 0, $orderBy = 'order_asc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1) { + $projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram()); + if($projectID == 0 and common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'create')); + if($projectID == 0 and !common::hasPriv('project', 'create')) $this->locate($this->createLink('project', 'browse')); + $this->project->setMenu($projectID); $kanbanList = $this->loadModel('execution')->getList($projectID, 'all', $status); diff --git a/module/action/css/trash.css b/module/action/css/trash.css index afbfc580cc..ff85a6179a 100755 --- a/module/action/css/trash.css +++ b/module/action/css/trash.css @@ -1,3 +1,4 @@ + .table-footer .table-actions {width: auto; visibility: visible; opacity: 1;} .table-footer .table-actions .text {line-height: 28px;} table tbody tr td {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;} diff --git a/module/execution/control.php b/module/execution/control.php index ee091e030e..32d065e62d 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1394,7 +1394,10 @@ class execution extends control $this->loadModel('kanban')->createRDKanban($execution); if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); - if($this->app->tab == 'project') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('project', 'index', "projectID=$projectID"))); + + $link= $this->config->vision != 'lite' ? $this->createLink('project', 'index', "projectID=$projectID") : $this->createLink('project', 'execution', "status=all&projectID=$projectID"); + if($this->app->tab == 'project') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $link)); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('kanban', "executionID=$executionID"))); }