diff --git a/module/doc/model.php b/module/doc/model.php index 5fcf447678..4f277425bb 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1259,7 +1259,7 @@ class docModel extends model $orderedExecutions = array(); foreach($executions as $id => $execution) { - $execution->name = zget($projectPairs, $execution->project) . ' / ' . $execution->name; + $execution->name = $this->config->systemMode == 'new' ? zget($projectPairs, $execution->project) . ' / ' . $execution->name : $execution->name; if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM == $this->app->user->account) { @@ -2070,7 +2070,7 @@ class docModel extends model if($this->app->openApp == 'doc' and $type != 'custom' and $type != 'book') { - $objectTitle = $type == 'execution' ? substr($objects[$objectID], strpos($objects[$objectID], '/') + 1) : $objects[$objectID]; + $objectTitle = ($this->config->systemMode == 'new' and $type == 'execution') ? substr($objects[$objectID], strpos($objects[$objectID], '/') + 1) : $objects[$objectID]; $output = << diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index fead9655c1..557539337a 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -31,7 +31,7 @@ td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-sp execution->featureBar['all'] as $key => $label):?> createLink($this->app->rawModule, $this->app->rawMethod, "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), "{$label}", '', "class='btn btn-link' id='{$key}Tab' data-app='$from'");?> - + config->systemMode == 'new'):?>
execution->selectProject}'");?>