diff --git a/module/branch/control.php b/module/branch/control.php index 7e0a6c65d1..0181b053e6 100644 --- a/module/branch/control.php +++ b/module/branch/control.php @@ -258,22 +258,19 @@ class branch extends control */ public function ajaxGetBranches($productID, $oldBranch = 0, $param = '', $projectID = 0) { + $param = $param ? $param : 'all'; $product = $this->loadModel('product')->getById($productID); if(empty($product) or $product->type == 'normal') die(); - $branches = $this->branch->getPairs($productID, $param); - - /* Remove unlinked branches of the project. */ - if($projectID) + $branches = $this->loadModel('branch')->getList($productID, $projectID, $param); + $branchOption = array(); + $branchTagOption = array(); + foreach($branches as $branchInfo) { - $projectProducts = $this->loadModel('project')->getBranchesByProject($projectID); - foreach($branches as $branchID => $branchName) - { - if(!isset($projectProducts[$productID][$branchID])) unset($branches[$branchID]); - } + $branchOption[$branchInfo->id] = $branchInfo->name; + $branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : ''); } - - die(html::select('branch', $branches, $oldBranch, "class='form-control' onchange='loadBranch(this)'")); + die(html::select('branch', strpos($param, 'active') !== false ? $branchOption : $branchTagOption, $oldBranch, "class='form-control' onchange='loadBranch(this)'")); } /** diff --git a/module/branch/model.php b/module/branch/model.php index 4d27e1ed7e..4b1a59861d 100644 --- a/module/branch/model.php +++ b/module/branch/model.php @@ -85,6 +85,8 @@ class branchModel extends model $mainBranch->desc = sprintf($this->lang->branch->mainBranch, $this->lang->product->branchName[$product->type]); $mainBranch->order = 0; + if($productID) $product = $this->loadModel('product')->getById($productID); + if(isset($product) and $product->type == 'normal') return $branchList; return array($mainBranch) + $branchList; } diff --git a/module/bug/control.php b/module/bug/control.php index ae7ec573e1..87432af5c1 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -207,6 +207,16 @@ class bug extends control /* Display of branch label. */ $showBranch = $this->loadModel('branch')->showBranch($productID); + /* Display status of branch. */ + $branches = $this->loadModel('branch')->getList($productID, 0, 'all'); + $branchOption = array(); + $branchTagOption = array(); + foreach($branches as $branchInfo) + { + $branchOption[$branchInfo->id] = $branchInfo->name; + $branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : ''); + } + /* Set view. */ $this->view->title = $productName . $this->lang->colon . $this->lang->bug->common; $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $productName,'','title=' . $productName); @@ -229,7 +239,8 @@ class bug extends control $this->view->moduleID = $moduleID; $this->view->memberPairs = $this->user->getPairs('noletter|nodeleted'); $this->view->branch = $branch; - $this->view->branches = $this->loadModel('branch')->getPairs($productID); + $this->view->branchOption = $branchOption; + $this->view->branchTagOption = $branchTagOption; $this->view->executions = $executions; $this->view->plans = $this->loadModel('productplan')->getPairs($productID); $this->view->stories = $storyList; @@ -965,13 +976,17 @@ class bug extends control if($this->app->tab == 'execution' or $this->app->tab == 'project') { - $objectID = $this->app->tab == 'project' ? $bug->project : $bug->execution; - $productBranches = (isset($product->type) and $product->type != 'normal') ? $this->loadModel('execution')->getBranchByProduct($productID, $objectID, 'all') : array(); - $branches = isset($productBranches[$productID]) ? array(BRANCH_MAIN => $this->lang->branch->main) + $productBranches[$productID] : array(); + $objectID = $this->app->tab == 'project' ? $bug->project : $bug->execution; } - else + + /* Display status of branch. */ + $branches = $this->loadModel('branch')->getList($productID, isset($objectID) ? $objectID : 0, 'all'); + $branchOption = array(); + $branchTagOption = array(); + foreach($branches as $branchInfo) { - $branches = (isset($product->type) and $product->type != 'normal') ? $this->loadModel('branch')->getPairs($productID) : array(); + $branchOption[$branchInfo->id] = $branchInfo->name; + $branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : ''); } $this->view->bug = $bug; @@ -984,7 +999,8 @@ class bug extends control $this->view->currentModuleID = $currentModuleID; $this->view->executions = array(0 => '') + $this->product->getExecutionPairsByProduct($bug->product, $bug->branch, 'id_desc', $bug->project); $this->view->stories = $bug->execution ? $this->story->getExecutionStoryPairs($bug->execution) : $this->story->getProductStoryPairs($bug->product, $bug->branch); - $this->view->branches = $branches; + $this->view->branchOption = $branchOption; + $this->view->branchTagOption = $branchTagOption; $this->view->tasks = $this->task->getExecutionTaskPairs($bug->execution); $this->view->testtasks = $this->loadModel('testtask')->getPairs($bug->product, $bug->execution, $bug->testtask); $this->view->users = $this->user->getPairs('nodeleted', "$bug->assignedTo,$bug->resolvedBy,$bug->closedBy,$bug->openedBy"); @@ -1053,12 +1069,17 @@ class bug extends control $plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans; /* Set branches and modules. */ - $branches = array(); + $branches = array(); + $branchTagOption = array(); $modules = array(); if($product->type != 'normal') { - $branches = $this->loadModel('branch')->getPairs($productID); - foreach($branches as $branchID => $branchName) + $branches = $this->loadModel('branch')->getList($productID, 0 ,'all'); + foreach($branches as $branchInfo) + { + $branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : ''); + } + foreach($branchTagOption as $branchID => $branchName) { $modules[$productID][$branchID] = $this->tree->getOptionMenu($productID, 'bug', 0, $branchID); } @@ -1071,11 +1092,11 @@ class bug extends control /* Set product menu. */ $this->qa->setMenu($this->products, $productID, $branch); - $this->view->title = $product->name . $this->lang->colon . "BUG" . $this->lang->bug->batchEdit; - $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]); - $this->view->plans = $plans; - $this->view->branches = $branches; - $this->view->modules = $modules; + $this->view->title = $product->name . $this->lang->colon . "BUG" . $this->lang->bug->batchEdit; + $this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID&branch=$branch"), $this->products[$productID]); + $this->view->plans = $plans; + $this->view->branchTagOption = $branchTagOption; + $this->view->modules = $modules; } /* The bugs of my. */ else diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php index caad3f41c6..90affd48f8 100644 --- a/module/bug/view/batchedit.html.php +++ b/module/bug/view/batchedit.html.php @@ -76,14 +76,19 @@ if(!empty($this->config->user->moreLink)) $this->config->moreLinks["assignedTos[$bugID]"] = $this->config->user->moreLink; if(!$productID) { - $product = $this->product->getByID($bug->product); - $plans = $this->loadModel('productplan')->getPairs($bug->product, $branch); - $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id); + $branchTagOption = array(); + $product = $this->product->getByID($bug->product); + $plans = $this->loadModel('productplan')->getPairs($bug->product, $branch); + $branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getList($product->id, 0 ,'all');; + foreach($branches as $branchInfo) + { + $branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : ''); + } $modules[$bug->product][0] = $this->tree->getOptionMenu($bug->product, 'bug'); if($product->type != 'normal') { - foreach($branches as $branchID => $branchName) $branches[$branchID] = '/' . $product->name . '/' . $branchName; + foreach($branchTagOption as $branchID => $branchName) $branchTagOption[$branchID] = '/' . $product->name . '/' . $branchName; $modules[$bug->product][$bug->branch] = $this->tree->getOptionMenu($bug->product, 'bug', 0, $bug->branch); } } @@ -111,7 +116,7 @@ id;?> type == 'normal') ? "disabled='disabled'" : '';?> - branch, "class='form-control chosen' $disabled onchange='setBranchRelated(this.value, $bug->product, $bug->id)'");?> + branch, "class='form-control chosen' $disabled onchange='setBranchRelated(this.value, $bug->product, $bug->id)'");?> product][$bug->branch], $bug->module, "class='form-control chosen'");?> diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 589c59256b..3a5356ff2c 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -302,11 +302,11 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow { if($value->id == 'title' || $value->id == 'id' || $value->id == 'pri' || $value->id == 'status') { - $this->bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table'); + $this->bug->printCell($value, $bug, $users, $builds, $branchOption, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table'); } }?> - bug->printCell($value, $bug, $users, $builds, $branches, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');?> + bug->printCell($value, $bug, $users, $builds, $branchOption, $modulePairs, $executions, $plans, $stories, $tasks, $useDatatable ? 'datatable' : 'table');?> @@ -385,7 +385,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow session->currentProductType != 'normal'):?>
- 6;?> + 6;?>
@@ -393,13 +393,13 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
- +
$branchName) + foreach($branchTagOption as $branchID => $branchName) { $searchKey = $withSearch ? ('data-key="' . zget($branchsPinYin, $branchName, '') . '"') : ''; $actionLink = $this->createLink('bug', 'batchChangeBranch', "branchID=$branchID"); diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php index 1c1d21ae3e..6e35f16513 100644 --- a/module/bug/view/edit.html.php +++ b/module/bug/view/edit.html.php @@ -95,7 +95,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
- type != 'normal') echo html::select('branch', $branches, $bug->branch, "onchange='loadBranch();' class='form-control'");?> + type != 'normal') echo html::select('branch', $branchTagOption, $bug->branch, "onchange='loadBranch();' class='form-control'");?>
diff --git a/module/build/control.php b/module/build/control.php index 4dd0b32a2f..4433ef29cf 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -169,29 +169,23 @@ class build extends control $productGroups[$build->product] = $product; } - $branchGroups = $this->loadModel('project')->getBranchesByProject($build->execution); - $branchPairs = $this->loadModel('branch')->getPairs($build->product); - $products = array(); - $branches = array(); - - /* Set branches and products. */ - if($productGroups[$build->product]->type != 'normal' and isset($branchGroups[$build->product])) + /* Display status of branch. */ + $branches = $this->loadModel('branch')->getList($build->product, $build->execution, 'all'); + $branchTagOption = array(); + foreach($branches as $branchInfo) { - foreach($branchGroups[$build->product] as $branchID => $branch) - { - $branches[$branchID] = $branchPairs[$branchID]; - } + $branchTagOption[$branchInfo->id] = $branchInfo->name . ($branchInfo->status == 'closed' ? ' (' . $this->lang->branch->statusList['closed'] . ')' : ''); } foreach($productGroups as $product) $products[$product->id] = $product->name; - $this->view->title = $execution->name . $this->lang->colon . $this->lang->build->edit; - $this->view->position[] = html::a($this->createLink('execution', 'task', "executionID=$build->execution"), $execution->name); - $this->view->position[] = $this->lang->build->edit; - $this->view->product = isset($productGroups[$build->product]) ? $productGroups[$build->product] : ''; - $this->view->branches = $branches; - $this->view->executions = $executions; - $this->view->orderBy = $orderBy; + $this->view->title = $execution->name . $this->lang->colon . $this->lang->build->edit; + $this->view->position[] = html::a($this->createLink('execution', 'task', "executionID=$build->execution"), $execution->name); + $this->view->position[] = $this->lang->build->edit; + $this->view->product = isset($productGroups[$build->product]) ? $productGroups[$build->product] : ''; + $this->view->branchTagOption = $branchTagOption; + $this->view->executions = $executions; + $this->view->orderBy = $orderBy; $this->view->productGroups = $productGroups; $this->view->products = $products; diff --git a/module/build/view/edit.html.php b/module/build/view/edit.html.php index 1426cbe396..7745491568 100644 --- a/module/build/view/edit.html.php +++ b/module/build/view/edit.html.php @@ -35,7 +35,7 @@ productType != 'normal') { - echo "" . html::select('branch', $branches, $build->branch, "class='form-control chosen' $disabled"); + echo "" . html::select('branch', $branchTagOption, $build->branch, "class='form-control chosen' $disabled"); } ?>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 0daa262844..7d1bb57f52 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -621,45 +621,48 @@ $lang->release->methodOrder[75] = 'notify'; /* Kanban */ $lang->resource->kanban = new stdclass(); -$lang->resource->kanban->space = 'spaceCommon'; -$lang->resource->kanban->createSpace = 'createSpace'; -$lang->resource->kanban->editSpace = 'editSpace'; -$lang->resource->kanban->closeSpace = 'closeSpace'; -$lang->resource->kanban->deleteSpace = 'deleteSpace'; -$lang->resource->kanban->sortSpace = 'sortSpace'; -$lang->resource->kanban->create = 'create'; -$lang->resource->kanban->edit = 'edit'; -$lang->resource->kanban->view = 'view'; -$lang->resource->kanban->close = 'close'; -$lang->resource->kanban->delete = 'delete'; -$lang->resource->kanban->createRegion = 'createRegion'; -$lang->resource->kanban->editRegion = 'editRegion'; -$lang->resource->kanban->sortRegion = 'sortRegion'; -$lang->resource->kanban->sortGroup = 'sortGroup'; -$lang->resource->kanban->deleteRegion = 'deleteRegion'; -$lang->resource->kanban->createLane = 'createLane'; -$lang->resource->kanban->setLane = 'setLane'; -$lang->resource->kanban->sortLane = 'sortLane'; -$lang->resource->kanban->deleteLane = 'deleteLane'; -$lang->resource->kanban->createColumn = 'createColumn'; -$lang->resource->kanban->splitColumn = 'splitColumn'; -$lang->resource->kanban->restoreColumn = 'restoreColumn'; -$lang->resource->kanban->setColumn = 'setColumn'; -$lang->resource->kanban->setWIP = 'setWIP'; -$lang->resource->kanban->sortColumn = 'sortColumn'; -$lang->resource->kanban->deleteColumn = 'deleteColumn'; -$lang->resource->kanban->createCard = 'createCard'; -$lang->resource->kanban->editCard = 'editCard'; -$lang->resource->kanban->viewCard = 'viewCard'; -$lang->resource->kanban->sortCard = 'sortCard'; -$lang->resource->kanban->archiveCard = 'archiveCard'; -$lang->resource->kanban->assigntoCard = 'assigntoCard'; -$lang->resource->kanban->copyCard = 'copyCard'; -$lang->resource->kanban->deleteCard = 'deleteCard'; -$lang->resource->kanban->moveCard = 'moveCard'; -$lang->resource->kanban->setCardColor = 'setCardColor'; -$lang->resource->kanban->laneMove = 'laneMove'; -$lang->resource->kanban->cardsSort = 'cardsSort'; +$lang->resource->kanban->space = 'spaceCommon'; +$lang->resource->kanban->createSpace = 'createSpace'; +$lang->resource->kanban->editSpace = 'editSpace'; +$lang->resource->kanban->closeSpace = 'closeSpace'; +$lang->resource->kanban->deleteSpace = 'deleteSpace'; +$lang->resource->kanban->sortSpace = 'sortSpace'; +$lang->resource->kanban->create = 'create'; +$lang->resource->kanban->edit = 'edit'; +$lang->resource->kanban->view = 'view'; +$lang->resource->kanban->close = 'close'; +$lang->resource->kanban->delete = 'delete'; +$lang->resource->kanban->createRegion = 'createRegion'; +$lang->resource->kanban->editRegion = 'editRegion'; +$lang->resource->kanban->sortRegion = 'sortRegion'; +$lang->resource->kanban->sortGroup = 'sortGroup'; +$lang->resource->kanban->deleteRegion = 'deleteRegion'; +$lang->resource->kanban->createLane = 'createLane'; +$lang->resource->kanban->setLane = 'setLane'; +$lang->resource->kanban->sortLane = 'sortLane'; +$lang->resource->kanban->deleteLane = 'deleteLane'; +$lang->resource->kanban->createColumn = 'createColumn'; +$lang->resource->kanban->splitColumn = 'splitColumn'; +$lang->resource->kanban->archiveColumn = 'archiveColumn'; +$lang->resource->kanban->restoreColumn = 'restoreColumn'; +$lang->resource->kanban->setColumn = 'setColumn'; +$lang->resource->kanban->setWIP = 'setWIP'; +$lang->resource->kanban->sortColumn = 'sortColumn'; +$lang->resource->kanban->deleteColumn = 'deleteColumn'; +$lang->resource->kanban->createCard = 'createCard'; +$lang->resource->kanban->editCard = 'editCard'; +$lang->resource->kanban->viewCard = 'viewCard'; +$lang->resource->kanban->sortCard = 'sortCard'; +$lang->resource->kanban->archiveCard = 'archiveCard'; +$lang->resource->kanban->assigntoCard = 'assigntoCard'; +//$lang->resource->kanban->copyCard = 'copyCard'; +$lang->resource->kanban->deleteCard = 'deleteCard'; +$lang->resource->kanban->moveCard = 'moveCard'; +$lang->resource->kanban->setCardColor = 'setCardColor'; +$lang->resource->kanban->laneMove = 'laneMove'; +$lang->resource->kanban->cardsSort = 'cardsSort'; +$lang->resource->kanban->viewArchivedColumn = 'viewArchivedColumn'; +$lang->resource->kanban->viewArchivedCard = 'viewArchivedCard'; $lang->kanban->methodOrder[5] = 'space'; $lang->kanban->methodOrder[10] = 'createSpace'; @@ -693,13 +696,16 @@ $lang->kanban->methodOrder[140] = 'editCard'; $lang->kanban->methodOrder[145] = 'viewCard'; $lang->kanban->methodOrder[150] = 'sortCard'; $lang->kanban->methodOrder[155] = 'archivedCard'; -$lang->kanban->methodOrder[160] = 'copyCard'; +//$lang->kanban->methodOrder[160] = 'copyCard'; $lang->kanban->methodOrder[165] = 'deleteCard'; $lang->kanban->methodOrder[170] = 'assigntoCard'; $lang->kanban->methodOrder[175] = 'moveCard'; $lang->kanban->methodOrder[180] = 'setCardColor'; $lang->kanban->methodOrder[185] = 'laneMove'; $lang->kanban->methodorder[190] = 'cardsSort'; +$lang->kanban->methodOrder[195] = 'viewArchivedColumn'; +$lang->kanban->methodorder[200] = 'viewArchivedCard'; +$lang->kanban->methodorder[205] = 'archiveColumn'; /* Execution. */ $lang->resource->execution = new stdclass(); diff --git a/module/kanban/control.php b/module/kanban/control.php index 144a40882f..9c742337ff 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -583,7 +583,7 @@ class kanban extends control */ public function viewArchivedColumn($regionID) { - $columns = $this->kanban->getColumnsByRegion($regionID); + $columns = $this->kanban->getColumnsByObject('region', $regionID, '', ''); $columnsData = array(); foreach($columns as $column) { @@ -767,6 +767,54 @@ class kanban extends control } } + /** + * View archived cards. + * + * @param int $regionID + * @access public + * @return void + */ + public function viewArchivedCard($regionID) + { + $this->view->cards = $this->kanban->getCardsByObject('region', $regionID, 1); + $this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted'); + $this->view->usersAvatar = $this->user->getAvatarPairs(); + + $this->display(); + } + + /** + * Restore a card. + * + * @param int $cardID + * @param string $confirm no|yes + * @access public + * @return void + */ + public function restoreCard($cardID, $confirm = 'no') + { + if($confirm == 'no') + { + $card = $this->kanban->getCardByID($cardID); + $column = $this->dao->select('*')->from(TABLE_KANBANCOLUMN)->where('id')->eq($card->column)->fetch(); + if($column->archived) die(js::alert(sprintf($this->lang->kanbancard->confirmRestoreTip, $column->name))); + + die(js::confirm(sprintf($this->lang->kanbancard->confirmRestore, $column->name), $this->createLink('kanban', 'restoreCard', "cardID=$cardID&confirm=yes"), '')); + } + else + { + $this->kanban->restoreCard($cardID); + + $changes = $this->kanban->restoreCard($cardID); + if(dao::isError()) die(js::error(dao::getError())); + + $actionID = $this->loadModel('action')->create('kanbancard', $cardID, 'restore'); + $this->action->logHistory($actionID, $changes); + + die(js::reload('parent')); + } + } + /** * Delete a card. * diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 4372e4eb9d..5e777494a9 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -324,6 +324,7 @@ function renderKanbanItem(item, $item) if(!$item.hasClass('has-color') && needRemind) $time.css('background-color', 'rgba(210, 50, 61, 0.3)'); if($item.hasClass('has-color') && needRemind) $time.css('background-color', 'rgba(255, 255, 255, 0.3)'); + if(!needRemind) $time.css('background-color', 'rgba(0, 0, 0, 0.15)'); } /* Display avatars of assignedTo. */ diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index 3db5f33945..5b337dda8f 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -287,8 +287,10 @@ $lang->kanbancard->deadlineAB = 'DL'; $lang->kanbancard->beginAB = 'Begin'; $lang->kanbancard->to = 'to'; -$lang->kanbancard->confirmArchive = 'Are you sure to archive this card? After archiving the card, it will be hidden from the column and you can view it in the Region - Archived.'; -$lang->kanbancard->confirmDelete = 'Are you sure to delete this card? After deleting the card, it will be deleted from the Kanban. You can only view it in the system recycle bin.'; +$lang->kanbancard->confirmArchive = 'Are you sure to archive this card? After archiving the card, it will be hidden from the column and you can view it in the Region - Archived.'; +$lang->kanbancard->confirmDelete = 'Are you sure to delete this card? After deleting the card, it will be deleted from the Kanban. You can only view it in the system recycle bin.'; +$lang->kanbancard->confirmRestore = 'Are you sure you want to restore this card? After the card is restored, the card will be restored to the "%s" Kanban column.'; +$lang->kanbancard->confirmRestoreTip = "The card's column has been archived, please restore '%s' column first."; $lang->kanbancard->priList[1] = 1; $lang->kanbancard->priList[2] = 2; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 6657b20921..099189b0eb 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -79,12 +79,12 @@ $lang->kanban->createColumnOnRight = '在右侧添加看板列'; $lang->kanban->accessDenied = '您无权访问该看板'; $lang->kanban->confirmDelete = '您确认删除吗？'; -$lang->kanban->aclList['extend'] = '继承空间访问权限（能访问当前空间，即可访问）'; -$lang->kanban->aclList['private'] = '私有（看板团队成员、白名单、空间负责人可访问）'; - $lang->kanban->aclGroup['open'] = '公开'; $lang->kanban->aclGroup['private'] = '私有'; +$lang->kanban->aclList['extend'] = '继承空间访问权限（能访问当前空间，即可访问）'; +$lang->kanban->aclList['private'] = '私有（看板团队成员、白名单、空间负责人可访问）'; + $lang->kanban->enableArchived['0'] = '不启用'; $lang->kanban->enableArchived['1'] = '启用'; @@ -287,8 +287,10 @@ $lang->kanbancard->deadlineAB = '截止'; $lang->kanbancard->beginAB = '开始'; $lang->kanbancard->to = '至'; -$lang->kanbancard->confirmArchive = '您确认归档该卡片吗？归档卡片后，该卡片将从列中隐藏，您可以在区域-已归档中查看。'; -$lang->kanbancard->confirmDelete = '您确认删除该卡片吗？删除卡片后，该卡片将从看板中删除，您只能通过系统回收站查看。'; +$lang->kanbancard->confirmArchive = '您确认归档该卡片吗？归档卡片后，该卡片将从列中隐藏，您可以在区域-已归档中查看。'; +$lang->kanbancard->confirmDelete = '您确认删除该卡片吗？删除卡片后，该卡片将从看板中删除，您只能通过系统回收站查看。'; +$lang->kanbancard->confirmRestore = '您确定要还原该卡片吗？还原卡片后，该卡片将还原到“%s”看板列中。'; +$lang->kanbancard->confirmRestoreTip = '该卡片所属的看板列已被归档，请先还原“%s”看板列。'; $lang->kanbancard->priList[1] = 1; $lang->kanbancard->priList[2] = 2; diff --git a/module/kanban/model.php b/module/kanban/model.php index e97a1f17ef..d99acfffff 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -266,7 +266,7 @@ class kanbanModel extends model return false; } - $childColumns = $this->getColumnsByParent($column->parent); + $childColumns = $this->getColumnsByObject('parent', $column->parent); foreach($childColumns as $childColumn) { $limit += (int)$childColumn->limit; @@ -2055,6 +2055,29 @@ class kanbanModel extends model if(!dao::isError()) return common::createChanges($oldCard, $card); } + /** + * Restore a card. + * + * @param int $cardID + * @access public + * @return array + */ + public function restoreCard($cardID) + { + $oldCard = $this->getCardByID($cardID); + + $this->dao->update(TABLE_KANBANCARD) + ->set('archived')->eq(0) + ->set('archivedBy')->eq('') + ->set('archivedDate')->eq('') + ->where('id')->eq($cardID) + ->exec(); + + $card = $this->getCardByID($cardID); + + if(!dao::isError()) return common::createChanges($oldCard, $card); + } + /** * Get space by id. * @@ -2139,35 +2162,22 @@ class kanbanModel extends model } /** - * Get child columns by parent id. + * Get columns by object id. * - * @param int $parentID + * @param string $objectType + * @param int $objectID * @param string $archived * @param string $deleted * @access public * @return array */ - public function getColumnsByParent($parentID, $archived = '0', $deleted = '0') + public function getColumnsByObject($objectType = '', $objectID = 0, $archived = 0, $deleted = 0) { return $this->dao->select('*')->from(TABLE_KANBANCOLUMN) - ->where('parent')->eq($parentID) - ->andWhere('archived')->eq($archived) - ->andWhere('deleted')->eq($deleted) - ->orderBy('order') - ->fetchAll('id'); - } - - /** - * Get columns by region id. - * - * @param int $regionID - * @access public - * @return array - */ - public function getColumnsByRegion($regionID) - { - return $this->dao->select('*')->from(TABLE_KANBANCOLUMN) - ->where('region')->eq($regionID) + ->where(true) + ->beginIF($objectType)->andWhere($objectType)->eq($objectID)->fi() + ->beginIF($archived != '')->andWhere('archived')->eq($archived)->fi() + ->beginIF($deleted != '')->andWhere('deleted')->eq($deleted)->fi() ->orderBy('order') ->fetchAll('id'); } @@ -2246,6 +2256,27 @@ class kanbanModel extends model return $card; } + /** + * Get cards by object id. + * + * @param string $objectType + * @param int $objectID + * @param string $archived + * @param string $deleted + * @access public + * @return array + */ + public function getCardsByObject($objectType = '', $objectID = 0, $archived = 0, $deleted = 0) + { + return $this->dao->select('*')->from(TABLE_KANBANCARD) + ->where(true) + ->beginIF($objectType)->andWhere($objectType)->eq($objectID)->fi() + ->beginIF($archived != '')->andWhere('archived')->eq($archived)->fi() + ->beginIF($deleted != '')->andWhere('deleted')->eq($deleted)->fi() + ->orderBy('order') + ->fetchAll('id'); + } + /** * Get Kanban cards menus by execution id. * diff --git a/module/kanban/view/view.html.php b/module/kanban/view/view.html.php index a506053d72..01a5ebb44b 100644 --- a/module/kanban/view/view.html.php +++ b/module/kanban/view/view.html.php @@ -62,10 +62,20 @@ $canCreateLane = commonModel::hasPriv('kanban', 'createLane'); - + + + archived):?> + + +
    + ' . html::a("javascript:loadMore(\"Card\", $region->id)", '' . $this->lang->kanban->viewArchivedCard) . '';?> + ' . html::a("javascript:loadMore(\"Column\", $region->id)", '' . $this->lang->kanban->viewArchivedColumn) . '';?> +
