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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
王怡栋
2021-08-27 18:03:02 +08:00
parent a90a378321 7e4c7dc503
commit 934cf4736b
23 changed files with 108 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/view/qastatisticblock.html.php
+2
View File
@@ -81,6 +81,8 @@ $(function()
$tab.find('.progress-pie').progressPie();
$(this).parents('.tab-pane').find('.table-row').not($tab).addClass('hidden');
});
$('.progress-pie').progressPie();
});
</script>
<div class="panel-body block-qa">
module/bug/css/batchactivate.css
+4
View File
@@ -0,0 +1,4 @@
.c-id {width: 40px !important;}
.c-title {width: 160px;}
.c-assigned {width: 160px;}
.c-build {width: 160px;}
module/bug/css/batchcreate.css
+6
View File
@@ -0,0 +1,6 @@
.c-id {width: 50px !important;}
.c-branch, .c-module, .c-os {width: 120px;}
.c-execution {width: 130px;}
.c-build, .c-browser, .c-keywords, .c-other {width: 100px;}
.c-steps {width: 150px;}
.c-pri, .c-severity {width: 80px;}
module/bug/css/batchedit.css
+7
View File
@@ -1,2 +1,9 @@
.duplicate-input {border-left-width: 0; border-radius: 0 2px 2px 0; padding-left: 9px;}
.duplicate-input:focus {border-left-width: 1px; padding-left: 8px;}
.c-id {width: 50px !important;}
.c-branch, .c-module, .c-os {width: 120px;}
.c-execution {width: 130px;}
.c-build, .c-browser, .c-keywords, .c-other {width: 100px;}
.c-steps, .c-title, .c-plan, .c-assigned, .c-resolution {width: 150px;}
.c-pri, .c-severity {width: 80px;}
module/bug/view/batchactivate.html.php
+4 -4
View File
@@ -19,10 +19,10 @@
<table class='table table-form table-fixed'>
<thead>
<tr>
<th class='w-40px'><?php echo $lang->idAB;?></th>
<th class='w-160px'><?php echo $lang->bug->title;?></th>
<th class='w-120px'><?php echo $lang->bug->assignedTo;?></th>
<th class='w-200px'><?php echo $lang->bug->openedBuild;?></th>
<th class='c-id'><?php echo $lang->idAB;?></th>
<th class='c-title'><?php echo $lang->bug->title;?></th>
<th class='c-assigned'><?php echo $lang->bug->assignedTo;?></th>
<th class='c-build'><?php echo $lang->bug->openedBuild;?></th>
<th><?php echo $lang->bug->legendComment;?></th>
</tr>
</thead>
module/bug/view/batchcreate.html.php
+14 -14
View File
@@ -46,23 +46,23 @@
<table class='table table-form'>
<thead>
<tr>
<th class='w-50px'><?php echo $lang->idAB;?></th>
<th class='w-120px<?php echo zget($visibleFields, $product->type, ' hidden')?>'> <?php echo $lang->product->branch;?></th>
<th class='w-120px<?php echo zget($requiredFields, 'module', '', ' required');?>'> <?php echo $lang->bug->module;?></th>
<th class='w-130px<?php echo zget($visibleFields, 'execution', ' hidden') . zget($requiredFields, 'execution', '', ' required');?>'><?php echo $lang->bug->execution;?></th>
<th class='w-100px required'><?php echo $lang->bug->openedBuild;?></th>
<th class='c-id'><?php echo $lang->idAB;?></th>
<th class='c-branch<?php echo zget($visibleFields, $product->type, ' hidden')?>'> <?php echo $lang->product->branch;?></th>
<th class='c-module<?php echo zget($requiredFields, 'module', '', ' required');?>'> <?php echo $lang->bug->module;?></th>
<th class='c-execution<?php echo zget($visibleFields, 'execution', ' hidden') . zget($requiredFields, 'execution', '', ' required');?>'><?php echo $lang->bug->execution;?></th>
<th class='c-build required'><?php echo $lang->bug->openedBuild;?></th>
<th class='c-title required'><?php echo $lang->bug->title;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'steps', ' hidden') . zget($requiredFields, 'steps', '', ' required');?>'><?php echo $lang->bug->steps;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->typeAB;?></th>
<th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
<th class='w-80px<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
<th class='c-date<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
<th class='c-steps<?php echo zget($visibleFields, 'steps', ' hidden') . zget($requiredFields, 'steps', '', ' required');?>'><?php echo $lang->bug->steps;?></th>
<th class='c-type<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->typeAB;?></th>
<th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
<th class='c-severity<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
<th class='c-os<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
<th class='c-browser<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
<th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
<?php
$extendFields = $this->bug->getFlowExtendFields();
foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";
foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
?>
</tr>
</thead>
module/bug/view/batchedit.html.php
+18 -18
View File
@@ -47,26 +47,26 @@
<table class='table table-form'>
<thead>
<tr>
<th class='w-50px'><?php echo $lang->idAB;?></th>
<th class='w-110px<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->bug->type;?></th>
<th class='w-80px<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
<th class='w-70px<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
<th class="required <?php if(count($visibleFields) >= 10) echo ' w-150px';?>"><?php echo $lang->bug->title;?></th>
<th class='c-id'><?php echo $lang->idAB;?></th>
<th class='c-type<?php echo zget($visibleFields, 'type', ' hidden') . zget($requiredFields, 'type', '', ' required');?>'><?php echo $lang->bug->type;?></th>
<th class='c-severity<?php echo zget($visibleFields, 'severity', ' hidden') . zget($requiredFields, 'severity', '', ' required');?>'><?php echo $lang->bug->severity;?></th>
<th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden') . zget($requiredFields, 'pri', '', ' required');?>'><?php echo $lang->bug->pri;?></th>
<th class="required <?php if(count($visibleFields) >= 10) echo ' c-title';?>"><?php echo $lang->bug->title;?></th>
<?php if($branchProduct):?>
<th class='w-150px<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->bug->branch;?></th>
<th class='c-branch<?php echo zget($visibleFields, 'branch', ' hidden')?>'><?php echo $lang->bug->branch;?></th>
<?php endif;?>
<th class='w-150px<?php echo zget($visibleFields, 'productplan', ' hidden') . zget($requiredFields, 'productplan', '', ' required');?>'><?php echo $lang->bug->productplan;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->bug->assignedTo;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
<th class='w-90px<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->bug->status;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
<th class='w-100px<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
<th class='w-120px<?php echo zget($visibleFields, 'resolvedBy', ' hidden')?>'><?php echo $lang->bug->resolvedByAB;?></th>
<th class='w-150px<?php echo zget($visibleFields, 'resolution', ' hidden')?>'><?php echo $lang->bug->resolutionAB;?></th>
<th class='c-plan<?php echo zget($visibleFields, 'productplan', ' hidden') . zget($requiredFields, 'productplan', '', ' required');?>'><?php echo $lang->bug->productplan;?></th>
<th class='c-assigned<?php echo zget($visibleFields, 'assignedTo', ' hidden') . zget($requiredFields, 'assignedTo', '', ' required');?>'><?php echo $lang->bug->assignedTo;?></th>
<th class='c-date<?php echo zget($visibleFields, 'deadline', ' hidden') . zget($requiredFields, 'deadline', '', ' required');?>'><?php echo $lang->bug->deadline;?></th>
<th class='c-status<?php echo zget($visibleFields, 'status', ' hidden')?>'><?php echo $lang->bug->status;?></th>
<th class='c-os<?php echo zget($visibleFields, 'os', ' hidden') . zget($requiredFields, 'os', '', ' required');?>'><?php echo $lang->bug->os;?></th>
<th class='c-browser<?php echo zget($visibleFields, 'browser', ' hidden') . zget($requiredFields, 'browser', '', ' required');?>'><?php echo $lang->bug->browser;?></th>
<th class='c-keywords<?php echo zget($visibleFields, 'keywords', ' hidden') . zget($requiredFields, 'keywords', '', ' required');?>'><?php echo $lang->bug->keywords;?></th>
<th class='c-user<?php echo zget($visibleFields, 'resolvedBy', ' hidden')?>'><?php echo $lang->bug->resolvedByAB;?></th>
<th class='c-resolution<?php echo zget($visibleFields, 'resolution', ' hidden')?>'><?php echo $lang->bug->resolutionAB;?></th>
<?php
$extendFields = $this->bug->getFlowExtendFields();
foreach($extendFields as $extendField) echo "<th class='w-100px'>{$extendField->name}</th>";
foreach($extendFields as $extendField) echo "<th class='c-other'>{$extendField->name}</th>";
?>
</tr>
</thead>
@@ -77,10 +77,10 @@
if(!$productID)
{
$product = $this->product->getByID($bug->product);
$plans = $this->loadModel('productplan')->getPairs($bug->product, $branch);
$plans = array('' => '', 'ditto' => $this->lang->bug->ditto) + $plans;
$branches = $product->type == 'normal' ? array('' => '') : $this->loadModel('branch')->getPairs($product->id);
if($product->type != 'normal')
{
module/bug/view/linkbugs.html.php
+4 -4
View File
@@ -35,9 +35,9 @@
<th class='c-pri'><?php echo $lang->priAB;?></th>
<th><?php echo $lang->bug->product;?></th>
<th><?php echo $lang->bug->title;?></th>
<th class='w-status'><?php echo $lang->bug->statusAB;?></th>
<th class='w-100px'><?php echo $lang->openedByAB;?></th>
<th class='w-100px'><?php echo $lang->assignedToAB;?></th>
<th class='c-status'><?php echo $lang->bug->statusAB;?></th>
<th class='c-user'><?php echo $lang->openedByAB;?></th>
<th class='c-user'><?php echo $lang->assignedToAB;?></th>
</tr>
</thead>
<tbody>
@@ -47,7 +47,7 @@
<tr>
<td class='c-id'>
<div class="checkbox-primary">
<input type='checkbox' name='bugs[]' value='<?php echo $bug2Link->id;?>'/>
<input type='checkbox' name='bugs[]' value='<?php echo $bug2Link->id;?>'/>
<label></label>
</div>
<?php printf('%03d', $bug2Link->id);?>
module/company/css/dynamic.css
+3
View File
@@ -17,3 +17,6 @@
.dynamic.collapsed .timeline {max-height: 58px;}
.dynamic.collapsed .timeline > li + li {display: none;}
.dynamic.collapsed .dynamic-btn > .icon:before {content: '\f0d8';}
.c-user, .c-project, .c-product, .c-execution {width: 150px !important;}
.c-date {width: 200px;}
module/company/view/dynamic.html.php
+5 -5
View File
@@ -25,12 +25,12 @@
echo html::a(inlink('dynamic', "browseType=$period"), $label, '', "class='btn btn-link $active' id='{$period}'")
?>
<?php endforeach;?>
<div class="input-control space w-150px"><?php echo html::select('account', $userIdPairs, $user ? $user->id : '', 'onchange=changeUser(this.value) class="form-control chosen"');?></div>
<div class="input-control space w-150px"><?php echo html::select('product', $products, $product, 'onchange=changeProduct(this.value) class="form-control chosen"');?></div>
<div class="input-control space c-user"><?php echo html::select('account', $userIdPairs, $user ? $user->id : '', 'onchange=changeUser(this.value) class="form-control chosen"');?></div>
<div class="input-control space c-product"><?php echo html::select('product', $products, $product, 'onchange=changeProduct(this.value) class="form-control chosen"');?></div>
<?php if($config->systemMode == 'new'):?>
<div class="input-control space w-150px"><?php echo html::select('project', $projects, $project, 'onchange=changeProject(this.value) class="form-control chosen"');?></div>
<div class="input-control space c-project"><?php echo html::select('project', $projects, $project, 'onchange=changeProject(this.value) class="form-control chosen"');?></div>
<?php endif;?>
<div class="input-control space w-150px"><?php echo html::select('execution', $executions, $execution, 'onchange=changeExecution(this.value) class="form-control chosen"'); ?></div>
<div class="input-control space c-execution"><?php echo html::select('execution', $executions, $execution, 'onchange=changeExecution(this.value) class="form-control chosen"'); ?></div>
<a class="btn btn-link querybox-toggle" id="bysearchTab"><i class="icon icon-search muted"></i> <?php echo $lang->action->dynamic->search;?></a>
</div>
</div>
@@ -42,7 +42,7 @@
<?php foreach($dateGroups as $date => $actions):?>
<?php $isToday = date(DT_DATE4) == $date;?>
<div class="dynamic <?php if($isToday) echo 'active';?>">
<div class="dynamic-date <?php if($browseType == 'all') echo 'w-200px';?>">
<div class="dynamic-date <?php if($browseType == 'all') echo 'c-date';?>">
<?php if($isToday):?>
<span class="date-label"><?php echo $lang->action->dynamic->today;?></span>
<?php endif;?>
module/compile/css/browse.css
+3
View File
@@ -0,0 +1,3 @@
.c-id {width: 60px;}
.c-repo, .c-build-type {width: 150px;}
.c-date, .c-actions {width: 130px !important;}
module/compile/view/browse.html.php
+6 -6
View File
@@ -30,14 +30,14 @@
<thead>
<tr class='text-center'>
<?php $vars = "jobID={$jobID}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
<th class='w-60px'><?php common::printOrderLink('id', $orderBy, $vars, $lang->compile->id);?></th>
<th class='c-id'><?php common::printOrderLink('id', $orderBy, $vars, $lang->compile->id);?></th>
<th class='text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->compile->name);?></th>
<th class='w-150px text-left'><?php echo $lang->compile->buildType;?></th>
<th class='w-150px text-left'><?php echo $lang->job->repo;?></th>
<th class='c-build-type text-left'><?php echo $lang->compile->buildType;?></th>
<th class='c-repo text-left'><?php echo $lang->job->repo;?></th>
<th class='text-left'><?php echo $lang->job->triggerType;?></th>
<th class='w-80px text-center'><?php common::printOrderLink('status', $orderBy, $vars, $lang->compile->status);?></th>
<th class='w-130px text-center'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->compile->time);?></th>
<th class='w-120px'><?php echo $lang->actions;?></th>
<th class='c-status text-center'><?php common::printOrderLink('status', $orderBy, $vars, $lang->compile->status);?></th>
<th class='c-date text-center'><?php common::printOrderLink('createdDate', $orderBy, $vars, $lang->compile->time);?></th>
<th class='c-actions'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody class='text-left'>
module/cron/css/index.css
+5
View File
@@ -0,0 +1,5 @@
.c-minute {width: 60px;}
.c-hour, .c-dom {width: 50px;}
.c-mon, .c-dow, .c-status {width: 60px;}
.c-remark {width: 200px;}
.c-actions {width: 100px;}
module/cron/view/index.html.php
+9 -9
View File
@@ -27,16 +27,16 @@
<table class='table table-condensed table-bordered table-fixed main-table'>
<thead>
<tr>
<th class='w-70px text-center'><?php echo $lang->cron->m?></th>
<th class='w-50px text-center'><?php echo $lang->cron->h?></th>
<th class='w-50px text-center'><?php echo $lang->cron->dom?></th>
<th class='w-60px text-center'><?php echo $lang->cron->mon?></th>
<th class='w-60px text-center'><?php echo $lang->cron->dow?></th>
<th class='c-minute text-center'><?php echo $lang->cron->m?></th>
<th class='c-hour text-center'><?php echo $lang->cron->h?></th>
<th class='c-dom text-center'><?php echo $lang->cron->dom?></th>
<th class='c-mon text-center'><?php echo $lang->cron->mon?></th>
<th class='c-dow text-center'><?php echo $lang->cron->dow?></th>
<th><?php echo $lang->cron->command?></th>
<th class='w-200px'><?php echo $lang->cron->remark?></th>
<th class='w-130px'><?php echo $lang->cron->lastTime?></th>
<th class='w-60px'><?php echo $lang->cron->status?></th>
<th class='w-100px'><?php echo $lang->actions;?></th>
<th class='c-remark'><?php echo $lang->cron->remark?></th>
<th class='c-full-date text-center'><?php echo $lang->cron->lastTime?></th>
<th class='c-status text-center'><?php echo $lang->cron->status?></th>
<th class='c-actions text-center'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody class='text-center'>
module/repo/control.php
+1 -2
View File
@@ -205,13 +205,12 @@ class repo extends control
{
if($confirm == 'no') die(js::confirm($this->lang->repo->notice->delete, $this->repo->createLink('delete', "repoID=$repoID&objectID=$objectID&confirm=yes")));
$error = '';
$relationID = $this->dao->select('id')->from(TABLE_RELATION)
->where('extra')->eq($repoID)
->andWhere('AType')->eq('design')
->fetch();
if($relationID) $error .= $this->lang->repo->error->deleted;
$error = $relationID ? $this->lang->repo->error->deleted : '';
$jobs = $this->dao->select('*')->from(TABLE_JOB)->where('repo')->eq($repoID)->andWhere('deleted')->eq('0')->fetchAll();
if($jobs) $error .= ($error ? '\n' : '') . $this->lang->repo->error->linkedJob;
module/repo/model.php
+2 -2
View File
@@ -225,7 +225,7 @@ class repoModel extends model
if($data->encrypt == 'base64') $data->password = base64_encode($data->password);
$this->dao->insert(TABLE_REPO)->data($data, $skip = 'gitlabHost,gitlabToken,gitlabProject')
->batchCheck($this->config->repo->create->requiredFields, 'notempty')
->checkIF($data->SCM == 'GitLab', 'gitlabProject', 'notempty')
->checkIF($data->SCM == 'Gitlab', 'gitlabProject', 'notempty')
->checkIF($data->SCM == 'Subversion', $this->config->repo->svn->requiredFields, 'notempty')
->autoCheck()
->exec();
@@ -283,7 +283,7 @@ class repoModel extends model
$this->dao->update(TABLE_REPO)->data($data, $skip = 'gitlabHost,gitlabToken,gitlabProject')
->batchCheck($this->config->repo->edit->requiredFields, 'notempty')
->checkIF($data->SCM == 'Subversion', $this->config->repo->svn->requiredFields, 'notempty')
->checkIF($data->SCM == 'GitLab', 'extra', 'notempty')
->checkIF($data->SCM == 'Gitlab', 'extra', 'notempty')
->autoCheck()
->where('id')->eq($id)->exec();
module/task/js/editestimate.js
+4
View File
@@ -2,3 +2,7 @@ function confirmLeft()
{
if($('#left').val() === '0') return confirm(confirmRecord);
}
$(function()
{
$('.form-date').datetimepicker('setEndDate', today);
})
module/task/view/editestimate.html.php
+2 -1
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php js::set('confirmRecord', $lang->task->confirmRecord);?>
<?php js::set('today', helper::today());?>
<div id='mainContent' class='main-content'>
<div class='center-block mw-600px'>
<div class='main-header'>
@@ -22,7 +23,7 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->task->date;?></th>
<td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date"');?></td>
<td class='w-p45'><?php echo html::input('date', $estimate->date, 'class="form-control form-date" readonly');?></td>
<td></td>
</tr>
<tr>
module/testcase/model.php
+5 -1
View File
@@ -1008,13 +1008,17 @@ class testcaseModel extends model
foreach($caseIdList as $caseID)
{
$oldCase = $this->getById($caseID);
$case = new stdClass();
$case->lastEditedBy = $this->app->user->account;
$case->lastEditedDate = $now;
$case->type = $result;
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->where('id')->eq($caseID)->exec();
$this->action->create('case', $caseID, 'Edited', '', ucfirst($result));
$actionID = $this->action->create('case', $caseID, 'Edited', '', ucfirst($result));
$changes = common::createChanges($oldCase, $case);
$this->action->logHistory($actionID, $changes);
}
}
module/testsuite/control.php
+1 -3
View File
@@ -294,11 +294,10 @@ class testsuite extends control
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @param string $from
* @access public
* @return void
*/
public function linkCase($suiteID, $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1, $from = 'browse')
public function linkCase($suiteID, $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. */
$this->session->set('caseList', $this->app->getURI(true), 'qa');
@@ -342,7 +341,6 @@ class testsuite extends control
$this->view->suiteID = $suiteID;
$this->view->pager = $pager;
$this->view->suite = $suite;
$this->view->from = $from;
$this->display();
}
module/testsuite/view/linkcase.html.php
+1 -2
View File
@@ -15,8 +15,7 @@
<?php js::set('flow', $config->global->flow);?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<?php $browseLink = $from == 'view' ? $this->inlink('view', "suiteID=$suiteID") : $this->session->testsuiteList;?>
<?php common::printBack($browseLink, 'btn btn-link');?>
<?php common::printBack($this->session->testsuiteList, 'btn btn-link');?>
<div class='divider'></div>
<div class='page-title'>
<span class='label label-id'><?php echo $suite->id;?></span>
module/testsuite/view/view.html.php
+1 -1
View File
@@ -33,7 +33,7 @@
{
echo $this->buildOperateMenu($suite, 'view');
common::printIcon('testsuite', 'linkCase', "suiteID=$suite->id&param=0&recTotal=0&recPerPage=20&pageID=1&from=view", $suite, 'button', 'link');
common::printIcon('testsuite', 'linkCase', "suiteID=$suite->id", $suite, 'button', 'link');
common::printIcon('testsuite', 'edit', "suiteID=$suite->id");
common::printIcon('testsuite', 'delete', "suiteID=$suite->id", '', 'button', 'trash', 'hiddenwin');
}
www/theme/default/style.css
+1 -1
View File
@@ -52,7 +52,7 @@ a.showMoreImage:hover {opacity: 1;}
.c-icon {width: 20px;}
.c-number {width: 80px;}
.c-company, .c-budget {width: 80px;}
.c-status, .c-user, .c-date, .c-encode {width: 100px;}
.c-status, .c-type, .c-user, .c-date, .c-encode {width: 100px;}
.c-object-type {width: 130px;}
.c-full-date, .c-mobile, .c-text {width: 150px;}
.c-module {width: 180px;}