diff --git a/module/bug/control.php b/module/bug/control.php index a9e5a910d5..421c991ae1 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -380,7 +380,7 @@ class bug extends control if(isset($output['executionID']) and isonlybody()) { $executionID = $this->post->execution ? $this->post->execution : $output['executionID']; - if($executionID == $output['executionID']) + if($executionID == $output['executionID'] and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -672,7 +672,7 @@ class bug extends control if(isonlybody() and $executionID) { $execution = $this->loadModel('execution')->getByID($executionID); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -1186,7 +1186,7 @@ class bug extends control { $bug = $this->bug->getById($bugID); $execution = $this->loadModel('execution')->getByID($bug->execution); - if(isset($execution->type) and $execution->type == 'kanban') + if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -1477,7 +1477,7 @@ class bug extends control if(isonlybody()) { $execution = $this->loadModel('execution')->getByID($bug->execution); - if(isset($execution->type) and $execution->type == 'kanban') + if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { $regionID = isset($output['regionID']) ? $output['regionID'] : 0; $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID); @@ -1574,7 +1574,7 @@ class bug extends control if(isonlybody()) { $execution = $this->loadModel('execution')->getByID($bug->execution); - if(isset($execution->type) and $execution->type == 'kanban') + if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { $regionID = isset($output['regionID']) ? $output['regionID'] : 0; $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID); @@ -1632,7 +1632,7 @@ class bug extends control if(isonlybody()) { $execution = $this->loadModel('execution')->getByID($bug->execution); - if(isset($execution->type) and $execution->type == 'kanban') + if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution') { $regionID = isset($output['regionID']) ? $output['regionID'] : 0; $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID); diff --git a/module/story/control.php b/module/story/control.php index 553550743c..39c5db8eb8 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -160,7 +160,7 @@ class story extends control if(isonlybody()) { $execution = $this->execution->getByID($this->session->execution); - if($this->app->tab == 'execution' and $execution->type == 'kanban') + if($this->app->tab == 'execution' and $execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -443,7 +443,7 @@ class story extends control if(isonlybody()) { $execution = $this->execution->getByID($this->session->execution); - if($this->app->tab == 'execution' and $execution->type == 'kanban') + if($this->app->tab == 'execution' and $execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -952,7 +952,7 @@ class story extends control if(isonlybody()) { $execution = $this->execution->getByID($this->session->execution); - if($this->app->tab == 'execution' and $execution->type == 'kanban') + if($this->app->tab == 'execution' and $execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -1020,7 +1020,7 @@ class story extends control if(isonlybody()) { $execution = $this->execution->getByID($this->session->execution); - if($this->app->tab == 'execution' and $execution->type == 'kanban') + if($this->app->tab == 'execution' and $execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -1313,7 +1313,7 @@ class story extends control if(isonlybody()) { $execution = $this->execution->getByID($this->session->execution); - if($this->app->tab == 'execution' and $execution->type == 'kanban') + if($this->app->tab == 'execution' and $execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -1661,7 +1661,7 @@ class story extends control if(isonlybody()) { $execution = $this->execution->getByID($this->session->execution); - if($this->app->tab == 'execution' and $execution->type == 'kanban') + if($this->app->tab == 'execution' and $execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); diff --git a/module/task/control.php b/module/task/control.php index d90eb0eccd..cc8865b957 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -148,7 +148,7 @@ class task extends control /* If link from no head then reload. */ if(isonlybody()) { - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->kanban->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -324,7 +324,7 @@ class task extends control /* If link from no head then reload. */ if(isonlybody()) { - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -453,7 +453,7 @@ class task extends control if(isonlybody()) { $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -667,7 +667,7 @@ class task extends control { $task = $this->task->getById($taskID); $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -911,7 +911,7 @@ class task extends control if(isonlybody()) { $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $regionID = isset($output['regionID']) ? $output['regionID'] : 0; $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID); @@ -973,7 +973,7 @@ class task extends control if(isonlybody()) { $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -1106,7 +1106,7 @@ class task extends control if(isonlybody()) { $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $regionID = isset($output['regionID']) ? $output['regionID'] : 0; $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, 'all', 'id_desc', $regionID); @@ -1194,7 +1194,7 @@ class task extends control { $task = $this->task->getById($taskID); $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $regionID = isset($output['regionID']) ? $output['regionID'] : 0; $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID); @@ -1250,7 +1250,7 @@ class task extends control { $task = $this->task->getById($taskID); $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all'); $kanbanData = json_encode($kanbanData); @@ -1308,7 +1308,7 @@ class task extends control { $task = $this->task->getById($taskID); $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $regionID = isset($output['regionID']) ? $output['regionID'] : 0; $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID); @@ -1459,7 +1459,7 @@ class task extends control { $task = $this->task->getById($taskID); $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $regionID = isset($output['regionID']) ? $output['regionID'] : 0; $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID); @@ -1515,7 +1515,7 @@ class task extends control { $task = $this->task->getById($taskID); $execution = $this->execution->getByID($task->execution); - if($execution->type == 'kanban') + if($execution->type == 'kanban' and $this->app->tab == 'execution') { $regionID = isset($output['regionID']) ? $output['regionID'] : 0; $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);