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

* Adjust code style.

Browse Source
This commit is contained in:
tianshujie98
2020-12-15 17:29:59 +08:00
parent a173276115
commit 90f9d9ad7c
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update20.0.beta1.sql
+1 -1
View File
@@ -1 +1 @@
ALTER TABLE `zt_design` ADD `commitBy` varchar(30) NOT NULL AFTER `commit`;
ALTER TABLE `zt_design` ADD `commitedBy` varchar(30) NOT NULL AFTER `commit`;
db/zentao.sql
+1 -1
View File
@@ -330,7 +330,7 @@ CREATE TABLE IF NOT EXISTS `zt_design` (
`PRJ` varchar(255) NOT NULL,
`product` varchar(255) NOT NULL,
`commit` varchar(30) NOT NULL,
`commitBy` varchar(30) NOT NULL,
`commitedBy` varchar(30) NOT NULL,
`project` mediumint(9) NOT NULL DEFAULT '0',
`name` varchar(255) NOT NULL,
`status` varchar(30) NOT NULL,
module/bug/config.php
+3 -3
View File
@@ -59,7 +59,7 @@ $config->bug->editor->activate = array('id' => 'comment', 'tools' => 'bugTools
global $lang;
$config->bug->search['module'] = 'bug';
$config->bug->search['fields']['title'] = $lang->bug->title;
$config->bug->search['fields']['id'] = $lang->bug->id;
$config->bug->search['fields']['module'] = $lang->bug->module;
$config->bug->search['fields']['keywords'] = $lang->bug->keywords;
$config->bug->search['fields']['steps'] = $lang->bug->steps;
$config->bug->search['fields']['assignedTo'] = $lang->bug->assignedTo;
@@ -70,8 +70,8 @@ $config->bug->search['fields']['confirmed'] = $lang->bug->confirmed;
$config->bug->search['fields']['product'] = $lang->bug->product;
$config->bug->search['fields']['branch'] = '';
$config->bug->search['fields']['plan'] = $lang->bug->productplan;
$config->bug->search['fields']['module'] = $lang->bug->module;
$config->bug->search['fields']['plan'] = $lang->bug->productplan;
$config->bug->search['fields']['id'] = $lang->bug->id;
$config->bug->search['fields']['project'] = $lang->bug->project;
$config->bug->search['fields']['severity'] = $lang->bug->severity;
module/design/model.php
+2 -2
View File
@@ -202,8 +202,8 @@ class designModel extends model
$commit = $oldCommit ? $oldCommit . ',' . $revisions : $revisions;
$design = new stdclass();
$design->commit = $commit;
$design->commitBy = $this->app->user->account;
$design->commit = $commit;
$design->commitedBy = $this->app->user->account;
$this->dao->update(TABLE_DESIGN)->data($design)->autoCheck()->where('id')->eq($designID)->exec();
}
module/project/view/importtask.html.php
+1 -1
View File
@@ -53,7 +53,7 @@
</div>
<?php printf('%03d', $task->id);?>
</td>
<td><?php echo substr($projects[$task->project], 0);?></td>
<td><?php echo $projects[$task->project];?></td>
<td><span class='label-pri label-pri-<?php echo $task->pri;?>' title='<?php echo zget($lang->task->priList, $task->pri, $task->pri);?>'><?php echo $task->pri == '0' ? '' : zget($lang->task->priList, $task->pri, $task->pri);?></span></td>
<td class='text-left nobr'><?php if(!common::printLink('task', 'view', "task=$task->id", $task->name)) echo $task->name;?></td>
<td <?php echo $class;?>><?php echo $task->assignedToRealName;?></td>