diff --git a/module/execution/model.php b/module/execution/model.php
index 8bfbdf1b6b..6484aaac75 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -444,7 +444,7 @@ class executionModel extends model
if(!empty($sprint->percent) and isset($this->config->setPercent) and $this->config->setPercent == 1) $this->checkWorkload('create', $sprint->percent, $sprint->project);
/* Set planDuration and realDuration. */
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$sprint->planDuration = $this->loadModel('programplan')->getDuration($sprint->begin, $sprint->end);
if(!empty($sprint->realBegan) and !empty($sprint->realEnd)) $sprint->realDuration = $this->loadModel('programplan')->getDuration($sprint->realBegan, $sprint->realEnd);
@@ -636,7 +636,7 @@ class executionModel extends model
if(!empty($execution->percent) and isset($this->config->setPercent) and $this->config->setPercent == 1) $this->checkWorkload('update', $execution->percent, $oldExecution);
/* Set planDuration and realDuration. */
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$execution->planDuration = $this->loadModel('programplan')->getDuration($execution->begin, $execution->end);
if(!empty($execution->realBegan) and !empty($execution->realEnd)) $execution->realDuration = $this->programplan->getDuration($execution->realBegan, $execution->realEnd);
diff --git a/module/my/control.php b/module/my/control.php
index 38344fd394..61ec981a10 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -980,7 +980,7 @@ EOF;
}
$this->view->flows = array();
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$this->app->loadLang('approval');
$this->view->flows = $this->dao->select('module,name')->from(TABLE_WORKFLOW)->where('buildin')->eq(0)->fetchPairs('module', 'name');
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 97899d5f98..7d191a0988 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -868,7 +868,7 @@ class programplanModel extends model
foreach($datas as $data)
{
/* Set planDuration and realDuration. */
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$data->planDuration = $this->getDuration($data->begin, $data->end);
$data->realDuration = $this->getDuration($data->realBegan, $data->realEnd);
@@ -1148,7 +1148,7 @@ class programplanModel extends model
}
/* Set planDuration and realDuration. */
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$plan->planDuration = $this->getDuration($plan->begin, $plan->end);
$plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd);
diff --git a/module/project/control.php b/module/project/control.php
index bf10ebc8fb..0fc80faaaf 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1017,7 +1017,7 @@ class project extends control
$this->session->set('testtaskList', $uri, 'qa');
$this->session->set('reportList', $uri, 'qa');
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$this->session->set('riskList', $uri, 'project');
$this->session->set('issueList', $uri, 'project');
diff --git a/module/project/model.php b/module/project/model.php
index 6ceeb87ee9..2c52cc791a 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -3017,7 +3017,7 @@ class projectModel extends model
public function checkCanChangeModel($projectID, $model)
{
$checkList = $this->config->project->checkList->$model;
- if($this->config->edition == 'max') $checkList = $this->config->project->maxCheckList->$model;
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd') $checkList = $this->config->project->maxCheckList->$model;
foreach($checkList as $module)
{
if($module == '') continue;
diff --git a/module/story/model.php b/module/story/model.php
index 08e3bf2596..e89ad1fc17 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -5503,7 +5503,7 @@ class storyModel extends model
$stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id);
$stories[$id]->bugs = $this->loadModel('bug')->getStoryBugs($id);
$stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id);
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)
->where('story')->eq($id)
@@ -5577,7 +5577,7 @@ class storyModel extends model
$stories[$id]->cases = $this->loadModel('testcase')->getStoryCases($id);
$stories[$id]->bugs = $this->loadModel('bug')->getStoryBugs($id);
$stories[$id]->tasks = $this->loadModel('task')->getStoryTasks($id, 0, $projectID);
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$stories[$id]->designs = $this->dao->select('id, name')->from(TABLE_DESIGN)
->where('story')->eq($id)
@@ -5621,7 +5621,7 @@ class storyModel extends model
$track[$id]->bug = $this->loadModel('bug')->getStoryBugs($id);
$track[$id]->story = $this->getByID($id);
$track[$id]->task = $this->loadModel('task')->getStoryTasks($id);
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$track[$id]->design = $this->dao->select('id, name')->from(TABLE_DESIGN)
->where('story')->eq($id)
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 70f0c231c9..4bec7c3336 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -161,7 +161,7 @@ class testtask extends control
$this->lang->scrum->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
$this->lang->scrum->menu->qa['subMenu']->testtask['subModule'] = '';
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$this->lang->waterfall->menu->qa['subMenu']->testcase['subModule'] = 'testtask';
$this->lang->waterfall->menu->qa['subMenu']->testtask['subModule'] = '';
diff --git a/module/todo/control.php b/module/todo/control.php
index b126f003c9..967343c791 100644
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -206,7 +206,7 @@ class todo extends control
$account = $user->account;
$reviews = array();
- if($this->config->edition == 'max') $reviews = $this->loadModel('review')->getUserReviewPairs($account);
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd') $reviews = $this->loadModel('review')->getUserReviewPairs($account);
$allTodos = $this->todo->getList($type, $account, $status);
if($this->post->todoIDList) $todoIDList = $this->post->todoIDList;
@@ -228,7 +228,7 @@ class todo extends control
$tasks = $this->task->getUserTaskPairs($account, 'wait,doing', '', isset($objectIDList['task']) ? $objectIDList['task'] : '');
$storys = $this->loadModel('story')->getUserStoryPairs($account, 10, 'story', '', isset($objectIDList['story']) ? $objectIDList['story'] : '');
if($this->config->edition != 'open') $this->view->feedbacks = $this->loadModel('feedback')->getUserFeedbackPairs($account, '', isset($objectIDList['feedback']) ? $objectIDList['feedback'] : '');
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$issues = $this->loadModel('issue')->getUserIssuePairs($account);
$risks = $this->loadmodel('risk')->getUserRiskPairs($account);
@@ -256,7 +256,7 @@ class todo extends control
$this->view->bugs = $bugs;
$this->view->tasks = $tasks;
$this->view->storys = $storys;
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$this->view->issues = $issues;
$this->view->risks = $risks;
@@ -599,7 +599,7 @@ class todo extends control
$bugs = $this->loadModel('bug')->getUserBugPairs($account);
$stories = $this->loadModel('story')->getUserStoryPairs($account, 100, 'story');
$tasks = $this->loadModel('task')->getUserTaskPairs($account);
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$issues = $this->loadModel('issue')->getUserIssuePairs($account);
$risks = $this->loadModel('risk')->getUserRiskPairs($account);
@@ -621,7 +621,7 @@ class todo extends control
if($type == 'story') $todo->name = isset($stories[$todo->idvalue]) ? $stories[$todo->idvalue] . "(#$todo->idvalue)" : '';
if($type == 'task') $todo->name = isset($tasks[$todo->idvalue]) ? $tasks[$todo->idvalue] . "(#$todo->idvalue)" : '';
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
if($type == 'issue') $todo->name = isset($issues[$todo->idvalue]) ? $issues[$todo->idvalue] . "(#$todo->idvalue)" : '';
if($type == 'risk') $todo->name = isset($risks[$todo->idvalue]) ? $risks[$todo->idvalue] . "(#$todo->idvalue)" : '';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index e9037ada30..159b28b691 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -7827,7 +7827,7 @@ class upgradeModel extends model
/* User requriement */
$requirementStory = $this->dao->select('count(1) as total')->from(TABLE_STORY)->where('type')->eq('requirement')->andWhere('deleted')->eq('0')->fetch('total');
if($requirementStory > 0) $returnData['ur'] = true;
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
/* issue,risk,opportunity,process,QA,meeting */
$issue = $this->dao->select('count(1) as total')->from(TABLE_ISSUE)->alias('t1')
@@ -7901,7 +7901,7 @@ class upgradeModel extends model
->fetch('total');
if($waterfull > 0) $returnData['waterfall'] = true;
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
/* assetlib */
$assetlib = $this->dao->select('count(1) as total')->from(TABLE_ASSETLIB)
diff --git a/module/user/model.php b/module/user/model.php
index af0c921197..2980a721e8 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -2889,7 +2889,7 @@ class userModel extends model
$personalData['createdBugs'] = $this->dao->select($t1Count)->from(TABLE_BUG)->alias('t1')->leftjoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')->where('t1.openedBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
$personalData['resolvedBugs'] = $this->dao->select($t1Count)->from(TABLE_BUG)->alias('t1')->leftjoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')->where('t1.resolvedBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
$personalData['createdCases'] = $this->dao->select($count)->from(TABLE_CASE)->where('openedBy')->eq($account)->andWhere('deleted')->eq('0')->fetch('count');
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$personalData['createdRisks'] = $this->dao->select($t1Count)->from(TABLE_RISK)->alias('t1')->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')->where('t1.createdBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
$personalData['resolvedRisks'] = $this->dao->select($t1Count)->from(TABLE_RISK)->alias('t1')->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')->where('t1.resolvedBy')->eq($account)->andWhere('t1.deleted')->eq('0')->andWhere('t2.deleted')->eq('0')->fetch('count');
diff --git a/module/user/view/execution.html.php b/module/user/view/execution.html.php
index 8d1691af61..e773e63327 100644
--- a/module/user/view/execution.html.php
+++ b/module/user/view/execution.html.php
@@ -35,7 +35,7 @@
| id, '', "data-app='execution'");?> |
- config->edition == 'max'):?>
+ config->edition== 'max' or $this->config->edition == 'ipd'):?>
user->executionTypeList, $execution->type);?>
name, '', "data-app='execution'");?>
diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php
index c9ce81010e..9278bf353f 100755
--- a/module/user/view/featurebar.html.php
+++ b/module/user/view/featurebar.html.php
@@ -46,7 +46,7 @@
common::printLink('user', 'execution', "userID={$user->id}", $label, '', "class='btn btn-link $active executionTab'");
}
- if($this->config->edition == 'max')
+ if($this->config->edition== 'max' or $this->config->edition == 'ipd')
{
$label = "{$lang->user->issue}";
$active = $methodName == 'issue' ? ' btn-active-text' : '';
|