Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x

Browse Source
This commit is contained in:
sgm0422
2020-05-21 09:31:38 +08:00
parent 23a2df6a50 9a72a1e4cd
commit 4b5844e64e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+1 -1
View File
@@ -1122,7 +1122,7 @@ class project extends control
}
$this->view->isSprint = false;
if(strpos($this->config->custom->productProject, '_2'))
if(isset($this->config->custom->productProject) and strpos($this->config->custom->productProject, '_2'))
{
$this->view->isSprint = true;
unset($this->lang->project->typeList['waterfall']);
module/testreport/control.php
+6 -2
View File
@@ -55,7 +55,11 @@ class testreport extends control
$objectID = $this->commonAction($objectID, $objectType);
$object = $this->$objectType->getById($objectID);
if($extra) $task = $this->testtask->getById($extra);
$name = $extra ? $task->name : $object->name;
if(isset($task->name))
$name = $extra ? $task->name : $object->name;
else
$name = '';
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -96,7 +100,7 @@ class testreport extends control
if($tasks) $tasks = $this->dao->select('id,name')->from(TABLE_TESTTASK)->where('id')->in($tasks)->fetchPairs('id', 'name');
$this->view->title = $name . $this->lang->colon . $this->lang->testreport->common;
$this->view->position[] = html::a(inlink('browse', "objectID=$objectID&objectType=$objectType&extra=$extra"), $extra ? $task->name : $object->name);
$this->view->position[] = html::a(inlink('browse', "objectID=$objectID&objectType=$objectType&extra=$extra"), $extra ? $task->name : isset($object->name) ? $object->name : '');
$this->view->position[] = $this->lang->testreport->browse;
$this->view->reports = $reports;