Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Code for task#59544.

Browse Source
This commit is contained in:
xieqiyu
2022-07-05 16:56:06 +08:00
parent c9db63d869
commit 44c9af6d18
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+17 -9
View File
@@ -650,7 +650,10 @@ class kanban extends control
if(dao::isError()) $this->send(array('message' => dao::getError(), 'result' => 'fail'));
$this->loadModel('action')->create('kanbanColumn', $columnID, 'Created');
$this->send(array('message' => $this->lang->saveSuccess, 'result' => 'success', '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->view->title = $this->lang->kanban->createColumn;
@@ -662,21 +665,21 @@ class kanban extends control
/**
* Split column.
*
* @param int $regionID
* @param int $kanbanID
* @param int $columnID
* @access public
* @return void
*/
public function splitColumn($regionID, $kanbanID, $columnID)
public function splitColumn($columnID)
{
if(!empty($_POST))
{
$this->kanban->splitColumn($columnID);
if(dao::isError()) $this->send(array('message' => dao::getError(), 'result' => 'fail'));
$kanbanGroup = $this->kanban->getKanbanData($kanbanID, $regionID);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => array('target' => 'parent', 'name' => 'updateRegion', 'params' => array($regionID, $kanbanGroup))));
$column = $this->kanban->getColumnById($columnID);
$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->display();
@@ -716,8 +719,10 @@ class kanban extends control
$this->loadModel('action')->create('kanbancolumn', $columnID, 'archived');
if(isonlybody()) return print(js::reload('parent.parent'));
return print(js::reload('parent'));
$region = $this->kanban->getRegionByID($column->region);
$kanbanGroup = $this->kanban->getKanbanData($region->kanban, $region->id);
$kanbanGroup = json_encode($kanbanGroup);
return print("<script>parent.updateRegion({$column->region}, $kanbanGroup)</script>");
}
}
@@ -800,7 +805,10 @@ class kanban extends control
$this->dao->delete()->from(TABLE_KANBANCOLUMN)->where('id')->eq($columnID)->exec();
return print(js::reload('parent'));
$region = $this->kanban->getRegionByID($column->region);
$kanbanGroup = $this->kanban->getKanbanData($region->kanban, $region->id);
$kanbanGroup = json_encode($kanbanGroup);
return print("<script>parent.updateRegion({$column->region}, $kanbanGroup)</script>");
}
}
module/kanban/js/view.js
+1 -3
View File
@@ -1280,9 +1280,7 @@ function createColumnMenu(options)
items.push({type: 'divider'});
}
var regionID = column.$kanbanData.region;
var kanbanID = column.$kanbanData.kanban;
if(privs.includes('splitColumn')) items.push({label: kanbanLang.splitColumn, icon: 'col-split', url: createLink('kanban', 'splitColumn', 'regionID=' + regionID + '&kanbanID=' + kanbanID + '&columnID=' + column.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal'}});
if(privs.includes('splitColumn')) items.push({label: kanbanLang.splitColumn, icon: 'col-split', url: createLink('kanban', 'splitColumn', 'columnID=' + column.id, '', true), className: 'iframe', attrs: {'data-toggle': 'modal'}});
if(privs.includes('createColumn'))
{
items.push({label: kanbanLang.createColumnOnLeft, icon: 'col-add-left', url: createLink('kanban', 'createColumn', 'columnID=' + column.id + '&position=left'), className: 'iframe', attrs: {'data-toggle': 'modal'}});