diff --git a/module/project/control.php b/module/project/control.php index f97e652426..a4da162f25 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -1766,14 +1766,15 @@ class project extends control * * @param string $model * @param int $hasProduct + * @param string $category * @access public * @return void */ - public function ajaxGetWorkflowGroups(string $model, int $hasProduct) + public function ajaxGetWorkflowGroups(string $model, int $hasProduct, string $category) { if($this->config->edition == 'open') return false; - $workflowGroups = $this->loadModel('workflowgroup')->getPairs('project', $model, $hasProduct, 'normal', '0'); + $workflowGroups = $this->loadModel('workflowgroup')->getPairs('project', $model, $hasProduct, 'normal', '0', $category); $items = $this->workflowgroup->appendBuildinLabel($workflowGroups); return $this->send(array('items' => array_values($items), 'defaultValue' => key($workflowGroups))); diff --git a/module/project/js/common.ui.js b/module/project/js/common.ui.js index 2bda412897..3256a6b356 100644 --- a/module/project/js/common.ui.js +++ b/module/project/js/common.ui.js @@ -28,7 +28,8 @@ function changeType() if(hasProduct !== '') { - const link = $.createLink('project', 'ajaxGetWorkflowGroups', `model=${model}&hasProduct=${hasProduct}`); + const category = $('[name=category]').val() || ''; + const link = $.createLink('project', 'ajaxGetWorkflowGroups', `model=${model}&hasProduct=${hasProduct}&category=${category}`); $.getJSON(link, function(data) { if(data.items) diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php index 6f943d9e48..9f51983f2f 100644 --- a/module/project/ui/create.html.php +++ b/module/project/ui/create.html.php @@ -90,6 +90,7 @@ formGridPanel on::change('[name=longTime]', $handleLongTimeChange), on::change('[name=future]', 'toggleBudget'), on::change('[name=begin], [name=end]', 'computeWorkDays'), + on::change('[name="category"]', 'changeCategory'), on::change('[name^=products]', 'toggleStageBy'), on::change('[name=parent], [name=budget]', 'checkBudget'), on::change('[name^=storyType]', 'toggleStoryType'),