diff --git a/module/product/zen.php b/module/product/zen.php index 764b7da85a..57d4987020 100644 --- a/module/product/zen.php +++ b/module/product/zen.php @@ -255,7 +255,8 @@ class productZen extends product if($this->config->edition != 'open' && isset($fields['workflowGroup'])) { - $fields['workflowGroup']['options'] = $this->loadModel('workflowGroup')->getPairs(); + $groupPairs = $this->loadModel('workflowGroup')->getPairs(); + $fields['workflowGroup']['options'] = $this->workflowGroup->appendBuildinLabel($groupPairs); } return $fields; diff --git a/module/project/control.php b/module/project/control.php index ce88e1df09..3124fc4e95 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -1732,9 +1732,7 @@ class project extends control $workflowGroups = $this->loadModel('workflowgroup')->getPairs('project', $model, $hasProduct); - $items = array(); - foreach($workflowGroups as $id => $name) $items[] = array('text' => $name, 'value' => $id); - + $items = $this->workflowgroup->appendBuildinLabel($workflowGroups); return $this->send(array('items' => array_values($items), 'defaultValue' => key($workflowGroups))); } } diff --git a/module/project/zen.php b/module/project/zen.php index 6fb07986e6..08c341feaf 100755 --- a/module/project/zen.php +++ b/module/project/zen.php @@ -328,7 +328,11 @@ class projectZen extends project } $hasProduct = isset($copyProject->hasProduct) ? $copyProject->hasProduct : 1; - if($this->config->edition != 'open') $this->view->workflowGroups = $this->loadModel('workflowgroup')->getPairs('project', $model, $hasProduct); + if($this->config->edition != 'open') + { + $workflowGroups = $this->loadModel('workflowgroup')->getPairs('project', $model, $hasProduct); + $this->view->workflowGroups = $this->workflowgroup->appendBuildinLabel($workflowGroups); + } /* Get copy projects. */ $copyProjects = $this->project->getPairsByModel($model, '', 0, false);