diff --git a/module/kanban/control.php b/module/kanban/control.php index 923e54d155..299aa692f1 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -954,17 +954,10 @@ class kanban extends control */ public function setColumn($columnID, $executionID = 0, $from = 'kanban') { - $column = $this->kanban->getColumnById($columnID); + $column = $this->kanban->getColumnByID($columnID); if($_POST) { - /* Check lane column name is unique. */ - $exist = $this->kanban->getColumnByName($this->post->name, $column->lane); - if($exist and $exist->id != $columnID and $from != 'kanban') - { - return $this->sendError($this->lang->kanban->noColumnUniqueName); - } - $changes = $this->kanban->updateLaneColumn($columnID, $column); if(dao::isError()) return $this->sendError(dao::getError()); if($changes) diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 484c0196f3..11d0702197 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -140,7 +140,6 @@ $lang->kanban->laneColor = 'Lane Color'; $lang->kanban->setColumn = 'Column Settings'; $lang->kanban->columnName = 'Column Name'; $lang->kanban->columnColor = 'Column Color'; -$lang->kanban->noColumnUniqueName = 'The Kanban column name already exists.'; $lang->kanban->moveUp = 'Swimlane Up'; $lang->kanban->moveDown = 'Swimlane Down'; $lang->kanban->laneMove = 'Swimlane Move'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index c5ccff65c5..49cb9059ed 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -140,7 +140,6 @@ $lang->kanban->laneColor = '泳道颜色'; $lang->kanban->setColumn = '看板列设置'; $lang->kanban->columnName = '看板列名称'; $lang->kanban->columnColor = '看板列颜色'; -$lang->kanban->noColumnUniqueName = '看板列名称已存在'; $lang->kanban->moveUp = '泳道上移'; $lang->kanban->moveDown = '泳道下移'; $lang->kanban->laneMove = '泳道移动'; diff --git a/module/kanban/model.php b/module/kanban/model.php index d258680dfd..45febcc7db 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -343,7 +343,6 @@ class kanbanModel extends model foreach($data->name as $i => $name) { $childColumn = new stdclass(); - $childColumn->lane = $column->lane; $childColumn->parent = $column->id; $childColumn->region = $column->region; $childColumn->group = $column->group; @@ -2753,23 +2752,6 @@ class kanbanModel extends model return $column; } - /** - * Get Column by column name. - * - * @param string $name - * @param int $laneID - * @access public - * @return object - */ - public function getColumnByName($name, $laneID) - { - return $this->dao->select('*') - ->from(TABLE_KANBANCOLUMN) - ->where('name')->eq($name) - ->andWhere('lane')->eq($laneID) - ->fetch(); - } - /** * Get columns by object id. *