fix issues report when code review
This commit is contained in:
@@ -1,7 +1,4 @@
|
||||
|
||||
ALTER TABLE `zt_repo`
|
||||
ADD COLUMN `desc` TEXT NULL AFTER `lastSync`;
|
||||
|
||||
CREATE TABLE `zt_tag` (
|
||||
`id` mediumint(9) NOT NULL AUTO_INCREMENT,
|
||||
`repo` mediumint(9) NOT NULL,
|
||||
@@ -39,7 +36,6 @@ CREATE TABLE `zt_cijob` (
|
||||
`scheduleInterval` mediumint(8) DEFAULT NULL,
|
||||
`tagKeywords` varchar(255) DEFAULT NULL,
|
||||
`commentKeywords` varchar(255) DEFAULT NULL,
|
||||
`desc` text,
|
||||
`createdBy` varchar(30) NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL,
|
||||
|
||||
@@ -1139,7 +1139,6 @@ CREATE TABLE `zt_cijob` (
|
||||
`scheduleInterval` mediumint(8) DEFAULT NULL,
|
||||
`tagKeywords` varchar(255) DEFAULT NULL,
|
||||
`commentKeywords` varchar(255) DEFAULT NULL,
|
||||
`desc` text,
|
||||
`createdBy` varchar(30) NOT NULL,
|
||||
`createdDate` datetime NOT NULL,
|
||||
`editedBy` varchar(30) NOT NULL,
|
||||
|
||||
@@ -154,7 +154,7 @@ $lang->bug->lblLastEdited = '最后修改';
|
||||
$lang->bug->lblResolved = '由谁解决';
|
||||
$lang->bug->allUsers = '加载所有用户';
|
||||
$lang->bug->allBuilds = '所有';
|
||||
$lang->bug->createBuild = '新建';
|
||||
$lang->bug->createBuild = '创建';
|
||||
|
||||
/* legend列表。*/
|
||||
$lang->bug->legendBasicInfo = '基本信息';
|
||||
|
||||
@@ -154,7 +154,7 @@ $lang->bug->lblLastEdited = '最後修改';
|
||||
$lang->bug->lblResolved = '由誰解決';
|
||||
$lang->bug->allUsers = '加載所有用戶';
|
||||
$lang->bug->allBuilds = '所有';
|
||||
$lang->bug->createBuild = '新建';
|
||||
$lang->bug->createBuild = '创建';
|
||||
|
||||
/* legend列表。*/
|
||||
$lang->bug->legendBasicInfo = '基本信息';
|
||||
|
||||
@@ -28,7 +28,7 @@ class ci extends control
|
||||
}
|
||||
|
||||
if(common::hasPriv('ci', 'createJob') and strpos(',browsejob,', $this->methodName) > -1) {
|
||||
$this->lang->modulePageActions = html::a(helper::createLink('ci', 'createJob'), "<i class='icon icon-plus text-muted'></i> " . $this->lang->ci->create, '', "class='btn'");
|
||||
$this->lang->modulePageActions = html::a(helper::createLink('ci', 'createJob'), "<i class='icon icon-plus'></i> " . $this->lang->ci->create, '', "class='btn btn-primary'");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ $lang->job->buildTime = 'Build Time';
|
||||
$lang->job->id = 'ID';
|
||||
$lang->job->name = 'Name';
|
||||
$lang->job->repo = 'Repo';
|
||||
$lang->job->svnFolder = 'SVN tag parent URL';
|
||||
$lang->job->svnFolder = 'SVN Tag Watch Path';
|
||||
$lang->job->jenkins = 'Jenkins Server';
|
||||
$lang->job->jenkinsJob = 'Jenkins Task';
|
||||
$lang->job->triggerType = 'Trigger';
|
||||
|
||||
@@ -6,14 +6,14 @@ $lang->ci->jenkins = 'Jenkins';
|
||||
$lang->ci->repo = '版本库';
|
||||
$lang->ci->job = '构建';
|
||||
$lang->ci->browse = '浏览';
|
||||
$lang->ci->create = '新建';
|
||||
$lang->ci->create = '创建';
|
||||
$lang->ci->edit = '编辑';
|
||||
|
||||
$lang->job = new stdclass();
|
||||
$lang->job->browseBuild = '构建历史';
|
||||
$lang->job->viewLogs = '构建日志';
|
||||
|
||||
$lang->job->create = '新建构建任务';
|
||||
$lang->job->create = '创建构建任务';
|
||||
$lang->job->edit = '编辑构建任务';
|
||||
$lang->job->exeNow = '立即执行';
|
||||
$lang->job->delete = '删除构建任务';
|
||||
@@ -28,7 +28,7 @@ $lang->job->buildTime = '构建时间';
|
||||
$lang->job->id = 'ID';
|
||||
$lang->job->name = '名称';
|
||||
$lang->job->repo = '代码库';
|
||||
$lang->job->svnFolder = 'SVN Tag 父URL';
|
||||
$lang->job->svnFolder = 'SVN Tag监控路径';
|
||||
$lang->job->jenkins = 'Jenkins服务';
|
||||
$lang->job->buildType = '构建类型';
|
||||
$lang->job->jenkinsJob = 'Jenkins任务名';
|
||||
|
||||
@@ -28,7 +28,7 @@ class jenkins extends control
|
||||
}
|
||||
|
||||
if(common::hasPriv('jenkins', 'create') and strpos(',browsejob,', $this->methodName) > -1) {
|
||||
$this->lang->modulePageActions = html::a(helper::createLink('jenkins', 'create'), "<i class='icon icon-plus text-muted'></i> " . $this->lang->jenkins->create, '', "class='btn'");
|
||||
$this->lang->modulePageActions = html::a(helper::createLink('jenkins', 'create'), "<i class='icon icon-plus'></i> " . $this->lang->jenkins->create, '', "class='btn btn-primary'");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -47,11 +47,6 @@
|
||||
<td><?php echo $lang->jenkins->tips;?></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php echo $lang->jenkins->desc; ?></th>
|
||||
<td><?php echo html::textarea('desc', '', "rows='3' class='form-control'"); ?></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th></th>
|
||||
<td class='text-center form-actions'>
|
||||
|
||||
@@ -50,12 +50,6 @@
|
||||
<td><?php echo $lang->jenkins->tips;?></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th><?php echo $lang->jenkins->desc; ?></th>
|
||||
<td><?php echo html::textarea('desc', $jenkins->desc, "rows='3' class='form-control'"); ?></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th></th>
|
||||
<td class='text-center form-actions'>
|
||||
|
||||
Reference in New Issue
Block a user