*[task#127002,done,0.5h] fix bug.
This commit is contained in:
@@ -24,6 +24,7 @@ $isCustomExport = (!empty($customExport) and !empty($allExportFields));
|
||||
$showBizGuide = $config->edition == 'open' && empty($config->{$this->moduleName}->closeBizGuide) ? true : false;
|
||||
$bizGuideLink = common::checkNotCN() ? 'https://www.zentao.pm/page/zentao-pricing.html' : 'https://www.zentao.net/page/enterprise.html';
|
||||
$bizName = $showBizGuide ? "<a href='{$bizGuideLink}' target='_blank' class='text-primary'>{$lang->bizName}</a>" : '';
|
||||
$defaultExportFields = '';
|
||||
|
||||
if($isCustomExport)
|
||||
{
|
||||
|
||||
@@ -520,7 +520,6 @@ class todo extends control
|
||||
$assemble->risks = $iroData[1];
|
||||
$assemble->opportunities = $iroData[2];
|
||||
}
|
||||
if(isset($this->config->qcVersion)) $assemble->reviews = $this->todoZen->exportAssociated('qcVersion', (string)$user->account);
|
||||
|
||||
$todos = $this->todoZen->assembleExportData((array)$todos, $assemble, $todoLang, (array)$times);
|
||||
|
||||
|
||||
+1
-1
@@ -855,6 +855,7 @@ class todoZen extends todo
|
||||
$todo->end = $todo->end == '2400' ? '' : $end;
|
||||
|
||||
$todo->assignedTo = zget($assemble->users, $todo->assignedTo);
|
||||
if($todo->date == '2030-01-01') $todo->date = $this->lang->todo->future;
|
||||
|
||||
$type = $todo->type;
|
||||
if(isset($assemble->users[$todo->account])) $todo->account = $assemble->users[$todo->account];
|
||||
@@ -872,7 +873,6 @@ class todoZen extends todo
|
||||
if($type == 'risk') $todo->name = isset($assemble->risks[$todo->objectID]) ? $assemble->risks[$todo->objectID] . "(#$todo->objectID)" : '';
|
||||
if($type == 'opportunity') $todo->name = isset($assemble->opportunities[$todo->objectID]) ? $assemble->opportunities[$todo->objectID] . "(#$todo->objectID)" : '';
|
||||
}
|
||||
if($type == 'review' && isset($this->config->qcVersion)) $todo->name = isset($assemble->reviews[$todo->objectID]) ? $assemble->reviews[$todo->objectID] . "(#$todo->objectID)" : '';
|
||||
|
||||
if(isset($todoLang->typeList[$type])) $todo->type = $todoLang->typeList[$type];
|
||||
if(isset($todoLang->priList[$todo->pri])) $todo->pri = $todoLang->priList[$todo->pri];
|
||||
|
||||
Reference in New Issue
Block a user