diff --git a/module/program/control.php b/module/program/control.php index 59a317c0ff..72f7c663dc 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -611,7 +611,7 @@ class program extends control } } - if(isset($this->config->edition == 'biz')) list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats); + if($this->config->edition != 'open') list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats); $this->post->set('fields', $fields); $this->post->set('rows', $programs); diff --git a/module/programplan/model.php b/module/programplan/model.php index 6d3d4f1c54..846fe20a33 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -779,7 +779,7 @@ class programplanModel extends model if($id == 'actions') $class .= ' c-actions'; echo ""; - if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('programplan', $plan, $id); + if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('programplan', $plan, $id); switch($id) { case 'id': diff --git a/module/project/control.php b/module/project/control.php index 1d2bc465d8..3e803c2bec 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -76,7 +76,7 @@ class project extends control } } - if($this->config->edition == 'biz') list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats); + if($this->config->edition != 'open') list($fields, $projectStats) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $projectStats); $this->post->set('fields', $fields); $this->post->set('rows', $projects); diff --git a/module/project/model.php b/module/project/model.php index 622bfecef5..47cfee8d87 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1631,7 +1631,7 @@ class projectModel extends model if($id == 'surplus') $title = "title='{$project->hours->totalLeft} {$this->lang->execution->workHour}'"; echo ""; - if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('project', $project, $id); + if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('project', $project, $id); switch($id) { case 'id': diff --git a/module/search/model.php b/module/search/model.php index 42dc4457bb..5e63009adc 100644 --- a/module/search/model.php +++ b/module/search/model.php @@ -24,7 +24,7 @@ class searchModel extends model public function setSearchParams($searchConfig) { $module = $searchConfig['module']; - if($this->config->edition == 'biz') + if($this->config->edition != 'open') { $flowModule = $module; if($module == 'projectStory') $flowModule = 'story'; @@ -688,7 +688,7 @@ class searchModel extends model $fields = $this->config->search->fields->{$objectType}; if(empty($fields)) return true; - if($objectType == 'doc' && $this->config->edition == 'biz') $object = $this->appendFiles($object); + if($objectType == 'doc' && $this->config->edition != 'open') $object = $this->appendFiles($object); $index = new stdclass(); $index->objectID = $object->{$fields->id}; diff --git a/module/story/control.php b/module/story/control.php index 15c414ca19..26d683b510 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -2431,7 +2431,7 @@ class story extends control } if(!(in_array('platform', $productsType) or in_array('branch', $productsType))) unset($fields['branch']);// If products's type are normal, unset branch field. - if($this->config->edition == 'biz') list($fields, $stories) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $stories); + if($this->config->edition != 'open') list($fields, $stories) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $stories); $this->post->set('fields', $fields); $this->post->set('rows', $stories); diff --git a/module/story/model.php b/module/story/model.php index beffa1d615..4cbea972f6 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3821,7 +3821,7 @@ class storyModel extends model } echo ""; - if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('story', $story, $id); + if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('story', $story, $id); switch($id) { case 'id': diff --git a/module/task/control.php b/module/task/control.php index 2f91e5983b..3a077b1610 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -1920,7 +1920,7 @@ class task extends control } } } - if($this->config->edition == 'biz') list($fields, $tasks) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $tasks); + if($this->config->edition != 'open') list($fields, $tasks) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $tasks); $this->post->set('fields', $fields); $this->post->set('rows', $tasks); diff --git a/module/task/model.php b/module/task/model.php index a7d73b5086..6986f66db0 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3147,7 +3147,7 @@ class taskModel extends model } echo ""; - if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('task', $task, $id); + if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('task', $task, $id); switch($id) { case 'id': diff --git a/module/testcase/control.php b/module/testcase/control.php index 777d78a1b0..f9fb55bcbc 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1593,7 +1593,7 @@ class testcase extends control } } } - if($this->config->edition == 'biz') list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $cases); + if($this->config->edition != 'open') list($fields, $cases) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $cases); $this->post->set('fields', $fields); $this->post->set('rows', $cases); diff --git a/module/testcase/model.php b/module/testcase/model.php index 765842682d..0fbf2ba868 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -1535,7 +1535,7 @@ class testcaseModel extends model if(strpos(',stage,precondition,keywords,story,', ",{$id},") !== false) $class .= ' text-ellipsis'; echo ""; - if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('testcase', $case, $id); + if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('testcase', $case, $id); switch($id) { case 'id': diff --git a/module/testtask/model.php b/module/testtask/model.php index c3cfdec606..322814e16c 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -1414,7 +1414,7 @@ class testtaskModel extends model if($id == 'actions') $class .= 'c-actions'; echo ""; - if($this->config->edition == 'biz') $this->loadModel('flow')->printFlowCell('testcase', $run, $id); + if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('testcase', $run, $id); switch ($id) { case 'id': diff --git a/module/todo/control.php b/module/todo/control.php index 910cbca769..dec411e548 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -617,7 +617,7 @@ class todo extends control unset($todo->idvalue); unset($todo->private); } - if($this->config->edition == 'biz') list($fields, $todos) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $todos); + if($this->config->edition != 'open') list($fields, $todos) = $this->loadModel('workflowfield')->appendDataFromFlow($fields, $todos); $this->post->set('fields', $fields); $this->post->set('rows', $todos);