* Fix bug #18663.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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 = '泳道移动';
|
||||
|
||||
@@ -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.
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user