From 82062bbe8a3b4d725910280a19da7736cce8320b Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 1 Apr 2021 13:26:13 +0800 Subject: [PATCH 01/27] * The classic version mode lists the execution list. --- module/common/lang/en.php | 2 ++ module/common/lang/menu.php | 4 ++-- module/common/lang/zh-cn.php | 2 ++ module/common/model.php | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index fc526f6573..ad78f5a4e1 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -208,6 +208,8 @@ $lang->my->work = 'Work'; $lang->project->list = 'Project List'; +$lang->execution->list = "{$lang->executionCommon} List"; + $lang->doc->recent = 'Recent'; $lang->doc->my = 'My'; $lang->doc->favorite = 'Favorite'; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 9aa7e71463..0f3515c215 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -214,8 +214,8 @@ $lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang-> /* Execution menu. */ $lang->execution->homeMenu = new stdclass(); -$lang->execution->homeMenu->index = "$lang->dashboard|execution|index|"; -$lang->execution->homeMenu->list = array('link' => "{$lang->execution->common}|execution|all|", 'alias' => 'create,batchedit'); +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->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/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 846c180d78..cefb5ce79d 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -208,6 +208,8 @@ $lang->my->work = '待处理'; $lang->project->list = '项目列表'; +$lang->execution->list = "{$lang->executionCommon}列表"; + $lang->doc->recent = '最近文档'; $lang->doc->my = '我的文档'; $lang->doc->favorite = '我的收藏'; diff --git a/module/common/model.php b/module/common/model.php index c7af0d1ff3..0ea55d87c7 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -519,6 +519,7 @@ class commonModel extends model public static function printHomeButton($openApp) { global $lang; + global $config; if(!$openApp) return; $icon = zget($lang->navIcons, $openApp, ''); @@ -527,6 +528,7 @@ class commonModel extends model { $nav = $lang->mainNav->$openApp; list($title, $currentModule, $currentMethod, $vars) = explode('|', $nav); + if($openApp == 'execution') $currentMethod = 'all'; } else { @@ -535,7 +537,7 @@ class commonModel extends model if($openApp == 'product') $currentMethod = 'all'; } - $link = $openApp != 'execution' ? helper::createLink($currentModule, $currentMethod) : ''; + $link = ($openApp != 'execution' or ($config->systemMode == 'classic')) ? helper::createLink($currentModule, $currentMethod) : ''; $html = $link ? html::a($link, "$icon {$lang->$openApp->common}", '', "class='btn'") : "$icon {$lang->$openApp->common}"; echo "
" . $html . '
'; From 8da3e5ed4a6090c70c94ef27bb49d74d412db95d Mon Sep 17 00:00:00 2001 From: zhujinyong Date: Thu, 1 Apr 2021 13:29:11 +0800 Subject: [PATCH 02/27] - Remove sidebar and header in doc module. --- module/common/lang/menu.php | 28 ++++++++++---------- module/doc/control.php | 21 ++++++++++----- module/doc/css/common.css | 1 - module/doc/view/browse.html.php | 46 ++------------------------------- module/doc/view/index.html.php | 1 - 5 files changed, 31 insertions(+), 66 deletions(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 9aa7e71463..9821fa8322 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -316,24 +316,24 @@ $lang->devops->menuOrder[25] = 'rules'; /* Doc menu.*/ $lang->doc->menu = new stdclass(); -$lang->doc->menu->recent = array('link' => "{$lang->doc->recent}|doc|recent"); -$lang->doc->menu->my = array('link' => "{$lang->doc->my}|doc|my"); -$lang->doc->menu->favorite = array('link' => "{$lang->doc->favorite}|doc|favorite"); -$lang->doc->menu->product = array('link' => "{$lang->doc->product}|doc|product"); -$lang->doc->menu->project = array('link' => "{$lang->doc->project}|doc|project"); -$lang->doc->menu->custom = array('link' => "{$lang->doc->custom}|doc|project"); -$lang->doc->menu->wiki = array('link' => "{$lang->doc->wiki}|doc|project"); +$lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index"); +$lang->doc->menu->recent = array('link' => "{$lang->doc->recent}|doc|browse|libID=0&browseTyp=byediteddate", 'alias' => 'recent'); +$lang->doc->menu->my = array('link' => "{$lang->doc->my}|doc|browse|libID=0&browseTyp=openedbyme", 'alias' => 'my'); +$lang->doc->menu->collect = array('link' => "{$lang->doc->favorite}|doc|browse|libID=0&browseTyp=collectedbyme", 'alias' => 'collect'); +$lang->doc->menu->product = array('link' => "{$lang->doc->product}|doc|objectLibs|type=product"); +$lang->doc->menu->project = array('link' => "{$lang->doc->project}|doc|objectLibs|type=project"); +$lang->doc->menu->custom = array('link' => "{$lang->doc->custom}|doc|objectLibs|libID=0"); $lang->doc->dividerMenu = ',product,'; /* Doc menu order. */ -$lang->doc->menuOrder[5] = 'recent'; -$lang->doc->menuOrder[10] = 'my'; -$lang->doc->menuOrder[15] = 'favorite'; -$lang->doc->menuOrder[20] = 'product'; -$lang->doc->menuOrder[25] = 'project'; -$lang->doc->menuOrder[30] = 'custom'; -$lang->doc->menuOrder[35] = 'wiki'; +$lang->doc->menuOrder[5] = 'dashboard'; +$lang->doc->menuOrder[10] = 'recent'; +$lang->doc->menuOrder[15] = 'my'; +$lang->doc->menuOrder[20] = 'collect'; +$lang->doc->menuOrder[25] = 'product'; +$lang->doc->menuOrder[30] = 'project'; +$lang->doc->menuOrder[35] = 'custom'; /* Report menu.*/ $lang->report->menu = new stdclass(); diff --git a/module/doc/control.php b/module/doc/control.php index 3d4ce9ba2e..5e4499038f 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -70,9 +70,8 @@ class doc extends control * Browse docs. * * @param string|int $libID product|execution or the int id of custom library - * @param int $moduleID - * @param int $productID - * @param int $executionID + * @param string $browseType + * @param int $param * @param string $orderBy * @param string $from doc|project|product * @param int $recTotal @@ -160,6 +159,16 @@ class doc extends control { $libs = $this->doc->getAllLibsByType('collector'); $this->view->itemCounts = $this->doc->statLibCounts(array_keys($libs)); + + $this->app->rawMethod = 'collect'; + } + elseif($browseType == 'openedbyme') + { + $this->app->rawMethod = 'my'; + } + elseif($browseType == 'byediteddate') + { + $this->app->rawMethod = 'recent'; } $attachLibs = array(); @@ -842,14 +851,14 @@ class doc extends control } /** - * Show libs for product or execution. + * Show libs for product or project. * * @param string $type - * @param int $objectID + * @param int $objectID projectID|productID * @access public * @return void */ - public function objectLibs($type, $objectID) + public function objectLibs($type, $objectID = 0) { // setcookie('from', $from, $this->config->cookieLife, $this->config->webRoot, '', false, true); $this->session->set('docList', $this->app->getURI(true), 'doc'); diff --git a/module/doc/css/common.css b/module/doc/css/common.css index 71509178c9..e809dd9fb4 100644 --- a/module/doc/css/common.css +++ b/module/doc/css/common.css @@ -67,7 +67,6 @@ .side-col > .cell > header {position: absolute; top: 10px; right: 10px; left: 10px;} .side-col > .cell > header > .c-sm {padding-right: 20px; width: 60px;} .side-col .docsTree {position: absolute; top: 53px; left: 0; right: 0; bottom: 0; overflow: auto; padding: 0 10px 10px;} -.main-col .block-files > .panel-body {top: 45px; left: 0; right: 0; bottom: 0; overflow: auto;} td.c-name a {color: #0c60e1;} td.c-name a:visited {color: #082999;} diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php index 74e97a0371..f2ef2957e8 100644 --- a/module/doc/view/browse.html.php +++ b/module/doc/view/browse.html.php @@ -20,50 +20,9 @@ app->user->feedback) && !$this->cookie->feedbackView && $this->from == 'doc') ? true : false;?>
- from == 'doc') include './side.html.php';?> - cookie->browseType == 'bygrid'):?> - -
-
-
- - - - - - -
- -

