diff --git a/module/execution/control.php b/module/execution/control.php index e81e4a00aa..3a0b650289 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1906,17 +1906,8 @@ class execution extends control /* Up to five closed executions are displayed. */ if($status == 'closed') { - if(isset($myExecutions[$status]) and count($myExecutions[$status]) >= 5) - { - $myExecutions[$status] = array_slice($myExecutions[$status], 0, 5, true); - $myExecutions[$status]['more'] = $this->lang->execution->showMore; - } - - if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) >= 5) - { - $kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 5, true); - $kanbanGroup[$projectID][$status]['more'] = $this->lang->execution->showMore; - } + if(isset($myExecutions[$status]) and count($myExecutions[$status]) >= 5) $myExecutions[$status] = array_slice($myExecutions[$status], 0, 5, true); + if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) >= 5) $kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 5, true); } } diff --git a/module/execution/view/executionkanban.html.php b/module/execution/view/executionkanban.html.php index a7b00d03f0..b4b7775a76 100644 --- a/module/execution/view/executionkanban.html.php +++ b/module/execution/view/executionkanban.html.php @@ -22,7 +22,7 @@ execution->doingProject . ' (' . $projectCount . ')';?> execution->kanbanColType as $status => $colName):?> - + @@ -45,21 +45,7 @@
- $execution):?> - -
- createLink('execution', 'all', "status=closed&projectID=$projectID"), $execution, '', "title='$execution'"); - } - else - { - echo "$execution"; - } - ?> -
- +
status == 'doing' and isset($execution->delay)) echo "style='border-left: 3px solid red';";?>>
@@ -85,7 +71,6 @@
-
diff --git a/module/repo/model.php b/module/repo/model.php index 4ec2ce457e..f7ac6b78e9 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -1790,6 +1790,7 @@ class repoModel extends model { $gitlab = $this->loadModel('gitlab')->getByID($repo->client); // The $repo->client is gitlabID. if(!$gitlab) return $repo; + $repo->gitlab = $gitlab->id; $repo->project = $repo->path; // The projectID in gitlab. $repo->path = sprintf($this->config->repo->gitlab->apiPath, $gitlab->url, $repo->path);