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

* Replace $this->config with $config in view files.

Browse Source
This commit is contained in:
liugang
2018-06-14 14:34:41 +08:00
parent 3a833a0f7a
commit 35bcf01ff5
60 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/view/browse.html.php
+4 -4
View File
@@ -13,13 +13,13 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php js::set('confirmDelete', $lang->testtask->confirmDelete)?>
<?php js::set('flow', $this->config->global->flow);?>
<?php js::set('flow', $config->global->flow);?>
<?php
$scope = $this->session->testTaskVersionScope;
$status = $this->session->testTaskVersionStatus;
?>
<?php js::set('status', $status);?>
<?php if($this->config->global->flow != 'onlyTest'):?>
<?php if($config->global->flow != 'onlyTest'):?>
<div id="mainMenu" class='clearfix'>
<div class="btn-toolbar pull-left">
<div class='btn-group'>
@@ -61,7 +61,7 @@ $status = $this->session->testTaskVersionStatus;
<th class='c-id text-left'> <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?></th>
<th class='w-200px text-left'><?php common::printOrderLink('name', $orderBy, $vars, $lang->testtask->name);?></th>
<th class='text-left'> <?php common::printOrderLink('product', $orderBy, $vars, $lang->testtask->product);?></th>
<?php if($this->config->global->flow != 'onlyTest'):?>
<?php if($config->global->flow != 'onlyTest'):?>
<th class='text-left'> <?php common::printOrderLink('project', $orderBy, $vars, $lang->testtask->project);?></th>
<?php endif;?>
<th class='text-left'> <?php common::printOrderLink('build', $orderBy, $vars, $lang->testtask->build);?></th>
@@ -78,7 +78,7 @@ $status = $this->session->testTaskVersionStatus;
<td><?php echo html::a(inlink('cases', "taskID=$task->id"), sprintf('%03d', $task->id));?></td>
<td class='c-name' title="<?php echo $task->name?>"><?php echo html::a(inlink('cases', "taskID=$task->id"), $task->name);?></td>
<td class='c-name' title="<?php echo $task->productName?>"><?php echo $task->productName?></td>
<?php if($this->config->global->flow != 'onlyTest'):?>
<?php if($config->global->flow != 'onlyTest'):?>
<td class='c-name' title="<?php echo $task->projectName?>"><?php echo $task->projectName?></td>
<?php endif;?>
<td class='c-name'><?php echo ($task->build == 'trunk' || empty($task->buildName)) ? $lang->trunk : html::a($this->createLink('build', 'view', "buildID=$task->build",'',true), $task->buildName);?></td>
module/testtask/view/caseheader.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
if($hasCasesPriv) echo html::a($this->inlink('cases', "taskID=$taskID&browseType=all&param=0"), "<span class='text'>{$lang->testtask->allCases}</span>", '', "id='allTab' class='btn btn-link'");
if($hasCasesPriv) echo html::a($this->inlink('cases', "taskID=$taskID&browseType=assignedtome&param=0"), "<span class='text'>{$lang->testtask->assignedToMe}</span>", '', "id='assignedtomeTab' class='btn btn-link'");
if($hasGroupPriv and $this->config->global->flow != 'onlyTest')
if($hasGroupPriv and $config->global->flow != 'onlyTest')
{
echo "<div class='btn-group'>";
$active = $browseType == 'group' ? 'btn-active-text' : '';
module/testtask/view/cases.html.php
+3 -3
View File
@@ -28,7 +28,7 @@
<?php
$vars = "taskID=$task->id&browseType=$browseType&param=$param&orderBy=%s&recToal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
$datatableId = $this->moduleName . ucfirst($this->methodName);
$useDatatable = (isset($this->config->datatable->$datatableId->mode) and $this->config->datatable->$datatableId->mode == 'datatable');
$useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
$canBatchEdit = common::hasPriv('testcase', 'batchEdit');
$canBatchUnlink = common::hasPriv('testtask', 'batchUnlinkCases');
@@ -39,8 +39,8 @@
if($useDatatable) include '../../common/view/datatable.html.php';
if(!$useDatatable) include '../../common/view/tablesorter.html.php';
$this->config->testcase->datatable->defaultField = $this->config->testtask->datatable->defaultField;
$this->config->testcase->datatable->fieldList['actions']['width'] = '90';
$config->testcase->datatable->defaultField = $config->testtask->datatable->defaultField;
$config->testcase->datatable->fieldList['actions']['width'] = '90';
$setting = $this->datatable->getSetting('testtask');
$widths = $this->datatable->setFixedFieldWidth($setting);
module/testtask/view/create.html.php
+1 -1
View File
@@ -32,7 +32,7 @@
<td class='w-p35-f'><?php echo html::input('product', $productID, "class='form-control'");?></td><td></td>
</tr>
<?php endif;?>
<?php if($this->config->global->flow != 'onlyTest'):?>
<?php if($config->global->flow != 'onlyTest'):?>
<tr>
<th class='w-80px'><?php echo $lang->testtask->project;?></th>
<td class='w-p35-f'><?php echo html::select('project', $projects, '', "class='form-control chosen' onchange='loadProjectRelated(this.value)'");?></td><td></td>
module/testtask/view/edit.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
</div>
<form method='post' target='hiddenwin' id='dataform'>
<table class='table table-form'>
<?php if($this->config->global->flow != 'onlyTest'):?>
<?php if($config->global->flow != 'onlyTest'):?>
<tr>
<th class='w-80px'><?php echo $lang->testtask->project;?></th>
<td class='w-p35-f'>
module/testtask/view/sendmail.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
<tr>
<td style='padding: 10px; background-color: #F8FAFE; border: none; font-size: 14px; font-weight: 500; border-bottom: 1px solid #e5e5e5;'>
<?php $color = empty($testtask->color) ? '#333' : $testtask->color;?>
<?php echo html::a(zget($this->config->mail, 'domain', common::getSysURL()) . helper::createLink('testtask', 'view', "testtaskID=$testtask->id"), $mailTitle, '', "style='color: {$color}; text-decoration: underline;'");?>
<?php echo html::a(zget($config->mail, 'domain', common::getSysURL()) . helper::createLink('testtask', 'view', "testtaskID=$testtask->id"), $mailTitle, '', "style='color: {$color}; text-decoration: underline;'");?>
</td>
</tr>
</table>
module/testtask/view/view.html.php
+1 -1
View File
@@ -49,7 +49,7 @@
<div class="detail-title"><?php echo $lang->testtask->legendBasicInfo;?></div>
<div class="detail-content">
<table class="table table-data">
<?php if($this->config->global->flow != 'onlyTest'):?>
<?php if($config->global->flow != 'onlyTest'):?>
<tr>
<th class='w-80px'><?php echo $lang->testtask->project;?></th>
<td><?php echo html::a($this->createLink('project', 'story', "projectID=$task->project"), $task->projectName);?></td>