diff --git a/module/kanban/control.php b/module/kanban/control.php index 6f979f87d2..f7ff435a1e 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -209,9 +209,10 @@ class kanban extends control if(!empty($_POST)) { $laneID = $this->kanban->createLane($kanbanID, $regionID, $lane = null); - if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); - - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'callback' => 'closeModalAndUpdateKanban', 'callback_params' => $regionID)); + $this->loadModel('action')->create('kanbanLane', $laneID, 'created'); + if(dao::isError()) die(js::error(dao::getError())); + + die(js::reload('parent.parent')); } $this->view->lanes = $this->kanban->getLanePairsByRegion($regionID); @@ -235,9 +236,9 @@ class kanban extends control $order = $position == 'left' ? $column->order : $column->order + 1; $columnID = $this->kanban->createColumn($column->region, null, $order); $this->loadModel('action')->create('kanbanColumn', $columnID, 'Created'); - if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); + if(dao::isError()) die(js::error(dao::getError())); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent', 'callback' => 'closeModalAndUpdateKanban', 'callback_params' => $column->region)); + die(js::reload('parent.parent')); } $this->view->title = $this->lang->kanban->createColumn; diff --git a/module/kanban/model.php b/module/kanban/model.php index d5ffbcd80f..e8b2adbaf8 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -826,7 +826,6 @@ class kanbanModel extends model $this->dao->insert(TABLE_KANBANLANE)->data($lane, $skip = 'mode,otherLane') ->batchCheck($this->config->kanban->require->createlane, 'notempty') ->autoCheck() - ->checkIF(!empty($lane->name), 'name', 'unique', "`type`='common'") ->exec(); if(dao::isError()) return false; @@ -835,7 +834,7 @@ class kanbanModel extends model return $laneID; } - + /* * Create a kanban. * diff --git a/module/kanban/view/createlane.html.php b/module/kanban/view/createlane.html.php index 3a5206b9de..72637b6004 100644 --- a/module/kanban/view/createlane.html.php +++ b/module/kanban/view/createlane.html.php @@ -32,10 +32,9 @@