Merge branch dev/task-145545 of zentao/zentaopms (#9629)
This commit is contained in:
@@ -148,12 +148,13 @@ class executionModel extends model
|
||||
if(!empty($execution->isTpl))
|
||||
{
|
||||
dao::$filterTpl = 'never';
|
||||
|
||||
/* 设置模板执行的AppName。 */
|
||||
$this->lang->execution->common = $this->lang->execution->toTemplate;
|
||||
if(empty($execution->multiple)) $this->lang->project->common = $this->lang->project->template;
|
||||
|
||||
unset($this->lang->execution->menu->burn);
|
||||
unset($this->lang->execution->menu->kanban);
|
||||
unset($this->lang->execution->menu->view);
|
||||
unset($this->lang->execution->menu->story);
|
||||
unset($this->lang->execution->menu->qa);
|
||||
unset($this->lang->execution->menu->devops);
|
||||
@@ -162,6 +163,22 @@ class executionModel extends model
|
||||
unset($this->lang->execution->menu->effort);
|
||||
unset($this->lang->execution->menu->more);
|
||||
|
||||
if(!empty($this->lang->execution->menu->view['subMenu']->gantt))
|
||||
{
|
||||
$this->lang->execution->menu->gantt = $this->lang->execution->menu->view['subMenu']->gantt;
|
||||
|
||||
$taskOrder = 0;
|
||||
foreach($this->lang->execution->menuOrder as $order => $menu) if($menu == 'task') $taskOrder = $order;
|
||||
$this->lang->execution->menuOrder[$taskOrder + 1] = 'gantt';
|
||||
|
||||
if(!empty($this->lang->project->menuOrder))
|
||||
{
|
||||
$taskOrder = 0;
|
||||
foreach($this->lang->project->menuOrder as $order => $menu) if($menu == 'task') $taskOrder = $order;
|
||||
$this->lang->project->menuOrder[$taskOrder + 1] = 'gantt';
|
||||
}
|
||||
}
|
||||
|
||||
if(!empty($this->lang->execution->menu->other['dropMenu']->pssp))
|
||||
{
|
||||
$this->lang->execution->menu->pssp = $this->lang->execution->menu->other['dropMenu']->pssp;
|
||||
@@ -181,6 +198,7 @@ class executionModel extends model
|
||||
}
|
||||
}
|
||||
|
||||
unset($this->lang->execution->menu->view);
|
||||
unset($this->lang->execution->menu->other);
|
||||
if(isset($this->lang->execution->menu->settings['subMenu']->products)) unset($this->lang->execution->menu->settings['subMenu']->products); // 模板下隐藏产品
|
||||
if(isset($this->lang->execution->menu->settings['subMenu']->whitelist)) unset($this->lang->execution->menu->settings['subMenu']->whitelist); // 模板下隐藏白名单
|
||||
|
||||
Reference in New Issue
Block a user