doc->noSearchedDoc;?>

@@ -157,7 +116,7 @@ collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?> collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?> - id&version=0&from={$lang->navGroup->doc}"), "  " . $doc->title, '', "title={$doc->title}");?> + createLink('doc', 'view', "docID=$doc->id&version=0&from={$lang->navGroup->doc}", '', true), "  " . $doc->title, '', "title={$doc->title} class='iframe' data-width='90%'");?> fileSize ? $doc->fileSize : '-';?> addedBy);?> addedDate, 'y-m-d');?> @@ -167,7 +126,7 @@ id&objectType=doc");?>" title="" class='btn btn-link ajaxCollect'> - id&comment=false&from={$lang->navGroup->doc}", "", '', "title='{$lang->edit}' class='btn btn-link'")?> + id&comment=false&from={$lang->navGroup->doc}", "", '', "title='{$lang->edit}' class='btn btn-link iframe'", true, true)?> id&confirm=no&from={$lang->navGroup->doc}", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?> @@ -182,6 +141,5 @@
-
diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index 43ca8af252..8b1a313b1e 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -13,7 +13,6 @@ doc->appendNavCSS();?>
-
From 4075817079ef580987ef1d13e28b147e9103c91d Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 1 Apr 2021 08:32:26 +0300 Subject: [PATCH 03/27] * Fix bug#11528. --- module/personnel/control.php | 2 +- module/personnel/view/invest.html.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/personnel/control.php b/module/personnel/control.php index e974eb45b0..bb747bd0fe 100644 --- a/module/personnel/control.php +++ b/module/personnel/control.php @@ -76,7 +76,7 @@ class personnel extends control $this->view->title = $this->lang->personnel->invest; $this->view->position[] = $this->lang->personnel->invest; - $this->view->invest = $this->personnel->getInvest($programID); + $this->view->investList = $this->personnel->getInvest($programID); $this->display(); } diff --git a/module/personnel/view/invest.html.php b/module/personnel/view/invest.html.php index 1ec562a3f0..5eb291e263 100644 --- a/module/personnel/view/invest.html.php +++ b/module/personnel/view/invest.html.php @@ -15,7 +15,7 @@ .table.has-sort-head thead>tr>th {padding-right: 8px;}
- +
@@ -56,7 +56,7 @@ - + From bddbc3d7d1d25e1a4c41b33356451d731050c9ab Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Thu, 1 Apr 2021 13:37:30 +0800 Subject: [PATCH 04/27] * Finish task #37053. --- module/block/lang/de.php | 2 +- module/block/lang/vi.php | 2 +- module/block/lang/zh-cn.php | 2 +- module/block/lang/zh-tw.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/block/lang/de.php b/module/block/lang/de.php index b8963e12aa..e585018161 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -47,7 +47,7 @@ $lang->block->myExecution = 'Unclosed ' . $lang->executionCommon . 's'; $lang->block->myProduct = 'Unclosed ' . $lang->productCommon . 's'; $lang->block->delayed = 'Verspätet'; $lang->block->noData = 'Keine Daten für diesen Bericht.'; -$lang->block->emptyTip = 'Keine Information'; +$lang->block->emptyTip = 'No Data.'; $lang->block->createdTodos = 'Todos Created'; $lang->block->createdRequirements = 'UR/Epics Created'; $lang->block->createdStories = 'SR/Stories Created'; diff --git a/module/block/lang/vi.php b/module/block/lang/vi.php index bee6d0a2eb..4090bb741f 100644 --- a/module/block/lang/vi.php +++ b/module/block/lang/vi.php @@ -47,7 +47,7 @@ $lang->block->myExecution = 'Unclosed ' . $lang->executionCommon . 's'; $lang->block->myProduct = 'Unclosed ' . $lang->productCommon . 's'; $lang->block->delayed = 'Tạm ngưng'; $lang->block->noData = 'Không có dữ liệu trên loại báo cáo này.'; -$lang->block->emptyTip = 'Không có dữ liệu.'; +$lang->block->emptyTip = 'No Data.'; $lang->block->createdTodos = 'Todos Created'; $lang->block->createdRequirements = 'UR/Epics Created'; $lang->block->createdStories = 'SR/Stories Created'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 8af28e57a7..26dbe51e3d 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -47,7 +47,7 @@ $lang->block->myExecution = '未关闭的' . $lang->executionCommon; $lang->block->myProduct = '未关闭的' . $lang->productCommon; $lang->block->delayed = '已延期'; $lang->block->noData = '当前统计类型下暂无数据'; -$lang->block->emptyTip = '暂无信息'; +$lang->block->emptyTip = '暂无数据'; $lang->block->createdTodos = '创建的待办数'; $lang->block->createdRequirements = '创建的' . $lang->URCommon . '数'; $lang->block->createdStories = '创建的' . $lang->SRCommon . '数'; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index ed65f4cda8..3f23fa21e7 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -46,7 +46,7 @@ $lang->block->myExecution = '未關閉的' . $lang->executionCommon; $lang->block->myProduct = '未關閉的' . $lang->productCommon; $lang->block->delayed = '已延期'; $lang->block->noData = '當前統計類型下暫無數據'; -$lang->block->emptyTip = '暫無信息'; +$lang->block->emptyTip = '暫無數據'; $lang->block->createdTodos = '創建的待辦數'; $lang->block->createdRequirements = '創建的' . $lang->URCommon . '數'; $lang->block->createdStories = '創建的' . $lang->SRCommon . '數'; From 15de086ca771b81652c159b72d4f8969ee4a2372 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 1 Apr 2021 13:38:46 +0800 Subject: [PATCH 05/27] * fix bug #11630. --- module/repo/control.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/module/repo/control.php b/module/repo/control.php index b718fd3e7e..f5824c9f84 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -82,7 +82,6 @@ class repo extends control $repoID = $this->repo->saveState(0, $objectID); $this->commonAction($repoID, $objectID); - $this->repo->setMenu($this->repos, $repoID, false); $repoList = $this->repo->getList(0, $orderBy); @@ -128,7 +127,6 @@ class repo extends control $this->commonAction($repoID, $objectID); $this->app->loadLang('action'); - $this->repo->setMenu($this->repos, $repoID, false); $this->view->title = $this->lang->repo->common . $this->lang->colon . $this->lang->repo->create; $this->view->position[] = $this->lang->repo->create; @@ -332,14 +330,12 @@ class repo extends control { $repoID = $this->repo->saveState($repoID, $objectID); - $this->commonAction($repoID, $objectID); - /* Get path and refresh. */ if($this->get->repoPath) $path = $this->get->repoPath; if(empty($refresh) and $this->cookie->repoRefresh) $refresh = $this->cookie->repoRefresh; /* Set menu and session. */ - $this->repo->setMenu($this->repos, $repoID); + $this->commonAction($repoID, $objectID); $this->repo->setBackSession('list', $withOtherModule = true); session_start(); @@ -830,8 +826,6 @@ class repo extends control { $this->commonAction($repoID, $objectID); - $this->repo->setMenu($this->repos, $repoID); - if($repoID == 0) $repoID = $this->session->repoID; if($branch) $branch = base64_decode($branch); From 810fce9f91d412d3e147b6404f2cd30977c453c4 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 1 Apr 2021 13:42:10 +0800 Subject: [PATCH 06/27] * Fix todo bug. --- module/user/view/featurebar.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php index 8a22b15661..a96838e466 100755 --- a/module/user/view/featurebar.html.php +++ b/module/user/view/featurebar.html.php @@ -10,7 +10,7 @@ $label = "{$lang->user->schedule}"; $active = $methodName == 'todo' ? ' btn-active-text' : ''; - common::printLink('user', 'todo', "userID={$user->id}", $label, '', "class='btn btn-link $active'"); + common::printLink('user', 'todo', "userID={$user->id}&type=all", $label, '', "class='btn btn-link $active'"); $label = "{$lang->user->task}"; $active = $methodName == 'task' ? ' btn-active-text' : ''; From a6fe7fdf341f26e706517ea6877620cbd0163cef Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Thu, 1 Apr 2021 13:43:57 +0800 Subject: [PATCH 07/27] * Fix upgrade view. --- module/upgrade/view/mergeprogram.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/upgrade/view/mergeprogram.html.php b/module/upgrade/view/mergeprogram.html.php index 69482dfe59..dcc3c5b431 100644 --- a/module/upgrade/view/mergeprogram.html.php +++ b/module/upgrade/view/mergeprogram.html.php @@ -43,7 +43,7 @@ $sprint):?> - + From a700423fa0b377489fbdfa29fcd3ebfb601c14d8 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 1 Apr 2021 13:46:14 +0800 Subject: [PATCH 08/27] * Modify the display problem of creating and editing project permissions. --- module/project/js/create.js | 4 ++-- module/project/js/edit.js | 1 + module/project/view/create.html.php | 2 +- module/project/view/edit.html.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/project/js/create.js b/module/project/js/create.js index d85cf06508..4f83bff8b5 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -82,9 +82,9 @@ function addNewProduct(obj) * @access public * @return void */ -function setAclList(projectID) +function setAclList(programID) { - if(projectID != 0) + if(programID != 0) { $('.aclBox').html($('#programAcl').html()); } diff --git a/module/project/js/edit.js b/module/project/js/edit.js index 115059a858..f9d3c0e2bf 100644 --- a/module/project/js/edit.js +++ b/module/project/js/edit.js @@ -3,6 +3,7 @@ $(function() $('#parent').change(function() { var programID = $(this).val(); + setAclList(programID); /* Determine whether the project can change the project set. */ link = createLink('project', 'ajaxCheckProduct', 'programID=' + programID + '&projectID=' + projectID); diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 8916e61159..9ae8e18e97 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -200,6 +200,6 @@ project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?> diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index 04bf2191c7..905b5b77f1 100644 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -173,7 +173,7 @@ project->aclList, $project->acl == 'project' ? 'private' : 'open', "onclick='setWhite(this.value);'", 'block'));?>
'> '>
upgrade->project} #{$sprint->id} {$sprint->name}" . html::hidden("sprints[]", $sprint->id);?>name}" . html::hidden("sprints[]", $sprint->id);?> projects, '', "class='form-control chosen'");?>