From 6cfa9a5878d6c73e077c5733ac764ed3407cec11 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 22 Jul 2021 10:04:09 +0800 Subject: [PATCH 1/8] * Finish task #40508. --- module/doc/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index 1df41ba395..64175bb00d 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1902,7 +1902,7 @@ class docModel extends model foreach($moduleDocs[0] as $doc) { if(!$docID) $docID = $doc->id; - $treeMenu[0] .= 'id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$rootID&docID={$doc->id}"), $doc->title, '', "data-app='{$this->app->openApp}'") . ''; + $treeMenu[0] .= 'id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$rootID&docID={$doc->id}"), "  " . $doc->title, '', "data-app='{$this->app->openApp}'") . ''; } } @@ -1934,7 +1934,7 @@ class docModel extends model foreach($moduleDocs[$module->id] as $doc) { if(!$docID) $docID = $doc->id; - $treeMenu[$module->id] .= 'id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), $doc->title, '', "data-app='{$this->app->openApp}'") . ''; + $treeMenu[$module->id] .= 'id == $docID ? ' class="active"' : '') . '>' . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), "  " . $doc->title, '', "data-app='{$this->app->openApp}'") . ''; } } From 94ba06cf2ab6732bab813cefa609d43d8f8bd5e5 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Thu, 22 Jul 2021 10:23:28 +0800 Subject: [PATCH 2/8] * Finish task#40511. --- module/program/control.php | 2 +- module/program/view/browse.html.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/program/control.php b/module/program/control.php index 7a34ecacb6..e544b5b0e6 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -28,7 +28,7 @@ class program extends control */ public function browse($status = 'all', $orderBy = 'order_asc') { - if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), " " . $this->lang->program->create, '', "class='btn btn-secondary'"); + if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), "" . $this->lang->program->create, '', "class='btn btn-primary'"); $this->session->set('programList', $this->app->getURI(true), 'program'); $this->session->set('projectList', $this->app->getURI(true), 'project'); diff --git a/module/program/view/browse.html.php b/module/program/view/browse.html.php index fc2901a957..3059e465f2 100644 --- a/module/program/view/browse.html.php +++ b/module/program/view/browse.html.php @@ -26,12 +26,12 @@ $lang->program->showClosed), '', $this->cookie->showClosed ? 'checked=checked' : '');?>
- pageActions)) echo $lang->pageActions;?> config->maxVersion)):?> - ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?> + ' . $lang->project->create, '', 'class="btn btn-secondary" data-toggle="modal" data-target="#guideDialog"');?> config->systemMode == 'new'):?> - ' . $lang->project->create, '', 'class="btn btn-primary"');?> + ' . $lang->project->create, '', 'class="btn btn-secondary"');?> + pageActions)) echo $lang->pageActions;?>
@@ -44,7 +44,7 @@
- Date: Thu, 22 Jul 2021 10:28:48 +0800 Subject: [PATCH 3/8] * Finish task#40512. --- module/program/view/browsebylist.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index aebfc2438d..4cf5139d66 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -8,9 +8,9 @@ nameAB;?> + program->status);?> program->PM);?> project->budget);?> - program->status);?> project->begin);?> project->end);?> actions;?> @@ -53,13 +53,13 @@ createLink('project', 'index', "projectID=$program->id", '', '', $program->id), $program->name);?> + project->statusList, $program->status, '');?> PM]) ? $PMList[$program->PM]->id : ''?> PM)) echo html::a($this->createLink('user', 'profile', "userID=$userID", '', true), zget($users, $program->PM), '', "data-toggle='modal' data-type='iframe' data-width='600'");?> app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$program->budget / 10000, 2) . $lang->project->tenThousand : round((float)$program->budget, 2);?> budget != 0 ? zget($lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $lang->project->future;?> - project->statusList, $program->status, '');?> begin;?> end == LONG_TIME ? $lang->program->longTime : $program->end;?> From 1f81cb5c18c39a1df152e89d91eb8e27256cba62 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 22 Jul 2021 10:37:39 +0800 Subject: [PATCH 4/8] * Finish task #40493. --- module/doc/control.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/doc/control.php b/module/doc/control.php index 550a0bb9c6..fafab5c84d 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -314,6 +314,9 @@ class doc extends control else { $this->app->rawMethod = $objectType; + unset($this->lang->doc->menu->product['subMenu']); + if($this->config->systemMode == 'new') unset($this->lang->doc->menu->project['subMenu']); + unset($this->lang->doc->menu->custom['subMenu']); } $lib = $this->doc->getLibByID($libID); From 1b03630493a02bbe95f49f94ba7d369a71fe673c Mon Sep 17 00:00:00 2001 From: dingguodong Date: Thu, 22 Jul 2021 10:42:30 +0800 Subject: [PATCH 5/8] + Add getting product by repo. --- module/job/control.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/module/job/control.php b/module/job/control.php index e471064b96..ee9791f323 100644 --- a/module/job/control.php +++ b/module/job/control.php @@ -248,4 +248,18 @@ class job extends control echo js::alert(sprintf($this->lang->job->sendExec, zget($this->lang->compile->statusList, $status))); die(js::reload('parent')); } + + /** + * AJAX: Get product by repo. + * + * @param int $repoID + * @access public + * @return void + */ + public function ajaxGetProductByRepo($repoID) + { + $repo = $this->loadModel('repo')->getRepoByID($repoID); + if($repo) return $repo->product; + die(js::error("Access Violation. 非法访问。")); + } } From dd4372e1eb01490da5cabad56b2f6b40d5e082d4 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 22 Jul 2021 10:46:08 +0800 Subject: [PATCH 6/8] * Finish task #40494. --- module/doc/control.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/doc/control.php b/module/doc/control.php index fafab5c84d..9eae927be7 100644 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -391,7 +391,7 @@ class doc extends control $lib = $this->doc->getLibByID($libID); $type = $lib->type; - /* set menus. */ + /* Set menus. */ if($this->app->openApp == 'product') { $this->product->setMenu($objectID); @@ -418,6 +418,10 @@ class doc extends control { $this->app->rawMethod = $objectType; + unset($this->lang->doc->menu->product['subMenu']); + if($this->config->systemMode == 'new') unset($this->lang->doc->menu->project['subMenu']); + unset($this->lang->doc->menu->custom['subMenu']); + /* High light menu. */ if(strpos(',product,project,execution,custom,book,', ",$objectType,") !== false) { From 85d80014ddc355678328d64b753c6a59f56c4f40 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Thu, 22 Jul 2021 10:48:06 +0800 Subject: [PATCH 7/8] * Finish task #40510. --- module/bug/lang/de.php | 1 + module/bug/lang/en.php | 1 + module/bug/lang/fr.php | 1 + module/bug/lang/vi.php | 1 + module/bug/lang/zh-cn.php | 1 + module/execution/view/bug.html.php | 2 ++ module/my/view/bug.html.php | 12 +++++++++--- module/my/view/task.html.php | 6 ++++++ 8 files changed, 22 insertions(+), 3 deletions(-) diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index 117da8e767..e4fee71d9c 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -59,6 +59,7 @@ $lang->bug->resolvedBuild = 'Lösungs Build'; $lang->bug->resolvedDate = 'Gelöst am'; $lang->bug->resolvedDateAB = 'Gelöst'; $lang->bug->deadline = 'Fällig am'; +$lang->bug->deadlineAB = 'Fällig'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Geschlossen von'; $lang->bug->closedDate = 'Geschlossen am'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 3e8aeec95e..86ed9f27aa 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -60,6 +60,7 @@ $lang->bug->resolvedBuild = 'Build'; $lang->bug->resolvedDate = 'Resolved Date'; $lang->bug->resolvedDateAB = 'ResolvedDate'; $lang->bug->deadline = 'Deadline'; +$lang->bug->deadlineAB = 'Deadline'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'ClosedBy'; $lang->bug->closedDate = 'ClosedDate'; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index 569a6f9480..1aced56e5f 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -59,6 +59,7 @@ $lang->bug->resolvedBuild = 'Build'; $lang->bug->resolvedDate = 'Date Correction'; $lang->bug->resolvedDateAB = 'Date Correction'; $lang->bug->deadline = 'Date Butoir'; +$lang->bug->deadlineAB = 'Butoir'; $lang->bug->plan = 'Plan'; $lang->bug->closedBy = 'Fermé par'; $lang->bug->closedDate = 'Date Fermeture'; diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php index d2eeefbe24..2341d0b843 100644 --- a/module/bug/lang/vi.php +++ b/module/bug/lang/vi.php @@ -59,6 +59,7 @@ $lang->bug->resolvedBuild = 'Bản dựng'; $lang->bug->resolvedDate = 'Ngày giải quyết'; $lang->bug->resolvedDateAB = 'Ngày giải quyết'; $lang->bug->deadline = 'Hạn chót'; +$lang->bug->deadlineAB = 'Hạn chót'; $lang->bug->plan = 'Kế hoạch'; $lang->bug->closedBy = 'Người đóng'; $lang->bug->closedDate = 'Ngày đóng'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index a17aa251ad..460143b33a 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -60,6 +60,7 @@ $lang->bug->resolvedBuild = '解决版本'; $lang->bug->resolvedDate = '解决日期'; $lang->bug->resolvedDateAB = '解决日期'; $lang->bug->deadline = '截止日期'; +$lang->bug->deadlineAB = '截止'; $lang->bug->plan = '所属' . '计划'; $lang->bug->closedBy = '由谁关闭'; $lang->bug->closedDate = '关闭日期'; diff --git a/module/execution/view/bug.html.php b/module/execution/view/bug.html.php index 7029cc9ab7..965f7f1810 100644 --- a/module/execution/view/bug.html.php +++ b/module/execution/view/bug.html.php @@ -59,6 +59,7 @@ priAB);?> bug->title);?> openedByAB);?> + bug->deadlineAB);?> assignedToAB);?> bug->resolvedBy);?> bug->resolutionAB);?> @@ -101,6 +102,7 @@ pri?>' title='bug->priList, $bug->pri, $bug->pri)?>'>bug->priList, $bug->pri, $bug->pri)?> title, null, "style='color: $bug->color' data-app={$this->app->openApp}");?> openedBy, $bug->openedBy);?> + deadline, 0, 4) > 0) echo substr($bug->deadline, 5, 6);?> bug->printAssignedHtml($bug, $users);?> resolvedBy, $bug->resolvedBy);?> bug->resolutionList, $bug->resolution);?> diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index b7e63e9fee..f4b9b4bf41 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -61,13 +61,16 @@ openedByAB);?> + rawMethod == 'work'):?> + bug->deadlineAB);?> + - bug->assignedTo);?> + bug->assignedTo);?> - bug->resolvedByAB);?> + bug->resolvedByAB);?> - bug->resolutionAB);?> + bug->resolutionAB);?> actions;?> @@ -110,6 +113,9 @@ openedBy);?> + rawMethod == 'work'):?> + deadline, 0, 4) > 0) echo substr($bug->deadline, 5, 6);?> + bug->printAssignedHtml($bug, $users);?> diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index a489aef067..c601b0fbb8 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -54,6 +54,9 @@ openedByAB);?> + rawMethod == 'work'):?> + task->deadlineAB);?> + task->assignedTo);?> @@ -91,6 +94,9 @@ openedBy);?> + rawMethod == 'work'):?> + deadline, 0, 4) > 0) echo substr($task->deadline, 5, 6);?> + task->printAssignedHtml($task, $users);?> From fb9d13856b2d20d01d7117910b9525c961fe16a0 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 22 Jul 2021 11:01:23 +0800 Subject: [PATCH 8/8] * Finish task #40495. --- module/doc/view/content.html.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index b6be52c8f4..763f99ed87 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -1,3 +1,6 @@ + doc->confirmDelete);?> requestType == 'PATH_INFO' ? '?' : '&';