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

Merge branch 'sprint/tianshujie_fixbug' into 'master'

Browse Source 
* Fix bug #12208.

See merge request easycorp/zentaopms!2719
This commit is contained in:
孙广明
2022-04-01 07:53:07 +00:00
parent 31447671cb 4503f0b9d8
commit 2aa0fb72b8
4 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menu.php
+1 -1
View File
@@ -296,7 +296,7 @@ $lang->kanban->dividerMenu = '';
/* Execution menu. */
$lang->execution->homeMenu = new stdclass();
$lang->execution->homeMenu->all = array('link' => "{$lang->execution->all}|execution|all|", 'alias' => 'batchedit');
$lang->execution->homeMenu->all = array('link' => "{$lang->execution->all}|execution|all|", 'alias' => 'create,batchedit');
if($config->systemMode == 'new') $lang->execution->homeMenu->executionkanban = array('link' => "{$lang->execution->executionKanban}|execution|executionkanban|");
$lang->execution->menu = new stdclass();
module/design/control.php
+1
View File
@@ -276,6 +276,7 @@ class design extends control
$this->view->design = $design;
$this->view->project = $this->loadModel('project')->getByID($design->project);
$this->view->stories = $this->loadModel('story')->getProductStoryPairs($design->product);
$this->view->users = $this->loadModel('user')->getPairs('noclosed');
$this->display();
}
module/execution/control.php
+1 -18
View File
@@ -1263,24 +1263,7 @@ class execution extends control
*/
public function create($projectID = '', $executionID = 0, $copyExecutionID = '', $planID = 0, $confirm = 'no', $productID = 0, $extra = '')
{
/* Set menu. */
if($this->app->tab == 'project')
{
if(!empty($copyExecutionID)) $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($copyExecutionID)->fetch('project');
$projectID = $this->project->saveState($projectID, $this->project->getPairsByProgram());
$this->project->setMenu($projectID);
}
elseif($this->app->tab == 'execution')
{
$selectedExecutionID = $executionID;
if($this->config->systemMode == 'new') $selectedExecutionID = key($this->executions);
$this->execution->setMenu($selectedExecutionID);
}
elseif($this->app->tab == 'doc')
{
unset($this->lang->doc->menu->execution['subMenu']);
}
if($this->app->tab == 'doc') unset($this->lang->doc->menu->execution['subMenu']);
$project = $this->project->getByID($projectID);
if(!empty($project) and $project->model == 'kanban')
module/project/js/build.js
+3 -1
View File
@@ -5,7 +5,9 @@ $(function()
if(executions.length == 0)
{
alert(createExecution);
location.href = createLink('execution', 'create', 'projectID=' + projectID);
var link = createLink('execution', 'create', 'projectID=' + projectID);
window.parent.$.apps.open(link, 'execution');
return false;
}
});