diff --git a/module/action/model.php b/module/action/model.php index 21fba4b212..cdb1cd99d6 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -733,7 +733,7 @@ class actionModel extends model { $desc = $this->lang->$objectType->action->changebychild; } - elseif($this->config->edition != 'open' and strpos($this->config->action->assetType, $action->objectType) !== false and $action->action == 'approved') + elseif($this->config->edition == 'max' and strpos($this->config->action->assetType, $action->objectType) !== false and $action->action == 'approved') { $desc = empty($this->lang->action->approve->{$action->extra}) ? '' : $this->lang->action->approve->{$action->extra}; } @@ -1232,7 +1232,7 @@ class actionModel extends model if(is_array($objectLabel) and isset($objectLabel[$actionType])) $actionObjectLabel = $objectLabel[$actionType]; } - if($this->config->edition != 'open' and $objectType == 'assetlib') + if($this->config->edition == 'max' and $objectType == 'assetlib') { $libType = $this->dao->select('type')->from(TABLE_ASSETLIB)->where('id')->eq($objectID)->fetch('type'); if(strpos('story,issue,risk,opportunity,practice,component', $libType) !== false) $actionObjectLabel = $this->lang->action->label->{$libType . 'assetlib'}; @@ -1265,7 +1265,7 @@ class actionModel extends model $action->objectLabel = $objectLabel; $action->product = trim($action->product, ','); - if($this->config->edition != 'open' + if($this->config->edition == 'max' and strpos($this->config->action->assetType, $action->objectType) !== false and empty($action->project) and empty($action->product) and empty($action->execution)) { diff --git a/module/block/view/recentprojectblock.html.php b/module/block/view/recentprojectblock.html.php index feab80f9e9..0f28f9bb5a 100644 --- a/module/block/view/recentprojectblock.html.php +++ b/module/block/view/recentprojectblock.html.php @@ -44,7 +44,7 @@
- config->edition == 'max'):?> + edition == 'max'):?> model === 'waterfall'): ?> project->waterfall; ?> diff --git a/module/my/view/dynamic.html.php b/module/my/view/dynamic.html.php index 16cc1cb9ad..a615804a70 100644 --- a/module/my/view/dynamic.html.php +++ b/module/my/view/dynamic.html.php @@ -60,7 +60,7 @@ objectType == 'meeting') $tab = $action->project ? "data-app='project'" : "data-app='my'";?> config->edition == 'max' and strpos($config->action->assetType, $action->objectType) !== false) and empty($action->objectName)) + if(($config->edition == 'max' and strpos($config->action->assetType, $action->objectType) !== false) and empty($action->objectName)) { echo '#' . $action->objectID; }