diff --git a/module/execution/control.php b/module/execution/control.php index 05942a0b62..771e3dbdcd 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2415,7 +2415,6 @@ class execution extends control $this->executeHooks($executionID); if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess)); - if($execution->type == 'kanban') return print(js::locate($this->createLink('execution', 'all'), 'parent')); return print(js::reload('parent')); } } diff --git a/module/project/control.php b/module/project/control.php index 2a4a11c92b..509f6881fd 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -530,6 +530,7 @@ class project extends control $project = $this->project->getByID($projectID); $programID = $project->parent; $this->project->setMenu($projectID); + if($project->model == 'kanban') unset($this->lang->project->authList['reset']); if($_POST) { diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php index af33d3f907..19dacca827 100644 --- a/module/project/view/index.html.php +++ b/module/project/view/index.html.php @@ -84,13 +84,13 @@
- 2) break;?> + 1) break;?>
$usersAvatar[$member->account], 'account' => $member->account)); ?>
- 4):?> + 3):?> …';?>
diff --git a/module/story/control.php b/module/story/control.php index fba1104b49..fdb6c9dd43 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -115,8 +115,7 @@ class story extends control } else { - $cell = $this->dao->select('lane,`column`')->from(TABLE_KANBANCELL)->where('type')->eq('story')->andWhere('kanban')->eq($objectID)->fetch(); - $this->loadModel('kanban')->addKanbanCell($objectID, $cell->lane, $cell->column, 'story', $storyID); + $this->loadModel('kanban')->updateLane($objectID, 'story'); } } if($storyResult['status'] == 'exists')