diff --git a/module/admin/model.php b/module/admin/model.php index ab4b229f6c..3a7f8492a6 100755 --- a/module/admin/model.php +++ b/module/admin/model.php @@ -521,11 +521,14 @@ class adminModel extends model $searchType = $type == 'plugin' ? 'byModule,offcial' : 'byModule'; $param = $type == 'plugin' ? '' : 'MTIxOA=='; $extensions = $this->loadModel('extension')->getExtensionsByAPI($searchType, $param, 0, $limit); - $plugins = isset($extensions->extensions) ? (array)$extensions->extensions : array(); - foreach($plugins as $id => $plugin) + $extensions = isset($extensions->extensions) ? (array)$extensions->extensions : array(); + $plugins = array(); + foreach($extensions as $extension) { - $plugin->viewLink = str_replace(array('info', 'client'), '', $plugin->viewLink); - if($type == 'patch' and !isset($plugin->compatibleRelease)) unset($plugins[$id]); + if($type == 'patch' and !isset($extension->compatibleRelease)) continue; + + $extension->viewLink = str_replace(array('info', 'client'), '', $extension->viewLink); + $plugins[] = $extension; } } else diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 138180d569..7c8103e77c 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -385,7 +385,10 @@ tbody tr td:first-child input {display: none;} execution):?> build->project :($executionType ? $lang->build->executionAB : $lang->build->execution);?> - execution);?> + + execution);?> + + diff --git a/module/execution/control.php b/module/execution/control.php index 4abc731974..153deec30c 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2633,11 +2633,14 @@ class execution extends control $this->session->set('execGroupBy', $groupBy); $this->session->set('storyList', $this->app->getURI(true), 'execution'); $this->session->set('rdSearchValue', ''); - $this->session->set('execLaneType', $browseType); $features = $this->execution->getExecutionFeatures($execution); $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $browseType, $orderBy, 0, $groupBy); + /* Set lane type. */ + if(!$features['story'] and !$features['qa']) $browseType = 'task'; + $this->session->set('execLaneType', $browseType); + /* Remove lanes if no feature. */ foreach($kanbanData as $regionID => $region) { @@ -2736,7 +2739,6 @@ class execution extends control $uri = $this->app->getURI(true); $this->app->session->set('taskList', $uri, 'execution'); $this->app->session->set('bugList', $uri, 'qa'); - $this->app->session->set('execLaneType', $browseType); $this->app->session->set('execGroupBy', $groupBy); /* Load language. */ @@ -2755,6 +2757,8 @@ class execution extends control unset($this->lang->kanban->group->task['story']); } + $this->app->session->set('execLaneType', $browseType); + if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'id_asc'; $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, '', $orderBy); diff --git a/module/programplan/model.php b/module/programplan/model.php index 88db39867e..0d4782686f 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -715,7 +715,7 @@ class programplanModel extends model $project = $this->loadModel('project')->getByID($projectID); $setCode = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false; - $sameCodes = $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : ''); + $sameCodes = $setCode ? $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '') : false; $datas = array(); foreach($names as $key => $name)