* fix bug for testreport and other error and adjust after upgrade.

This commit is contained in:
wangyidong
2017-04-07 15:36:24 +08:00
parent ae6ca01c8c
commit ed5e5a368b
6 changed files with 18 additions and 13 deletions
+1
View File
@@ -144,6 +144,7 @@ $lang->action->label->changestatus = 'Change Status';
$lang->action->label->marked = 'Marked';
$lang->action->label->linked2project = "Link {$lang->projectCommon}";
$lang->action->label->unlinkedfromproject = "Unlink {$lang->projectCommon}";
$lang->action->label->unlinkedfrombuild = "Unlink Build";
$lang->action->label->linked2release = "Link Release";
$lang->action->label->unlinkedfromrelease = "Unlink Release";
$lang->action->label->linkrelatedbug = "Link to Bug";
+1
View File
@@ -144,6 +144,7 @@ $lang->action->label->changestatus = '修改状态';
$lang->action->label->marked = '编辑了';
$lang->action->label->linked2project = "关联{$lang->projectCommon}";
$lang->action->label->unlinkedfromproject = "移除{$lang->projectCommon}";
$lang->action->label->unlinkedfrombuild = "移除版本";
$lang->action->label->linked2release = "关联发布";
$lang->action->label->unlinkedfromrelease = "移除发布";
$lang->action->label->linkrelatedbug = "关联了相关Bug";
+1 -1
View File
@@ -3,7 +3,7 @@
foreach($actions as $action)
{
$user = isset($users[$action->actor]) ? $users[$action->actor] : $action->actor;
if($action->action == 'login' or $action->action == 'logout') $action->objectName = $action->objectLabel = '';
if($action->action == 'login' or $action->action == 'logout' or empty($action->objectLink)) $action->objectName = $action->objectLabel = '';
echo "<tr><td class='nobr' width='100%'>";
printf($lang->block->dynamicInfo, $action->date, $user, $action->actionLabel, $action->objectLabel, $action->objectLink, $action->objectName);
echo "</td></tr>";
+1 -1
View File
@@ -91,7 +91,7 @@ js::set('browseType', $browseType);
}
else
{
echo '<li>' . html::a('javascript:;', $lang->task->moduleAB, '', $class) . '</li>';
echo '<li>' . html::a('javascript:;', $lang->task->moduleAB, '', $misc) . '</li>';
}
/* Batch assign. */
+2 -2
View File
@@ -134,7 +134,7 @@ class testreport extends control
else
{
$build = $this->build->getById($task->build);
$stories = $this->story->getByList($build->stories);
$stories = empty($build->stories) ? array() : $this->story->getByList($build->stories);
$builds[$build->id] = $build;
$bugs = $this->testreport->getBugs4Test($builds, $productID, $begin, $end);
@@ -266,7 +266,7 @@ class testreport extends control
else
{
$build = $this->build->getById($task->build);
$stories = $this->story->getByList($build->stories);
$stories = empty($build->stories) ? array() : $this->story->getByList($build->stories);
$builds[$build->id] = $build;
$bugs = $this->testreport->getBugs4Test($builds, $report->product, $report->begin, $report->end);
+12 -9
View File
@@ -60,16 +60,19 @@ function updateFile(link)
{
if(response.result == 'finished')
{
$('#resultBox li span.' + response.type + '-num').html(num + response.count);
updateFileFinish = true;
$('#resultBox li span.' + response.type + '-num').html(num + response.count);
updateFileFinish = true;
$('#resultBox').append("<li class='text-success'>" + response.message + "</li>");
<?php
$condition = array();
foreach($needProcess as $processKey => $value) $condition[] = $processKey . 'Finish == true';
$condition = join(' && ', $condition);
?>
if(<?php echo $condition?>) $.get('<?php echo inlink('afterExec', "fromVersion=$fromVersion&processed=yes")?>');
$('a#tohome').closest('.alert').show();
<?php
$condition = array();
foreach($needProcess as $processKey => $value) $condition[] = $processKey . 'Finish == true';
$condition = join(' && ', $condition);
?>
if(<?php echo $condition?>)
{
$.get('<?php echo inlink('afterExec', "fromVersion=$fromVersion&processed=yes")?>');
$('a#tohome').closest('.alert').show();
}
}
else
{