Merge branch 'leiyong_fix_bug' into 'master'

* Fix bug#25807.

See merge request easycorp/zentaopms!4716
This commit is contained in:
王怡栋
2022-07-28 07:59:29 +00:00
3 changed files with 9 additions and 3 deletions
+6 -2
View File
@@ -2613,9 +2613,13 @@ class executionModel extends model
}
}
$projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
if($this->config->systemMode == 'new')
{
$projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
$this->session->set('project', $projectID);
$this->linkStory($projectID, $planStories, $planProducts);
}
$this->linkStory($executionID, $planStories, $planProducts);
if($this->config->systemMode == 'new') $this->linkStory($projectID, $planStories, $planProducts);
}
/**
+2
View File
@@ -120,3 +120,5 @@ body.menu-hide {padding-left: 0;}
{
#upgradeContent{width: 85%;}
}
#searchbox .dropdown-menu > li.search-type-all{max-width: 250px}
#searchbox .dropdown-menu > li.search-type-all a{width: 100%; overflow: hidden; text-overflow: ellipsis;}
+1 -1
View File
@@ -1 +1 @@
#bindForm .c-bind{width: 128px;}
#bindForm .c-bind{width: 148px;}