diff --git a/api/v1/entries/user.php b/api/v1/entries/user.php index 123cb9f880..b3d9f377e8 100644 --- a/api/v1/entries/user.php +++ b/api/v1/entries/user.php @@ -298,7 +298,7 @@ class userEntry extends entry $info->issue = array('total' => 0, 'issues' => array()); if(!common::hasPriv('my', 'work')) break; - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { global $app; $app->rawMethod = 'work'; @@ -318,7 +318,7 @@ class userEntry extends entry $info->risk = array('total' => 0, 'risks' => array()); if(!common::hasPriv('my', 'work')) break; - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { global $app; $app->rawMethod = 'work'; @@ -338,7 +338,7 @@ class userEntry extends entry $info->meeting = array('total' => 0, 'meetings' => array()); if(!common::hasPriv('my', 'work')) break; - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { global $app; $app->rawMethod = 'work'; diff --git a/module/custom/model.php b/module/custom/model.php index 692f6933a4..cdfbdd7136 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -889,7 +889,7 @@ class customModel extends model $enabledScrumFeatures = array(); $disabledScrumFeatures = array(); - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { foreach($this->config->custom->scrumFeatures as $scrumFeature) { @@ -1048,7 +1048,7 @@ class customModel extends model */ public function hasAssetlibData() { - if($this->config->edition == 'max') return $this->dao->select('*')->from(TABLE_ASSETLIB)->where('deleted')->eq(0)->count(); + if($this->config->edition== 'max' or $this->config->edition == 'ipd') return $this->dao->select('*')->from(TABLE_ASSETLIB)->where('deleted')->eq(0)->count(); return false; } @@ -1060,7 +1060,7 @@ class customModel extends model */ public function hasScrumIssueData() { - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { return $this->dao->select('t1.*')->from(TABLE_ISSUE)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') @@ -1080,7 +1080,7 @@ class customModel extends model */ public function hasScrumRiskData() { - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { return $this->dao->select('t1.*')->from(TABLE_RISK)->alias('t1') ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') @@ -1100,7 +1100,7 @@ class customModel extends model */ public function hasScrumOpportunityData() { - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { return $this->dao->select('id')->from(TABLE_OPPORTUNITY)->where('execution')->ne('0')->andWhere('deleted')->eq('0')->count(); } @@ -1115,7 +1115,7 @@ class customModel extends model */ public function hasScrumMeetingData() { - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { return $this->dao->select('id')->from(TABLE_PROJECT)->alias('t1') ->leftJoin(TABLE_MEETING)->alias('t2')->on('t1.id = t2.project') @@ -1135,7 +1135,7 @@ class customModel extends model */ public function hasScrumAuditplanData() { - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { return $this->dao->select('id')->from(TABLE_PROJECT)->alias('t1') ->leftJoin(TABLE_AUDITPLAN)->alias('t2')->on('t1.id = t2.project') @@ -1155,7 +1155,7 @@ class customModel extends model */ public function hasScrumProcessData() { - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { return $this->dao->select('id')->from(TABLE_PROGRAMACTIVITY)->where('execution')->ne('0')->andWhere('deleted')->eq('0')->count(); } diff --git a/module/doc/model.php b/module/doc/model.php index 4818a04613..11241fe2a9 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1912,7 +1912,7 @@ class docModel extends model } elseif($type == 'project') { - if($this->config->edition == 'max') + if($this->config->edition== 'max' or $this->config->edition == 'ipd') { $issueIdList = $this->dao->select('id')->from(TABLE_ISSUE)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get(); $meetingIdList = $this->dao->select('id')->from(TABLE_MEETING)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get(); diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index 29f3c942db..bdc66c4f4d 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -216,7 +216,7 @@ -config->edition == 'max'):?> +config->edition== 'max' or $this->config->edition == 'ipd'):?>