diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index 8943fab585..079b48cd71 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -325,6 +325,33 @@ function updateLaneName(laneID, name) $('.kanban-lane[data-id="' + laneID + '"] > .kanban-lane-name > span').text(name); } +/** + * Update lane color. + * + * @param int $laneID + * @param string $color + * @access public + * @return void + */ +function updateLaneColor(laneID, color) +{ + $('.kanban-lane[data-id="' + laneID + '"] > .kanban-lane-name').css('background-color', color); +} + +/** + * Update column name. + * + * @param int $columnID + * @param string $name + * @param string $color + * @access public + * @return void + */ +function updateColumnName(columnID, name, color) +{ + $('.kanban-col[data-id="' + columnID + '"] > div.title > span:first').text(name).css('color', color); +} + /** * Hide kanban action */ diff --git a/module/kanban/control.php b/module/kanban/control.php index 9d31f8fc74..f83a5f6b8a 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1493,7 +1493,9 @@ class kanban extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, $regionID)")); } - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); + $region = $this->kanban->getRegionByID($column->region); + $kanbanGroup = $this->kanban->getKanbanData($region->kanban, $region->id); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => array('target' => 'parent', 'name' => 'updateRegion', 'params' => array($column->region, $kanbanGroup)))); } $this->app->loadLang('story'); @@ -1590,7 +1592,7 @@ class kanban extends control $this->loadModel('action')->create('kanbanlane', $laneID, 'Edited', '', $executionID); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent')); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => array('target' => 'parent', 'name' => 'updateLaneColor', 'params' => array($laneID, $this->post->color)))); } $lane = $this->kanban->getLaneById($laneID); @@ -1625,19 +1627,8 @@ class kanban extends control $this->action->logHistory($actionID, $changes); } - if($from == 'RDKanban') - { - if(dao::isError()) return $this->sendError(dao::getError()); - $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all'; - $execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default'; - $regionID = $execGroupBy == 'default' ? $column->region : 0; - $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', $regionID, $execGroupBy); - $kanbanData = json_encode($kanbanData); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, $regionID)")); - } - - return $this->sendSuccess(array('locate' => 'parent')); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => array('target' => 'parent', 'name' => 'updateColumnName', 'params' => array($columnID, $this->post->name, $this->post->color)))); } $this->view->canEdit = $from == 'RDKanban' ? 0 : 1; diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 2c28854bee..b6bd322297 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -925,6 +925,33 @@ function updateLaneName(laneID, name) $('.kanban-lane[data-id="' + laneID + '"] > .kanban-lane-name > span').text(name); } +/** + * Update lane color. + * + * @param int $laneID + * @param string $color + * @access public + * @return void + */ +function updateLaneColor(laneID, color) +{ + $('.kanban-lane[data-id="' + laneID + '"] > .kanban-lane-name').css('background-color', color); +} + +/** + * Update column name. + * + * @param int $columnID + * @param string $name + * @param string $color + * @access public + * @return void + */ +function updateColumnName(columnID, name, color) +{ + $('.kanban-col[data-id="' + columnID + '"] > div.title > span:first').text(name).css('color', color); +} + /** * Hide kanban action */