From d2734ecaccd115b3d40dd34162623d72c736d6ce Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Wed, 10 Mar 2021 09:57:37 +0800 Subject: [PATCH 1/7] * Finish task#36456. --- module/index/css/index.css | 4 ++-- module/index/js/index.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/index/css/index.css b/module/index/css/index.css index e37dc2c621..8961806ea5 100644 --- a/module/index/css/index.css +++ b/module/index/css/index.css @@ -61,10 +61,10 @@ body.menu-hide {padding-left: 0;} #userNav .dropdown-submenu:focus > a, #userNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);} #poweredBy{width: 40%; position: absolute; top: 4px; right: 0; padding: 0;} -#globalSearchDiv{width:50%; float: right; margin-right: 4px;} +#globalSearchDiv{width:52%; float: right; margin-right: 4px;} @media screen and (max-height: 768px) { - #globalSearchDiv{width: 60%;} + #globalSearchDiv{width: 62%;} } #globalSearchDiv .input-group{width: 82%; float: right; margin-top: 2px;} @media screen and (max-height: 768px) diff --git a/module/index/js/index.js b/module/index/js/index.js index 3ea5f24731..774584d135 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -531,7 +531,7 @@ $.extend( gotoObject:function() { objectType = $('#searchType').attr('value'); - objectValue = $('input#globalSearchInput').attr('value'); + objectValue = $('#globalSearchInput').attr('value'); if(objectType && objectValue) { @@ -590,7 +590,7 @@ $(function() var $this = $(this); var isActiveType = $this.data('value') === searchType && searchType !== 'all'; $this.closest('li').toggleClass('selected active', isActiveType); - $this.html($this.data('name') + ' #' + (val.length > 4 ? (val.substr(0, 4) + '...') : val) + ""); + $this.html($this.data('name') + ' #' + (val.length > 7 ? (val.substr(0, 7) + '...') : val) + ""); if(isActiveType) $dropmenu.addClass('with-active'); }); } From b608fc809da5a74386bd1dc35223572c8b1f3965 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 10 Mar 2021 10:11:46 +0800 Subject: [PATCH 2/7] * Finish task#36497. --- module/common/view/header.html.php | 11 ++++++----- module/execution/model.php | 31 ++++++++++++++++++++++++++++++ module/project/model.php | 1 - 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index 24a36a5676..f63940aeeb 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -20,13 +20,14 @@ $isQa = $rawModule == 'qa';
- product->switcherMenu) ? $lang->product->switcherMenu : '';?> - qa->switcherMenu) ? $lang->qa->switcherMenu : '';?> + product->switcherMenu) ? $lang->product->switcherMenu : '';?> + qa->switcherMenu) ? $lang->qa->switcherMenu : '';?> config->systemMode == 'new'):?> - program->switcherMenu) ? $lang->program->switcherMenu : '';?> - loadModel('project')->getSwitcher($this->session->PRJ, $app->rawModule, $app->rawMethod);?> + program->switcherMenu) ? $lang->program->switcherMenu : '';?> + loadModel('project')->getSwitcher($this->session->PRJ, $app->rawModule, $app->rawMethod);?> + execution->getSwitcher($this->session->execution, $app->rawModule, $app->rawMethod);?> config->systemMode == 'classic'):?> - project->switcherMenu) ? $lang->project->switcherMenu : '';;?> + project->switcherMenu) ? $lang->project->switcherMenu : '';;?>
diff --git a/module/execution/model.php b/module/execution/model.php index ac8b393721..ba48b246d8 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -877,11 +877,42 @@ class executionModel extends model */ public function getMainAction($module, $method) { + if($method == 'index' or $method == 'all') return; + $link = html::a(helper::createLink('execution', 'all'), "", '', "style='border: none;'"); $html = "

" . $link . "

"; + return common::hasPriv('execution', 'all') ? $html : ''; } + /* + * Get execution switcher. + * + * @param int $executionID + * @param string $currentModule + * @param string $currentMethod + * @access public + * @return string + */ + public function getSwitcher($executionID, $currentModule, $currentMethod) + { + $this->session->set('moreExecutionLink', $this->app->getURI(true)); + + $currentExecutionName = $this->lang->execution->common; + if($executionID) + { + $currentExecution = $this->getById($executionID); + $currentExecutionName = $currentExecution->name; + } + + $dropMenuLink = helper::createLink('execution', 'ajaxGetDropMenu', "objectID=$executionID&module=$currentModule&method=$currentMethod&extra="); + $output = "
"; + + return $output; + } + /** * Get project pairs. * diff --git a/module/project/model.php b/module/project/model.php index 5a2264225c..67505c5ab8 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -144,7 +144,6 @@ class projectModel extends model { $this->session->set('moreProjectLink', $this->app->getURI(true)); - $this->loadModel('project'); $currentProjectName = $this->lang->project->common; if($projectID) { From c8036c78900e2b1055551ef7bd7957787b0584ba Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Wed, 10 Mar 2021 10:23:54 +0800 Subject: [PATCH 3/7] * Fix bug. --- module/execution/view/ajaxgetdropmenu.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php index 5354282d6f..bcb55035d0 100644 --- a/module/execution/view/ajaxgetdropmenu.html.php +++ b/module/execution/view/ajaxgetdropmenu.html.php @@ -49,7 +49,7 @@ foreach($executions as $execution) ?>
- ' . $lang->execution->all, '', 'class="not-list-item"'); ?> + ' . $lang->execution->all, '', 'class="not-list-item"'); ?> execution->doneProjects?>
From 183feb39368b4cc0b44ea55e7baa7237f4b8c695 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 10 Mar 2021 10:24:13 +0800 Subject: [PATCH 4/7] * Finish task #36465. --- module/common/lang/de.php | 17 ++++++---------- module/common/lang/en.php | 17 ++++++---------- module/common/lang/fr.php | 17 ++++++---------- module/common/lang/menuOrder.php | 33 +++++++++++++++----------------- module/common/lang/vi.php | 15 +++++---------- module/common/lang/zh-cn.php | 20 +++++++++---------- module/company/control.php | 6 ++++++ module/index/js/index.js | 2 ++ module/my/control.php | 3 +++ module/project/js/browse.js | 1 - module/user/model.php | 3 +-- 11 files changed, 60 insertions(+), 74 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 8f95d4b7d1..600abec13f 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -148,7 +148,7 @@ $lang->mainNav->qa = ' Test|qa|index|'; $lang->mainNav->repo = ' Code|repo|browse|'; $lang->mainNav->doc = ' Doc|doc|index|'; $lang->mainNav->report = " Statistic|report|productsummary|"; -$lang->mainNav->system = ' System|custom|estimate|'; +$lang->mainNav->system = ' System|my|team|'; $lang->mainNav->admin = ' Admin|admin|index|'; if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; @@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu; /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); -$lang->system->menu->company = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday'); - -$lang->subject = new stdclass(); -$lang->subject->menu = new stdclass(); -$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|'); +$lang->system->menu->team = array('link' => 'Team|my|team|', 'subModule' => 'user'); +$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); +$lang->system->menu->dynamic = 'Dynamic|company|dynamic|'; +$lang->system->menu->view = array('link' => 'Company|company|view'); $lang->measurement = new stdclass(); $lang->measurement->menu = new stdclass(); @@ -289,7 +288,6 @@ $lang->my = new stdclass(); $lang->my->menu = new stdclass(); $lang->my->menu->index = 'Index|my|index'; -$lang->my->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->myWork = array('link' => 'Work|my|work|mode=task'); if($config->systemMode == 'new') { @@ -303,7 +301,6 @@ else $lang->my->menu->contribute = array('link' => 'Contribute|my|contribute|mode=task'); $lang->my->menu->dynamic = 'Dynamic|my|dynamic|'; $lang->my->menu->score = 'Score|my|score|'; -$lang->my->menu->team = array('link' => 'Team|my|team|', 'subModule' => 'user'); $lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->workMenu = new stdclass(); @@ -322,7 +319,7 @@ $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; $lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme'; $lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done'; -$lang->my->dividerMenu = ',myProject,team,'; +$lang->my->dividerMenu = ',myWork,score,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; @@ -516,8 +513,6 @@ $lang->company->menu = new stdclass(); $lang->company->menu->browseUser = array('link' => 'Benutzer|company|browse', 'subModule' => 'user'); $lang->company->menu->dept = array('link' => 'Abteilung|dept|browse', 'subModule' => 'dept'); $lang->company->menu->browseGroup = array('link' => 'Gruppen|group|browse', 'subModule' => 'group'); -$lang->company->menu->dynamic = 'Verlauf|company|dynamic|'; -$lang->company->menu->view = array('link' => 'Unternehmen|company|view'); /* Admin menu settings. */ $lang->admin = new stdclass(); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index acd0fd49c7..1d16ce4860 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -148,7 +148,7 @@ $lang->mainNav->qa = ' Test|qa|index|'; $lang->mainNav->repo = ' Code|repo|browse|'; $lang->mainNav->doc = ' Doc|doc|index|'; $lang->mainNav->report = " Statistic|report|productsummary|"; -$lang->mainNav->system = ' System|custom|estimate|'; +$lang->mainNav->system = ' System|my|team|'; $lang->mainNav->admin = ' Admin|admin|index|'; if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; @@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu; /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); -$lang->system->menu->company = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday'); - -$lang->subject = new stdclass(); -$lang->subject->menu = new stdclass(); -$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|'); +$lang->system->menu->team = array('link' => 'Team|my|team|', 'subModule' => 'user'); +$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); +$lang->system->menu->dynamic = 'Dynamic|company|dynamic|'; +$lang->system->menu->view = array('link' => 'Company|company|view'); $lang->measurement = new stdclass(); $lang->measurement->menu = new stdclass(); @@ -289,7 +288,6 @@ $lang->my = new stdclass(); $lang->my->menu = new stdclass(); $lang->my->menu->index = 'Index|my|index'; -$lang->my->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->myWork = array('link' => 'Work|my|work|mode=task'); if($config->systemMode == 'new') { @@ -303,7 +301,6 @@ else $lang->my->menu->contribute = array('link' => 'Contribute|my|contribute|mode=task'); $lang->my->menu->dynamic = 'Dynamic|my|dynamic|'; $lang->my->menu->score = 'Score|my|score|'; -$lang->my->menu->team = array('link' => 'Team|my|team|', 'subModule' => 'user'); $lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->workMenu = new stdclass(); @@ -322,7 +319,7 @@ $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; $lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme'; $lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done'; -$lang->my->dividerMenu = ',myProject,team,'; +$lang->my->dividerMenu = ',myWork,score,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; @@ -516,8 +513,6 @@ $lang->company->menu = new stdclass(); $lang->company->menu->browseUser = array('link' => 'User|company|browse', 'subModule' => ',user,'); $lang->company->menu->dept = array('link' => 'Dept|dept|browse', 'subModule' => 'dept'); $lang->company->menu->browseGroup = array('link' => 'Group|group|browse', 'subModule' => 'group'); -$lang->company->menu->dynamic = 'Dynamic|company|dynamic|'; -$lang->company->menu->view = array('link' => 'Company|company|view'); /* Admin menu settings. */ $lang->admin = new stdclass(); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 930f2a06d4..5fc3b7c015 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -148,7 +148,7 @@ $lang->mainNav->qa = ' Test|qa|index|'; $lang->mainNav->repo = ' Code|repo|browse|'; $lang->mainNav->doc = ' Doc|doc|index|'; $lang->mainNav->report = " Statistic|report|productsummary|"; -$lang->mainNav->system = ' System|custom|estimate|'; +$lang->mainNav->system = ' System|my|team|'; $lang->mainNav->admin = ' Admin|admin|index|'; if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; @@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu; /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); -$lang->system->menu->company = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday'); - -$lang->subject = new stdclass(); -$lang->subject->menu = new stdclass(); -$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|'); +$lang->system->menu->team = array('link' => 'Team|my|team|', 'subModule' => 'user'); +$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); +$lang->system->menu->dynamic = 'Dynamic|company|dynamic|'; +$lang->system->menu->view = array('link' => 'Company|company|view'); $lang->measurement = new stdclass(); $lang->measurement->menu = new stdclass(); @@ -289,7 +288,6 @@ $lang->my = new stdclass(); $lang->my->menu = new stdclass(); $lang->my->menu->index = 'Index|my|index'; -$lang->my->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->myWork = array('link' => 'Work|my|work|mode=task'); if($config->systemMode == 'new') { @@ -303,7 +301,6 @@ else $lang->my->menu->contribute = array('link' => 'Contribute|my|contribute|mode=task'); $lang->my->menu->dynamic = 'Dynamic|my|dynamic|'; $lang->my->menu->score = 'Score|my|score|'; -$lang->my->menu->team = array('link' => 'Team|my|team|', 'subModule' => 'user'); $lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->workMenu = new stdclass(); @@ -322,7 +319,7 @@ $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; $lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme'; $lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done'; -$lang->my->dividerMenu = ',myProject,team,'; +$lang->my->dividerMenu = ',myWork,score,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; @@ -516,8 +513,6 @@ $lang->company->menu = new stdclass(); $lang->company->menu->browseUser = array('link' => 'Utilisateurs|company|browse', 'subModule' => 'user'); $lang->company->menu->dept = array('link' => 'Compartiments|dept|browse', 'subModule' => 'dept'); $lang->company->menu->browseGroup = array('link' => 'Privilèges|group|browse', 'subModule' => 'group'); -$lang->company->menu->dynamic = 'Historique|company|dynamic|'; -$lang->company->menu->view = array('link' => 'Entreprise|company|view'); /* Admin menu settings. */ $lang->admin = new stdclass(); diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php index 9c4dc357d6..34ebb1b60d 100644 --- a/module/common/lang/menuOrder.php +++ b/module/common/lang/menuOrder.php @@ -49,16 +49,14 @@ $lang->index->menuOrder[10] = 'project'; /* my menu order. */ $lang->my->menuOrder[5] = 'index'; -$lang->my->menuOrder[10] = 'calendar'; -$lang->my->menuOrder[15] = 'myWork'; -$lang->my->menuOrder[20] = 'myProject'; -$lang->my->menuOrder[25] = 'myExecution'; -$lang->my->menuOrder[30] = 'contribute'; -$lang->my->menuOrder[35] = 'score'; -$lang->my->menuOrder[40] = 'dynamic'; -$lang->my->menuOrder[45] = 'follow'; -$lang->my->menuOrder[50] = 'team'; -$lang->my->menuOrder[55] = 'contacts'; +$lang->my->menuOrder[10] = 'myWork'; +$lang->my->menuOrder[15] = 'myProject'; +$lang->my->menuOrder[20] = 'myExecution'; +$lang->my->menuOrder[25] = 'contribute'; +$lang->my->menuOrder[30] = 'score'; +$lang->my->menuOrder[35] = 'dynamic'; +$lang->my->menuOrder[40] = 'follow'; +$lang->my->menuOrder[45] = 'contacts'; $lang->todo->menuOrder = $lang->my->menuOrder; /* product menu order. */ @@ -142,19 +140,18 @@ $lang->report->menuOrder[25] = 'staff'; $lang->company->menuOrder[5] = 'browseUser'; $lang->company->menuOrder[10] = 'dept'; $lang->company->menuOrder[15] = 'browseGroup'; -$lang->company->menuOrder[20] = 'dynamic'; -$lang->company->menuOrder[25] = 'view'; -$lang->company->menuOrder[30] = 'addGroup'; -$lang->company->menuOrder[35] = 'batchAddUser'; -$lang->company->menuOrder[40] = 'addUser'; +$lang->company->menuOrder[20] = 'addGroup'; +$lang->company->menuOrder[25] = 'batchAddUser'; +$lang->company->menuOrder[30] = 'addUser'; $lang->dept->menuOrder = $lang->company->menuOrder; $lang->group->menuOrder = $lang->company->menuOrder; $lang->user->menuOrder = $lang->company->menuOrder; /* system menu order. */ -$lang->system->menuOrder[5] = 'company'; -$lang->system->menuOrder[10] = 'scrum'; -$lang->system->menuOrder[15] = 'waterfall'; +$lang->system->menuOrder[5] = 'team'; +$lang->system->menuOrder[10] = 'calendar'; +$lang->system->menuOrder[15] = 'dynamic'; +$lang->system->menuOrder[20] = 'view'; /* admin menu order. */ $lang->admin->menuOrder[5] = 'index'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 581daef645..128ae940d3 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -148,7 +148,7 @@ $lang->mainNav->qa = ' Test|qa|index|'; $lang->mainNav->repo = ' Code|repo|browse|'; $lang->mainNav->doc = ' Doc|doc|index|'; $lang->mainNav->report = " Statistic|report|productsummary|"; -$lang->mainNav->system = ' System|custom|estimate|'; +$lang->mainNav->system = ' System|my|team|'; $lang->mainNav->admin = ' Admin|admin|index|'; if($config->systemMode == 'new') $lang->mainNav->program = " Program|$programModule|$programMethod|"; @@ -219,11 +219,10 @@ $lang->productplan->menu = $lang->product->menu; /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); -$lang->system->menu->company = array('link' => 'Global Settings|custom|browsestoryconcept|', 'subModule' => 'holiday'); - -$lang->subject = new stdclass(); -$lang->subject->menu = new stdclass(); -$lang->subject->menu->storyConcept = array('link' => 'Story Concept|custom|browsestoryconcept|'); +$lang->system->menu->team = array('link' => 'Team|my|team|', 'subModule' => 'user'); +$lang->system->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); +$lang->system->menu->dynamic = 'Dynamic|company|dynamic|'; +$lang->system->menu->view = array('link' => 'Company|company|view'); $lang->measurement = new stdclass(); $lang->measurement->menu = new stdclass(); @@ -289,7 +288,6 @@ $lang->my = new stdclass(); $lang->my->menu = new stdclass(); $lang->my->menu->index = 'Index|my|index'; -$lang->my->menu->calendar = array('link' => 'Calendar|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->myWork = array('link' => 'Work|my|work|mode=task'); if($config->systemMode == 'new') { @@ -303,7 +301,6 @@ else $lang->my->menu->contribute = array('link' => 'Contribute|my|contribute|mode=task'); $lang->my->menu->dynamic = 'Dynamic|my|dynamic|'; $lang->my->menu->score = 'Score|my|score|'; -$lang->my->menu->team = array('link' => 'Team|my|team|', 'subModule' => 'user'); $lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->workMenu = new stdclass(); @@ -516,8 +513,6 @@ $lang->company->menu = new stdclass(); $lang->company->menu->browseUser = array('link' => 'Người dùng|company|browse', 'subModule' => 'user'); $lang->company->menu->dept = array('link' => 'Phòng/Ban|dept|browse', 'subModule' => 'dept'); $lang->company->menu->browseGroup = array('link' => 'Phân quyền|group|browse', 'subModule' => 'group'); -$lang->company->menu->dynamic = 'Lịch sử|company|dynamic|'; -$lang->company->menu->view = array('link' => 'Doanh nghiệp|company|view'); /* Admin menu settings. */ $lang->admin = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index bffb9ba04f..c0b0704f52 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -148,7 +148,7 @@ $lang->mainNav->qa = ' 测试|qa|index|'; $lang->mainNav->repo = ' 代码|repo|browse|'; $lang->mainNav->doc = ' 文档|doc|index|'; $lang->mainNav->report = " 统计|report|productSummary|"; -$lang->mainNav->system = ' 组织|custom|browsestoryconcept|'; +$lang->mainNav->system = ' 组织|my|team|'; $lang->mainNav->admin = ' 后台|admin|index|'; if($config->systemMode == 'new') $lang->mainNav->program = " 项目集|$programModule|$programMethod|"; @@ -221,11 +221,15 @@ $lang->productplan->menu = $lang->product->menu; /* System menu. */ $lang->system = new stdclass(); $lang->system->menu = new stdclass(); -$lang->system->menu->company = array('link' => '全局设置|custom|browsestoryconcept|', 'subModule' => 'holiday'); +$lang->system->menu->team = array('link' => '团队|my|team|', 'subModule' => 'user'); +$lang->system->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); +$lang->system->menu->dynamic = '动态|company|dynamic|'; +$lang->system->menu->view = array('link' => '公司|company|view'); +//$lang->system->menu->company = array('link' => '全局设置|custom|browsestoryconcept|', 'subModule' => 'holiday'); -$lang->subject = new stdclass(); -$lang->subject->menu = new stdclass(); -$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|'); +//$lang->subject = new stdclass(); +//$lang->subject->menu = new stdclass(); +//$lang->subject->menu->storyConcept = array('link' => '需求概念|custom|browsestoryconcept|'); $lang->measurement = new stdclass(); $lang->measurement->menu = new stdclass(); @@ -291,7 +295,6 @@ $lang->my = new stdclass(); $lang->my->menu = new stdclass(); $lang->my->menu->index = '仪表盘|my|index'; -$lang->my->menu->calendar = array('link' => '日程|my|calendar|', 'subModule' => 'todo', 'alias' => 'todo'); $lang->my->menu->myWork = array('link' => '待处理|my|work|mode=task'); if($config->systemMode == 'new') { @@ -305,7 +308,6 @@ else $lang->my->menu->contribute = array('link' => '贡献|my|contribute|mode=task'); $lang->my->menu->dynamic = '动态|my|dynamic|'; $lang->my->menu->score = array('link' => '积分|my|score|', 'subModule' => 'score'); -$lang->my->menu->team = array('link' => '团队|my|team|', 'subModule' => 'user'); $lang->my->menu->contacts = '联系人|my|managecontacts|'; $lang->my->workMenu = new stdclass(); @@ -324,7 +326,7 @@ $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; $lang->my->contributeMenu->testcase = '用例|my|contribute|mode=testcase&type=openedbyme'; $lang->my->contributeMenu->testtask = '测试单|my|contribute|mode=testtask&type=done'; -$lang->my->dividerMenu = ',myProject,team,'; +$lang->my->dividerMenu = ',myWork,score,'; $lang->todo = new stdclass(); $lang->todo->menu = $lang->my->menu; @@ -521,8 +523,6 @@ $lang->company->menu = new stdclass(); $lang->company->menu->browseUser = array('link' => '用户|company|browse', 'subModule' => ',user,'); $lang->company->menu->dept = array('link' => '部门|dept|browse', 'subModule' => 'dept'); $lang->company->menu->browseGroup = array('link' => '权限|group|browse', 'subModule' => 'group'); -$lang->company->menu->dynamic = '动态|company|dynamic|'; -$lang->company->menu->view = array('link' => '公司|company|view'); /* 后台管理菜单设置。*/ $lang->admin = new stdclass(); diff --git a/module/company/control.php b/module/company/control.php index b1ab021140..7fb824c385 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -147,6 +147,9 @@ class company extends control */ public function view() { + $this->lang->navGroup->company = 'system'; + $this->lang->noMenuModule[] = 'company'; + $this->company->setMenu(); $this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->company->view; $this->view->position[] = $this->lang->company->view; @@ -167,6 +170,9 @@ class company extends control */ public function dynamic($browseType = 'today', $param = '', $recTotal = 0, $date = '', $direction = 'next') { + $this->lang->navGroup->company = 'system'; + $this->lang->noMenuModule[] = 'company'; + $this->company->setMenu(); $this->app->loadLang('user'); $this->app->loadLang('execution'); diff --git a/module/index/js/index.js b/module/index/js/index.js index 774584d135..6fff2ff7fd 100644 --- a/module/index/js/index.js +++ b/module/index/js/index.js @@ -117,6 +117,8 @@ { if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program'; } + if(moduleName === 'my') if(methodLowerCase === 'team' || methodLowerCase == 'calendar') return 'system'; + if(moduleName === 'company') if(methodLowerCase === 'view' || methodLowerCase == 'dynamic') return 'system'; if(moduleName === 'tree') { if(methodLowerCase === 'browse') diff --git a/module/my/control.php b/module/my/control.php index 7586287af1..dbe9775c20 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -129,6 +129,7 @@ class my extends control */ public function todo($type = 'before', $userID = '', $status = 'all', $orderBy = "date_desc,status,begin", $recTotal = 0, $recPerPage = 20, $pageID = 1) { + $this->lang->navGroup->my = 'system'; /* Save session. */ $uri = $this->app->getURI(true); if($this->app->viewType != 'json') @@ -615,6 +616,8 @@ class my extends control */ public function team($orderBy = 'id', $recTotal = 0, $recPerPage = 15, $pageID = 1) { + $this->lang->navGroup->my = 'system'; + /* Set the pager. */ $this->app->loadClass('pager', $static = true); $pager = new pager($recTotal, $recPerPage, $pageID); diff --git a/module/project/js/browse.js b/module/project/js/browse.js index 6efb00afd4..f3f57b523e 100644 --- a/module/project/js/browse.js +++ b/module/project/js/browse.js @@ -8,5 +8,4 @@ $(function() }); }); -$('#project' + projectID).addClass('active'); $(".tree .active").parent('li').addClass('active'); diff --git a/module/user/model.php b/module/user/model.php index ee31789cd9..8fa6513a76 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -2467,8 +2467,7 @@ class userModel extends model */ public function resetMenu() { - $this->lang->navGroup->user = 'my'; - $this->lang->admin->menu = $this->lang->my->menu; + $this->lang->navGroup->user = 'system'; $this->lang->noMenuModule[] = 'user'; } } From e434046f8a6ea64d8a538d5d0c23e46d83848b18 Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Wed, 10 Mar 2021 10:24:33 +0800 Subject: [PATCH 5/7] * Finish task #36468. --- module/execution/control.php | 2 +- module/product/control.php | 30 ++++++++++++++++++++++------- module/product/model.php | 15 ++++++++++++--- module/product/view/browse.html.php | 1 + module/projectstory/control.php | 3 +-- module/story/model.php | 6 +++--- module/tree/model.php | 27 ++++++++++++++++++++++---- 7 files changed, 64 insertions(+), 20 deletions(-) diff --git a/module/execution/control.php b/module/execution/control.php index 218b446514..bec99166b1 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -803,7 +803,7 @@ class execution extends control $this->view->orderBy = $orderBy; $this->view->type = $this->session->executionStoryBrowseType; $this->view->param = $param; - $this->view->moduleTree = $this->loadModel('tree')->getProjectStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createExecutionStoryLink')); + $this->view->moduleTree = $this->loadModel('tree')->getExecutionStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createExecutionStoryLink')); $this->view->tabID = 'story'; $this->view->storyTasks = $storyTasks; $this->view->storyBugs = $storyBugs; diff --git a/module/product/control.php b/module/product/control.php index ac5957a401..97f1463622 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -132,7 +132,7 @@ class product extends control $this->loadModel('execution'); /* Set product, module and query. */ - $productID = $this->product->saveState($productID, $this->products); + $productID = $this->app->rawModule != 'projectstory' ? $this->product->saveState($productID, $this->products) : $productID; $branch = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch; setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true); setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true); @@ -174,11 +174,25 @@ class product extends control { setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', false, false); $browseType = 'unclosed'; - $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "¶m=$param&storyType=$storyType"); + if($this->app->rawModule == 'projectstory' and empty($productID)) + { + $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink')); + } + else + { + $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', $branch, "¶m=$param&storyType=$storyType"); + } } else { - $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "¶m=$param&storyType=$storyType"); + if($this->app->rawModule == 'projectstory' and empty($productID)) + { + $moduleTree = $this->tree->getExecutionStoryTreeMenu($this->session->PRJ, 0, array('treeModel', 'createProjectStoryLink')); + } + else + { + $moduleTree = $this->tree->getTreeMenu($productID, 'story', $startModuleID = 0, array('treeModel', $createModuleLink), '', (int)$this->cookie->treeBranch, "¶m=$param&storyType=$storyType"); + } } if($browseType != 'bymodule' and $browseType != 'bybranch') $this->session->set('storyBrowseType', $browseType); @@ -201,7 +215,7 @@ class product extends control $stories = $this->product->getStories($productID, $branch, $browseType, $queryID, $moduleID, $storyType, $sort, $pager); if($this->app->rawModule == 'projectstory') { - $this->session->set('currentProductType', $product->type); + if(!empty($product)) $this->session->set('currentProductType', $product->type); $projectProducts = $this->product->getProducts($this->session->PRJ); $productPlans = $this->execution->getPlans($projectProducts); @@ -244,13 +258,15 @@ class product extends control $showModule = !empty($this->config->datatable->productBrowse->showModule) ? $this->config->datatable->productBrowse->showModule : ''; $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'story', $showModule) : array(); + $productName = ($this->app->rawModule == 'projectstory' and empty($productID)) ? $this->lang->product->all : $this->products[$productID]; + /* Assign. */ - $this->view->title = $this->products[$productID]. $this->lang->colon . $this->lang->product->browse; - $this->view->position[] = $this->products[$productID]; + $this->view->title = $productName . $this->lang->colon . $this->lang->product->browse; + $this->view->position[] = $productName; $this->view->position[] = $this->lang->product->browse; $this->view->productID = $productID; $this->view->product = $product; - $this->view->productName = $this->products[$productID]; + $this->view->productName = $productName; $this->view->moduleID = $moduleID; $this->view->stories = $stories; $this->view->plans = $this->loadModel('productplan')->getPairs($productID, $branch, '', true); diff --git a/module/product/model.php b/module/product/model.php index a81c632fcd..90a25c7106 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -823,9 +823,18 @@ class productModel extends model { $this->config->product->search['actionURL'] = $actionURL; $this->config->product->search['queryID'] = $queryID; - $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID); - $this->config->product->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->product->allProduct); - $this->config->product->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'story', $startModuleID = 0); + $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID); + + if($this->app->rawModule == 'projectstory' and empty($productID)) + { + $this->config->product->search['params']['product']['values'] = array('all' => $this->lang->product->allProduct, 'all' => $this->lang->product->allProduct); + } + else + { + $this->config->product->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->product->allProduct); + } + + $this->config->product->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'story', $startModuleID = 0); if($this->session->currentProductType == 'normal') { unset($this->config->product->search['fields']['branch']); diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php index 2526773b87..1982955bcc 100644 --- a/module/product/view/browse.html.php +++ b/module/product/view/browse.html.php @@ -51,6 +51,7 @@ $isProjectStory = $this->app->rawModule == 'projectstory';