From 1b42cb6ff6ce01697f453a7f888bcde8aa96b5b7 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 9 Mar 2021 16:12:28 +0800 Subject: [PATCH] * Merge code. --- module/common/lang/de.php | 19 +++++++------------ module/common/lang/en.php | 19 +++++++------------ module/common/lang/fr.php | 19 +++++++------------ module/common/lang/vi.php | 19 +++++++------------ module/common/lang/zh-cn.php | 23 ++++++++++++----------- module/common/model.php | 6 ------ module/stakeholder/control.php | 3 ++- 7 files changed, 42 insertions(+), 66 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 621cefcf24..8f95d4b7d1 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -896,20 +896,16 @@ $lang->menu->scrum->ci = 'Code|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse'); $lang->menu->scrum->dynamic = array('link' => 'Dynamic|project|dynamic|project={PROJECT}'); -$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); -$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); +$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -961,8 +957,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 7f13345058..acd0fd49c7 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -895,20 +895,16 @@ $lang->menu->scrum->ci = 'Code|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse'); $lang->menu->scrum->dynamic = array('link' => 'Dynamic|project|dynamic|project={PROJECT}'); -$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); -$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); +$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -960,8 +956,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 1a6c6dd0d4..930f2a06d4 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -895,20 +895,16 @@ $lang->menu->scrum->ci = 'Code|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse'); $lang->menu->scrum->dynamic = array('link' => 'Dynamic|project|dynamic|project={PROJECT}'); -$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); -$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); +$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -960,8 +956,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index ab43c7303a..581daef645 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -895,20 +895,16 @@ $lang->menu->scrum->ci = 'Code|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => 'Build|projectbuild|browse|project={PROJECT}'); $lang->menu->scrum->projectrelease = array('link' => 'Release|projectrelease|browse'); $lang->menu->scrum->dynamic = array('link' => 'Dynamic|project|dynamic|project={PROJECT}'); -$lang->menu->scrum->other = array('link' => 'Other|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => 'Setting|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); -$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => 'View|project|view|project={PROJECT}'); +$lang->scrum->setMenu->products = array('link' => 'Product|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => 'Member|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => 'White List|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->subMenu->stakeholder = array('link' => 'Stakeholder|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => 'Priv Group|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -960,8 +956,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => 'Stakeholder List|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => 'Issue|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index e61a79c33a..ee0f821f7b 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -895,22 +895,24 @@ $lang->menu->scrum->doc = '文档|doc|index|'; $lang->menu->scrum->qa = '测试|qa|index'; $lang->menu->scrum->ci = '代码|repo|browse'; $lang->menu->scrum->projectbuild = array('link' => '版本|projectbuild|browse|project={PROJECT}'); +<<<<<<< c02b5e3b4a6a00c7456d91ff8c19d01fd47cd664 $lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse|project={PROJECT}'); $lang->menu->scrum->dynamic = array('link' => '动态|project|dynamic'); $lang->menu->scrum->other = array('link' => '其他|project|other', 'class' => 'dropdown dropdown-hover waterfall-list', 'subModule' => 'issue,risk,stakeholder'); $lang->menu->scrum->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); +======= +$lang->menu->scrum->projectrelease = array('link' => '发布|projectrelease|browse'); +$lang->menu->scrum->projectsetting = array('link' => '设置|project|view|project={PROJECT}', 'subModule' => 'stakeholder', 'alias' => 'edit,manageproducts,group,managemembers,manageview,managepriv,whitelist,addwhitelist'); +>>>>>>> * Finish task #36444. $lang->scrum = new stdclass(); -$lang->scrum->subMenu = new stdclass(); -$lang->scrum->subMenu->other = new stdclass(); -$lang->scrum->subMenu->other->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder'); - $lang->scrum->setMenu = new stdclass(); -$lang->scrum->setMenu->view = array('link' => '概况|project|view|project={PROJECT}', 'alias' => 'edit'); -$lang->scrum->setMenu->products = array('link' => '产品|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); -$lang->scrum->setMenu->members = array('link' => '团队|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); -$lang->scrum->setMenu->group = array('link' => '权限|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); -$lang->scrum->setMenu->whitelist = array('link' => '白名单|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->view = array('link' => '概况|project|view|project={PROJECT}', 'alias' => 'edit'); +$lang->scrum->setMenu->products = array('link' => '产品|project|manageProducts|project={PROJECT}', 'alias' => 'manageproducts'); +$lang->scrum->setMenu->members = array('link' => '团队|project|manageMembers|project={PROJECT}', 'alias' => 'managemembers'); +$lang->scrum->setMenu->whitelist = array('link' => '白名单|project|whitelist|project={PROJECT}', 'subModule' => 'personnel'); +$lang->scrum->setMenu->stakeholder = array('link' => '干系人|stakeholder|browse|', 'subModule' => 'stakeholder'); +$lang->scrum->setMenu->group = array('link' => '权限|project|group|project={PROJECT}', 'alias' => 'group,manageview,managepriv'); /* Waterfall menu. */ $lang->menu->waterfall = new stdclass(); @@ -962,8 +964,7 @@ $lang->stakeholder->menu = new stdclass(); $lang->waterfallproduct->menu = new stdclass(); $lang->projectstory->menu = new stdclass(); -$lang->stakeholder->menu->list = array('link' => '干系人列表|stakeholder|browse|', 'alias' => 'create,edit,view,batchcreate'); -$lang->stakeholder->menu->issue = array('link' => '问题管理|stakeholder|issue|'); +$lang->stakeholder->menu = $lang->scrum->setMenu; $lang->nc->menu = $lang->auditplan->menu; $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'execution', 'task', 'build', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage'); diff --git a/module/common/model.php b/module/common/model.php index 0707a34015..42982aff7f 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -711,9 +711,6 @@ class commonModel extends model $subMenu = ""; } - /* Disable links to more buttons. */ - if($menuItem->name == 'other') $link = 'javascript:void(0);'; - /* Avoid highlighting the same navigation method at the same time. */ if($currentModule == 'feedback' and $currentMethod == 'admin') $active = ''; if($currentModule == 'product' and $currentMethod == 'browse') $active = ''; @@ -1761,9 +1758,6 @@ EOD; $module = strtolower($module); $method = strtolower($method); - /* More menus do not require permission control. */ - if($module == 'project' && $method == 'other') return true; - /* Check the parent object is closed. */ if(!empty($method) and strpos('close|batchclose', $method) === false and !commonModel::canBeChanged($module, $object)) return false; diff --git a/module/stakeholder/control.php b/module/stakeholder/control.php index 617b724f5f..ecbca2aee2 100644 --- a/module/stakeholder/control.php +++ b/module/stakeholder/control.php @@ -105,6 +105,7 @@ class stakeholder extends control $this->loadModel('user'); $this->loadModel('dept'); + $this->loadModel('execution'); $deptUsers = $dept === '' ? array() : $this->dept->getDeptUserPairs($dept); $this->view->title = $this->lang->stakeholder->batchCreate; @@ -117,7 +118,7 @@ class stakeholder extends control $this->view->projectID = $this->session->PRJ; $this->view->depts = array('' => '') + $this->dept->getOptionMenu(); $this->view->stakeholders = $this->stakeholder->getStakeholders('all', 'id_desc'); - $this->view->parentStakeholders = $this->program->getStakeholders($parentID, 't1.id_desc'); + $this->view->parentStakeholders = $this->loadModel('program')->getStakeholders($parentID, 't1.id_desc'); $this->display(); }