diff --git a/module/custom/config.php b/module/custom/config.php index 9998ce947e..2fbe6dca93 100644 --- a/module/custom/config.php +++ b/module/custom/config.php @@ -22,8 +22,8 @@ $config->custom->requiredModules[35] = 'execution'; $config->custom->requiredModules[40] = 'task'; $config->custom->requiredModules[45] = 'build'; -$config->custom->allFeatures = array('program', 'productRR', 'productUR', 'productLine', 'projectScrum', 'projectWaterfall', 'projectKanban', 'execution', 'vision'); -$config->custom->features = array('waterfall', 'productUR'); +$config->custom->allFeatures = array('program', 'productRR', 'productUR', 'productLine', 'projectScrum', 'projectWaterfall', 'projectKanban', 'execution', 'vision'); +$config->custom->dataFeatures = array('waterfall', 'productUR'); $config->custom->requiredModules[50] = 'bug'; $config->custom->requiredModules[55] = 'testcase'; diff --git a/module/custom/control.php b/module/custom/control.php index f939abc1be..a100b55f83 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -645,7 +645,7 @@ class custom extends control } $disabledFeatures = array('program', 'productLine', 'scrum' => array('scrumMeasrecord')); - foreach($this->config->custom->features as $feature) + foreach($this->config->custom->dataFeatures as $feature) { $function = 'has' . ucfirst($feature) . 'Data'; if(!$this->custom->$function()) diff --git a/module/custom/model.php b/module/custom/model.php index af0bea4f8a..6e124ef93b 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -897,7 +897,7 @@ class customModel extends model $disabledFeatures = ''; if($mode == 'light') { - foreach($this->config->custom->features as $feature) + foreach($this->config->custom->dataFeatures as $feature) { $function = 'has' . ucfirst($feature) . 'Data'; if(!$this->$function()) $disabledFeatures .= "$feature,"; diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php index 8e7df46be1..ca1c6fe424 100644 --- a/module/project/view/manageproducts.html.php +++ b/module/project/view/manageproducts.html.php @@ -101,7 +101,6 @@ - division and count($linkedProducts) == 1):?> project->noticeDivsion);?> project->divisionList);?>