+
name;?>
diff --git a/module/execution/control.php b/module/execution/control.php
index 23e12a6ecc..b97958c31b 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1876,7 +1876,6 @@ class execution extends control
$this->view->title = $this->app->tab == 'execution' ? $this->lang->execution->createExec : $this->lang->execution->create;
$this->view->position[] = $this->view->title;
$this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('execution', 'all') : '';
- $this->view->executions = array('' => '') + $this->execution->getList($projectID);
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->allProducts = $allProducts;
$this->view->acl = $acl;
@@ -1887,7 +1886,7 @@ class execution extends control
$this->view->teams = array(0 => '') + $this->execution->getCanCopyObjects((int)$projectID);
$this->view->allProjects = array(0 => '') + $this->project->getPairsByModel('all', 0, 'noclosed,multiple');
$this->view->copyProjects = $copyProjects;
- $this->view->copyExecutions = array('' => '') + $this->execution->getList($copyProjectID);
+ $this->view->copyExecutions = array('' => '') + $this->execution->getList($copyProjectID, 'all', 'all', 0, 0, 0, null, false);
$this->view->executionID = $executionID;
$this->view->productID = $productID;
$this->view->projectID = $projectID;
@@ -4447,7 +4446,7 @@ class execution extends control
*/
public function ajaxGetCopyProjectExecutions($projectID = 0)
{
- $executions = $this->execution->getList($projectID);
+ $executions = $this->execution->getList($projectID, 'all', 'all', 0, 0, 0, null, false);
echo json_encode($executions);
}
diff --git a/module/execution/js/common.js b/module/execution/js/common.js
index 37b32040ba..92ca8e7134 100644
--- a/module/execution/js/common.js
+++ b/module/execution/js/common.js
@@ -177,9 +177,6 @@ function loadBranches(product)
disableSelectedProduct();
}
- var branch = $('#branch' + index);
- loadPlans(product, branch);
-
if(typeof isStage != 'undefined' && isStage == true)
{
$tableRow.find("select[name^='branch'] option").attr('selected', 'selected');
@@ -187,6 +184,9 @@ function loadBranches(product)
$tableRow.find("div[id^='branch']").addClass('chosen-disabled');
}
});
+
+ var branch = $('#branch' + index);
+ loadPlans(product, branch);
}
/**
diff --git a/module/execution/model.php b/module/execution/model.php
index dd1dc9d835..76f9b07418 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -1742,10 +1742,11 @@ class executionModel extends model
* @param int $productID
* @param int $branch
* @param object $pager
+ * @param bool $withChildren
* @access public
* @return array
*/
- public function getList($projectID = 0, $type = 'all', $status = 'all', $limit = 0, $productID = 0, $branch = 0, $pager = null)
+ public function getList($projectID = 0, $type = 'all', $status = 'all', $limit = 0, $productID = 0, $branch = 0, $pager = null, $withChildren = true)
{
if($status == 'involved') return $this->getInvolvedExecutionList($projectID, $status, $limit, $productID, $branch);
@@ -1762,6 +1763,7 @@ class executionModel extends model
->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
+ ->beginIF(!$withChildren)->andWhere('grade')->eq(1)->fi()
->orderBy('order_desc')
->page($pager)
->beginIF($limit)->limit($limit)->fi()
@@ -1778,6 +1780,7 @@ class executionModel extends model
->beginIF($status == 'undone')->andWhere('status')->notIN('done,closed')->fi()
->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
+ ->beginIF(!$withChildren)->andWhere('grade')->eq(1)->fi()
->orderBy('order_desc')
->page($pager)
->beginIF($limit)->limit($limit)->fi()
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index bb3d9a2e73..cb134dfd7e 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -309,15 +309,14 @@
-
+
execution->copyNoExecution;?>
-
- $execution):?>
+ $execution):?>
diff --git a/module/product/model.php b/module/product/model.php
index db69c6d15d..4461499a2b 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1443,11 +1443,11 @@ class productModel extends model
$hasWaterfall = false;
foreach($projects as $project)
{
- if($project->model == 'waterfall') $hasWaterfall = true;
+ if(in_array($project->model, array('waterfall', 'waterfallplus'))) $hasWaterfall = true;
}
$orderBy = $hasWaterfall ? 't2.begin_asc,t2.id_asc' : 't2.begin_desc,t2.id_desc';
- $executions = $this->dao->select('t2.id,t2.name,t2.grade,t2.path,t2.parent,t2.attribute,t2.multiple,t3.name as projectName')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+ $executions = $this->dao->select('t2.id,t2.name,t2.project,t2.grade,t2.path,t2.parent,t2.attribute,t2.multiple,t3.name as projectName')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project = t2.id')
->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project = t3.id')
->where('t1.product')->eq($productID)
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index 5fa5aff2a4..969d9f0164 100755
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -48,11 +48,7 @@
- edition != 'max' or $model == 'kanban'):?>
-
-
-