From b003002dadb6723b0e63a19425792ccefdd855f7 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 9 Apr 2021 16:40:37 +0800 Subject: [PATCH 1/5] * Fix delete link. --- module/doc/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/doc/control.php b/module/doc/control.php index 778b899373..c51d41e5c1 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -622,6 +622,7 @@ class doc extends control { $doc = $this->doc->getByID($docID); $objectType = $this->dao->select('type')->from(TABLE_DOCLIB)->where('id')->eq($doc->lib)->fetch('type'); + if($this->config->systemMode == 'classic' and $objectType == 'project') $objectType = 'execution'; $this->doc->delete(TABLE_DOC, $docID); /* if ajax request, send result. */ From d348f06080c86b7644ba86fe823259755fdeb9bd Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Fri, 9 Apr 2021 16:42:02 +0800 Subject: [PATCH 2/5] * Adjust the code. --- module/doc/view/editlib.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index 95c72e7bee..b6bb6b2e87 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -43,7 +43,7 @@ doclib->control;?> - type == 'product' or $lib->type == 'execution' or $config->systemMode == 'classic'):?> + type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom' )):?> doclib->aclListA, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'")?> doc->noticeAcl['lib'][$lib->type][$lib->acl];?> From 6d4e721cc63423c590f16e3bf284b206f3688ae2 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Fri, 9 Apr 2021 16:44:10 +0800 Subject: [PATCH 3/5] * Fix bug #11926. --- module/doc/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/doc/control.php b/module/doc/control.php index 778b899373..b7459f15ff 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -243,6 +243,7 @@ class doc extends control $libTypeList = $this->lang->doc->libTypeList; if(empty($products)) unset($libTypeList['product']); + if(empty($projects)) unset($libTypeList['project']); if(empty($executions)) unset($libTypeList['execution']); $this->view->groups = $this->loadModel('group')->getPairs(); From f5dde0e5df5611ebd49762403eec5388fa76a77d Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 9 Apr 2021 16:46:23 +0800 Subject: [PATCH 4/5] * Fix bug. --- module/common/lang/menu.php | 2 +- module/execution/control.php | 1 - module/execution/view/all.html.php | 14 -------------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index b8d444dc72..93b651e7c2 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -226,7 +226,7 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang-> /* Execution menu. */ $lang->execution->homeMenu = new stdclass(); if($config->systemMode == 'new') $lang->execution->homeMenu->index = "$lang->dashboard|execution|index|"; -$lang->execution->homeMenu->list = array('link' => "{$lang->executionCommon}|execution|all|", 'alias' => 'create,batchedit'); +$lang->execution->homeMenu->list = array('link' => "{$lang->executionCommon}列表|execution|all|", 'alias' => 'create,batchedit'); $lang->execution->menu = new stdclass(); $lang->execution->menu->task = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug'); diff --git a/module/execution/control.php b/module/execution/control.php index 333563729a..e5a9b240ff 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2723,7 +2723,6 @@ class execution extends control $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->status = $status; $this->view->from = $from; - $this->view->projectTree = $this->project->getTreeMenu(0, array('projectmodel', 'createManageLink'), 0, 'list'); $this->display(); } diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index 8da52f0ef8..1aefbfff89 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -27,14 +27,6 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}
- - -
' data-ride='table'> From dc0b429db4aef3bc453cfda6257ea2a068530f22 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Fri, 9 Apr 2021 11:47:15 +0300 Subject: [PATCH 5/5] * Fix bug. --- module/execution/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/control.php b/module/execution/control.php index e5a9b240ff..4910f1a1e6 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2287,7 +2287,7 @@ class execution extends control $products = $this->project->getProducts($objectID); $browseLink = $this->createLink($this->app->openApp == 'project' ? 'projectstory' : 'execution', 'story', "objectID=$objectID"); - $this->session->set('storyList', $this->app->getURI(true), 'product'); // Save session. + $this->session->set('storyList', $this->app->getURI(true), $this->app->openApp); // Save session. /* Only execution can have no products. */ if(empty($products))