Merge branch ztflow-wangyuting-release/21.7.2#wangyuting of zentao/zentaopms (#9490)
This commit is contained in:
@@ -149,6 +149,7 @@ class executionModel extends model
|
||||
{
|
||||
dao::$filterTpl = 'never';
|
||||
$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);
|
||||
|
||||
@@ -147,8 +147,10 @@ class project extends control
|
||||
/* Set cookie for show all project. */
|
||||
$_COOKIE['showClosed'] = 1;
|
||||
|
||||
$project = $this->project->fetchByID($projectID);
|
||||
|
||||
/* Query user's project and program. */
|
||||
$projects = $this->project->getListByCurrentUser();
|
||||
$projects = $this->project->getListByCurrentUser('*', !empty($project->isTpl) ? 'onlyTpl' : '');
|
||||
$involvedProjects = $this->project->getInvolvedListByCurrentUser();
|
||||
$programs = $this->loadModel('program')->getPairs(true);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user