+ +
    ' . html::a(inlink('viewArchivedCard', "", '', 1), '' . $this->lang->kanban->viewArchivedCard, '', 'class="iframe" data-toggle="modal" data-width="600px"') . '';?> ' . html::a(inlink('viewArchivedColumn', "", '', 1), '' . $this->lang->kanban->viewArchivedColumn, '', 'class="iframe" data-toggle="modal" data-width="600px"') . '';?> diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php new file mode 100644 index 0000000000..2e7133dac4 --- /dev/null +++ b/module/kanban/view/viewarchivedcard.html.php @@ -0,0 +1,108 @@ + + * @package kanban + * @version $Id: viewarchivedcard.html.php 935 2021-12-22 15:44:24Z $ + * @link https://www.zentao.net + */ +?> + +
    +
    + kanban->archivedCard;?> + +
    +
    + +
    +
    +
    + createLink('kanban', 'viewCard', "cardID=$card->id", '', true), $card->name, '', "class='cardName iframe' data-toggle='modal' data-width='80%' title='$card->name'");?> +
    + pri;?> + estimate and $card->estimate != 0) echo "{$card->estimate}h";?> + end) and !helper::isZeroDate($card->begin)):?> + begin)) . $lang->kanbancard->beginAB;?> + + begin) and !helper::isZeroDate($card->end)):?> + end)) . $lang->kanbancard->deadlineAB;?> + + begin) and !helper::isZeroDate($card->end)):?> + begin)) . ' ~ ' . date("m/d", strtotime($card->end));?> + + assignedTo); + $count = 0; + $members = ''; + ?> + $account) + { + if(!isset($users[$account])) + { + unset($assignedToList[$index]); + continue; + } + $members .= $users[$account] . ','; + } + $userCount = count($assignedToList); + ?> + 0):?> +
    + 4) continue; + echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account)); + $count ++; + } + ?> +
    + +
    +
    +
    +
    + id}", '',true), $lang->kanban->restore, '', "class='btn btn-xs btn-primary' target='hiddenwin'"); + + if($canDelete) echo html::a($this->createLink('kanban', 'deleteCard', "cardID=$card->id", '', true), $lang->delete, '', "class='btn btn-xs delete-card' target='hiddenwin'"); + ?> +
    +
    + +
    +
    + diff --git a/module/kanban/view/viewarchivedcolumn.html.php b/module/kanban/view/viewarchivedcolumn.html.php index 9ca7454db0..6d9cea00a7 100644 --- a/module/kanban/view/viewarchivedcolumn.html.php +++ b/module/kanban/view/viewarchivedcolumn.html.php @@ -13,7 +13,9 @@