* Code for task#47995.

This commit is contained in:
xieqiyu
2022-01-21 13:17:56 +08:00
parent 2bfd25b610
commit fdaf47943e
4 changed files with 10 additions and 3 deletions
+3 -1
View File
@@ -800,6 +800,7 @@ class kanban extends control
return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent'));
}
/* Get cards to imported. */
$cards2Imported = array();
if($selectedKanbanID)
{
@@ -820,11 +821,12 @@ class kanban extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
$cards2Imported = array_chunk($cards2Imported, $pager->recPerPage);
/* Find Kanban other than this kanban. */
$kanbanPairs = $this->kanban->getKanbanPairs();
unset($kanbanPairs[$kanbanID]);
$this->view->cards2Imported = empty($cards2Imported) ? $cards2Imported : $cards2Imported[$pageID - 1];
$this->view->kanbanPairs = array(0 => $this->lang->kanban->all) + $kanbanPairs;
$this->view->kanbanPairs = array($this->lang->kanban->all) + $kanbanPairs;
$this->view->lanePairs = $this->kanban->getLanePairsByGroup($groupID);
$this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted');
$this->view->pager = $pager;
+5
View File
@@ -58,6 +58,8 @@ $lang->kanban->restoreCard = 'Restore Card';
$lang->kanban->restore = 'Restore';
$lang->kanban->child = 'Child';
$lang->kanban->showClosed = 'Closed';
$lang->kanban->importCard = 'Import Card';
$lang->kanban->all = 'All Kanban';
/* Fields. */
$lang->kanban->space = 'Space';
@@ -87,6 +89,9 @@ $lang->kanban->accessDenied = "You have no access to the kanban.";
$lang->kanban->confirmDelete = 'Do you want to delete this?';
$lang->kanban->cardCountTip = 'Please enter the number of cards';
$lang->kanban->selectedKanban = 'Please select Kanban';
$lang->kanban->selectedLane = 'Target Lane';
$lang->kanban->aclGroup['open'] = 'Open';
$lang->kanban->aclGroup['private'] = 'Private';
$lang->kanban->aclGroup['extend'] = 'Extend';
+1 -1
View File
@@ -90,7 +90,7 @@ $lang->kanban->confirmDelete = '您确认删除吗?';
$lang->kanban->cardCountTip = '请输入卡片数量';
$lang->kanban->selectedKanban = '请选择看板';
$lang->kanban->selectedLane = '请选择泳道';
$lang->kanban->selectedLane = '目标泳道';
$lang->kanban->aclGroup['open'] = '公开';
$lang->kanban->aclGroup['private'] = '私有';
+1 -1
View File
@@ -3008,7 +3008,7 @@ class kanbanModel extends model
* @access public
* @return array
*/
public function getCardsByObject($objectType = '', $objectID = 0, $archived = 0, $deleted = '0')
public function getCardsByObject($objectType = '', $objectID = 0, $archived = '0', $deleted = '0')
{
return $this->dao->select('*')->from(TABLE_KANBANCARD)
->where(true)