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

* fix for export

Browse Source
This commit is contained in:
wangyidong
2011-05-02 07:19:02 +00:00
parent 55a21b81ae
commit 7d738865d8
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+10 -3
View File
@@ -853,12 +853,19 @@ class bug extends control
$bug->pri = $this->lang->bug->priList[$bug->pri];
$bug->type = $this->lang->bug->typeList[$bug->type];
$bug->status = $this->lang->bug->statusList[$bug->status];
$bug->mailto = $users[$bug->mailto];
$bug->mailto = trim(trim($bug->mailto), ',');
$mailtos = explode(',', $bug->mailto);
$bug->mailto = '';
foreach($mailtos as $mailto)
{
if(isset($users[$mailto])) $bug->mailto .= $users[$mailto] . ',';
}
$bug->openedBy = $users[$bug->openedBy];
$bug->openedDate = substr($bug->openedDate, 0, 10);
$bug->assignedTo = $users[$bug->assignedTo];
if(isset($users[$bug->assignedTo]))$bug->assignedTo = $users[$bug->assignedTo];
$bug->assignedDate = substr($bug->assignedDate, 0, 10);
$bug->resolvedBy = $users[$bug->resolvedBy];
if(isset($users[$bug->resolvedBy])) $bug->resolvedBy = $users[$bug->resolvedBy];
$bug->resolution = $this->lang->bug->resolutionList[$bug->resolution];
$bug->resolvedDate = substr($bug->resolvedDate, 0, 10);
$bug->closedBy = $users[$bug->closedBy];
module/bug/view/browse.html.php
+1 -1
View File
@@ -37,7 +37,7 @@ var customed = <?php echo (int)$customed;?>;
?>
</div>
<div class='f-right'>
<?php common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy", $lang->export, '', 'class="export"'); ?>
<?php if($browseType != 'needconfirm') common::printLink('bug', 'export', "productID=$productID&orderBy=$orderBy", $lang->export, '', 'class="export"'); ?>
<?php common::printLink('bug', 'customFields', '', $lang->bug->customFields, '', "class='iframe'"); ?>
<?php common::printLink('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID", $lang->bug->report->common); ?>
<?php common::printLink('bug', 'create', "productID=$productID&extra=moduleID=$moduleID", $lang->bug->create); ?>
module/project/view/taskheader.html.php
+1 -1
View File
@@ -19,7 +19,7 @@
</div>
<div class='f-right'>
<?php
common::printLink('task', 'export', "projectID=$projectID&orderBy=$orderBy", $lang->export, '', 'class="export"');
if($browseType != 'needconfirm') common::printLink('task', 'export', "projectID=$projectID&orderBy=$orderBy", $lang->export, '', 'class="export"');
common::printLink('project', 'importTask', "project=$project->id", $lang->project->importTask);
common::printLink('task', 'report', "project=$project->id&browseType=$browseType", $lang->task->report->common);
common::printLink('task', 'create', "project=$project->id", $lang->task->create);
module/story/control.php
+8 -1
View File
@@ -660,7 +660,14 @@ class story extends control
$story->assignedDate = substr($story->assignedDate, 0, 10);
$story->lastEditedBy = $users[$story->lastEditedBy];
$story->lastEditedDate = substr($story->lastEditedDate, 0, 10);
$story->reviewedBy = $users[$story->reviewedBy];
$story->reviewedBy = trim(trim($story->reviewedBy), ',');
$reviewedBys = explode(',', $story->reviewedBy);
$story->reviewedBy = '';
foreach($reviewedBys as $reviewedBy)
{
if(isset($users[$reviewedBy])) $story->reviewedBy .= $users[$reviewedBy] . ',';
}
$story->closedBy = $users[$story->closedBy];
$story->closedDate = substr($story->closedDate, 0, 10);
$story->closedReason = $this->lang->story->reasonList[$story->closedReason];
module/testcase/view/browse.html.php
+1 -1
View File
@@ -29,7 +29,7 @@ var moduleID = '<?php echo $moduleID;?>';
?>
</div>
<div class='f-right'>
<?php common::printLink('testcase', 'export', "productID=$productID&orderBy=$orderBy", $lang->export, '', 'class="export"'); ?>
<?php if($browseType != 'needconfirm') common::printLink('testcase', 'export', "productID=$productID&orderBy=$orderBy", $lang->export, '', 'class="export"'); ?>
<?php common::printLink('testcase', 'create', "productID=$productID&moduleID=$moduleID", $lang->testcase->create); ?>
</div>
</div>