From e24a70f5b794edca2e53073550e24c641d46ccc2 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 31 Mar 2023 10:46:30 +0800 Subject: [PATCH] * code for task #89150. --- module/doc/control.php | 2 +- module/doc/js/common.js | 2 +- module/project/control.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 7585435f7d..bfd82f5997 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -395,7 +395,7 @@ class doc extends control if($objectType == 'project') { $objects = $this->loadModel('project')->getPairs(); - $this->view->executions = array(0 => '') + $this->loadModel('execution')->getPairs($objectID, 'all', 'multiple'); + $this->view->executions = array(0 => '') + $this->loadModel('execution')->getPairs($objectID, 'all', 'multiple,leaf,noprefix'); } elseif($objectType == 'execution') { diff --git a/module/doc/js/common.js b/module/doc/js/common.js index 0ec4c3e2dd..196c3bb582 100644 --- a/module/doc/js/common.js +++ b/module/doc/js/common.js @@ -21,7 +21,7 @@ function loadObjectModules(objectType, objectID) */ function loadExecutions(projectID) { - var link = createLink('project', 'ajaxGetExecutions', "projectID=" + projectID + "&executionID=0&mode=multiple"); + var link = createLink('project', 'ajaxGetExecutions', "projectID=" + projectID + "&executionID=0&mode=multiple,leaf,noprefix"); $('#executionBox').load(link, function(){$('#executionBox').find('select').attr('data-placeholder', holders.execution).attr('onchange', "loadObjectModules('execution', this.value)").chosen()}); loadObjectModules('project', projectID); } diff --git a/module/project/control.php b/module/project/control.php index 01a1002ec0..18e538cef6 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -201,7 +201,7 @@ class project extends control { $project = $this->project->getByID($projectID); if(!$project->multiple) return; - + $executions = $this->loadModel('execution')->getByProject($projectID, 'undone', 0, true); $executionMembers = $this->dao->select('t1.root,t2.name')->from(TABLE_TEAM)->alias('t1') ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.root=t2.id')