Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/zentaopms240' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms240

Browse Source
This commit is contained in:
wangyidong
2022-09-26 15:27:20 +08:00
parent 7a48c595b4 872f0166b4
commit 70c347f3af
21 changed files with 260 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+5 -5
View File
@@ -2503,7 +2503,7 @@ class projectModel extends model
if($project->type == 'project')
{
$modal = $project->model;
$model = $project->model;
$projectID = $project->id;
$executionID = $this->dao->select('id')->from(TABLE_EXECUTION)
->where('project')->eq($projectID)
@@ -2514,7 +2514,7 @@ class projectModel extends model
}
else
{
$modal = $project->type == 'kanban' ? 'kanban' : 'scrum';
$model = $project->type == 'kanban' ? 'kanban' : 'scrum';
$executionID = $project->id;
$projectID = $project->project;
}
@@ -2524,9 +2524,9 @@ class projectModel extends model
$this->session->set('noSprint', true);
$navGroup = zget($this->lang->navGroup, $moduleName);
$this->lang->$navGroup->menu = $this->lang->noSprint->{$modal}->menu;
$this->lang->$navGroup->menuOrder = $this->lang->noSprint->{$modal}->menuOrder;
$this->lang->$navGroup->dividerMenu = $this->lang->noSprint->{$modal}->dividerMenu;
$this->lang->$navGroup->menu = $this->lang->noSprint->{$model}->menu;
$this->lang->$navGroup->menuOrder = $this->lang->noSprint->{$model}->menuOrder;
$this->lang->$navGroup->dividerMenu = $this->lang->noSprint->{$model}->dividerMenu;
foreach($this->lang->$navGroup->menu as $label => $menu)
{