diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index c7643430cd..6ecdc3e943 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -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(); diff --git a/module/design/control.php b/module/design/control.php index f68abb68d9..1beea92865 100644 --- a/module/design/control.php +++ b/module/design/control.php @@ -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(); } diff --git a/module/execution/control.php b/module/execution/control.php index 5977fb331c..466fae912d 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -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') diff --git a/module/project/js/build.js b/module/project/js/build.js index 2079622260..e8a9ea9c64 100644 --- a/module/project/js/build.js +++ b/module/project/js/build.js @@ -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; } });