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

Merge branch 'sprint/devops16' into 'devops16_caoyanyi_45677'

Browse Source 
# Conflicts:
#   module/gitlab/view/browseproject.html.php
This commit is contained in:
王怡栋
2021-12-10 07:40:46 +00:00
parent e32a694e08 fec4ab4604
commit 2d60441372
39 changed files with 1100 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update16.0.beta1.sql
+7
View File
@@ -0,0 +1,7 @@
ALTER TABLE `zt_task` ADD `repo` mediumint unsigned NOT NULL AFTER `activatedDate`;
ALTER TABLE `zt_task` ADD `entry` varchar(255) NOT NULL AFTER `repo`;
ALTER TABLE `zt_task` ADD `lines` varchar(10) NOT NULL AFTER `entry`;
ALTER TABLE `zt_task` ADD `v1` varchar(40) NOT NULL AFTER `lines`;
ALTER TABLE `zt_task` ADD `v2` varchar(40) NOT NULL AFTER `v1`;
ALTER TABLE `zt_task` ADD `mr` mediumint(8) unsigned NOT NULL AFTER `repo`;
ALTER TABLE `zt_bug` ADD `mr` mediumint(8) unsigned NOT NULL AFTER `repo`;
db/zentao.sql
+7
View File
@@ -203,6 +203,7 @@ CREATE TABLE IF NOT EXISTS `zt_bug` (
`caseVersion` smallint(6) NOT NULL DEFAULT '1',
`result` mediumint(8) unsigned NOT NULL,
`repo` mediumint(8) unsigned NOT NULL,
`mr` mediumint(8) unsigned NOT NULL,
`entry` varchar(255) NOT NULL,
`lines` varchar(10) NOT NULL,
`v1` varchar(40) NOT NULL,
@@ -1250,6 +1251,12 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
`lastEditedBy` varchar(30) NOT NULL,
`lastEditedDate` datetime NOT NULL,
`activatedDate` date NOT NULL,
`repo` mediumint(8) unsigned NOT NULL,
`mr` mediumint(8) unsigned NOT NULL,
`entry` varchar(255) NOT NULL,
`lines` varchar(10) NOT NULL,
`v1` varchar(40) NOT NULL,
`v2` varchar(40) NOT NULL,
`deleted` enum('0','1') NOT NULL default '0',
PRIMARY KEY (`id`),
KEY `execution` (`execution`),
module/action/lang/en.php
+100 -93
View File
@@ -79,102 +79,104 @@ $lang->action->periods['lastweek'] = $lang->action->dynamic->lastWeek;
$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
$lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['branch'] = 'Branch';
$lang->action->objectTypes['story'] = $lang->SRCommon;
$lang->action->objectTypes['design'] = 'Design';
$lang->action->objectTypes['productplan'] = 'Plan';
$lang->action->objectTypes['release'] = 'Release';
$lang->action->objectTypes['program'] = 'Program';
$lang->action->objectTypes['project'] = 'Project';
$lang->action->objectTypes['execution'] = $lang->executionCommon;
$lang->action->objectTypes['task'] = 'Task';
$lang->action->objectTypes['build'] = 'Build';
$lang->action->objectTypes['job'] = 'Job';
$lang->action->objectTypes['bug'] = 'Bug';
$lang->action->objectTypes['case'] = 'Case';
$lang->action->objectTypes['caseresult'] = 'Case Result';
$lang->action->objectTypes['stepresult'] = 'Case Steps';
$lang->action->objectTypes['caselib'] = 'Library';
$lang->action->objectTypes['testsuite'] = 'Suite';
$lang->action->objectTypes['testtask'] = 'Test Build';
$lang->action->objectTypes['testreport'] = 'Report';
$lang->action->objectTypes['doc'] = 'Document';
$lang->action->objectTypes['api'] = 'Interface';
$lang->action->objectTypes['doclib'] = 'Document Library';
$lang->action->objectTypes['apistruct'] = 'API struct';
$lang->action->objectTypes['todo'] = 'Todo';
$lang->action->objectTypes['risk'] = 'Risk';
$lang->action->objectTypes['issue'] = 'Issue';
$lang->action->objectTypes['module'] = 'Module';
$lang->action->objectTypes['user'] = 'User';
$lang->action->objectTypes['stakeholder'] = 'Stakeholder';
$lang->action->objectTypes['budget'] = 'Cost Estimate';
$lang->action->objectTypes['entry'] = 'Entry';
$lang->action->objectTypes['webhook'] = 'Webhook';
$lang->action->objectTypes['team'] = 'Team';
$lang->action->objectTypes['whitelist'] = 'Whitelist';
$lang->action->objectTypes['pipeline'] = 'GitLab';
$lang->action->objectTypes['gitlab'] = 'GitLab';
$lang->action->objectTypes['jenkins'] = 'Jenkins';
$lang->action->objectTypes['mr'] = 'Merge Request';
$lang->action->objectTypes['gitlabproject'] = 'GitLab Project';
$lang->action->objectTypes['gitlabuser'] = 'GitLab User';
$lang->action->objectTypes['gitlabgroup'] = 'GitLab Group';
$lang->action->objectTypes['gitlabbranch'] = 'GitLab Branch';
$lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['branch'] = 'Branch';
$lang->action->objectTypes['story'] = $lang->SRCommon;
$lang->action->objectTypes['design'] = 'Design';
$lang->action->objectTypes['productplan'] = 'Plan';
$lang->action->objectTypes['release'] = 'Release';
$lang->action->objectTypes['program'] = 'Program';
$lang->action->objectTypes['project'] = 'Project';
$lang->action->objectTypes['execution'] = $lang->executionCommon;
$lang->action->objectTypes['task'] = 'Task';
$lang->action->objectTypes['build'] = 'Build';
$lang->action->objectTypes['job'] = 'Job';
$lang->action->objectTypes['bug'] = 'Bug';
$lang->action->objectTypes['case'] = 'Case';
$lang->action->objectTypes['caseresult'] = 'Case Result';
$lang->action->objectTypes['stepresult'] = 'Case Steps';
$lang->action->objectTypes['caselib'] = 'Library';
$lang->action->objectTypes['testsuite'] = 'Suite';
$lang->action->objectTypes['testtask'] = 'Test Build';
$lang->action->objectTypes['testreport'] = 'Report';
$lang->action->objectTypes['doc'] = 'Document';
$lang->action->objectTypes['api'] = 'Interface';
$lang->action->objectTypes['doclib'] = 'Document Library';
$lang->action->objectTypes['apistruct'] = 'API struct';
$lang->action->objectTypes['todo'] = 'Todo';
$lang->action->objectTypes['risk'] = 'Risk';
$lang->action->objectTypes['issue'] = 'Issue';
$lang->action->objectTypes['module'] = 'Module';
$lang->action->objectTypes['user'] = 'User';
$lang->action->objectTypes['stakeholder'] = 'Stakeholder';
$lang->action->objectTypes['budget'] = 'Cost Estimate';
$lang->action->objectTypes['entry'] = 'Entry';
$lang->action->objectTypes['webhook'] = 'Webhook';
$lang->action->objectTypes['team'] = 'Team';
$lang->action->objectTypes['whitelist'] = 'Whitelist';
$lang->action->objectTypes['pipeline'] = 'GitLab';
$lang->action->objectTypes['gitlab'] = 'GitLab';
$lang->action->objectTypes['jenkins'] = 'Jenkins';
$lang->action->objectTypes['mr'] = 'Merge Request';
$lang->action->objectTypes['gitlabproject'] = 'GitLab Project';
$lang->action->objectTypes['gitlabuser'] = 'GitLab User';
$lang->action->objectTypes['gitlabgroup'] = 'GitLab Group';
$lang->action->objectTypes['gitlabbranch'] = 'GitLab Branch';
$lang->action->objectTypes['gitlabbranchpriv'] = 'GitLab Protected Branches';
/* Used to describe operation history. */
$lang->action->desc = new stdclass();
$lang->action->desc->common = '$date, <strong>$action</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->extra = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->opened = '$date, created by <strong>$actor</strong> .' . "\n";
$lang->action->desc->openedbysystem = '$date, opened by system.' . "\n";
$lang->action->desc->created = '$date, created by <strong>$actor</strong> .' . "\n";
$lang->action->desc->added = '$date, added by <strong>$actor</strong> .' . "\n";
$lang->action->desc->changed = '$date, changed by <strong>$actor</strong> .' . "\n";
$lang->action->desc->edited = '$date, edited by <strong>$actor</strong> .' . "\n";
$lang->action->desc->assigned = '$date, <strong>$actor</strong> assigned to <strong>$extra</strong>.' . "\n";
$lang->action->desc->closed = '$date, closed by <strong>$actor</strong> .' . "\n";
$lang->action->desc->closedbysystem = '$date, closed by system.' . "\n";
$lang->action->desc->deleted = '$date, deleted by <strong>$actor</strong> .' . "\n";
$lang->action->desc->deletedfile = '$date, <strong>$actor</strong> deleted <strong><i>$extra</i></strong>.' . "\n";
$lang->action->desc->editfile = '$date, <strong>$actor</strong> edited <strong><i>$extra</i></strong>.' . "\n";
$lang->action->desc->erased = '$date, deleted by <strong>$actor</strong> .' . "\n";
$lang->action->desc->undeleted = '$date, restored by <strong>$actor</strong> .' . "\n";
$lang->action->desc->hidden = '$date, hidden by <strong>$actor</strong> .' . "\n";
$lang->action->desc->commented = '$date, added by <strong>$actor</strong>.' . "\n";
$lang->action->desc->activated = '$date, activated by <strong>$actor</strong> .' . "\n";
$lang->action->desc->blocked = '$date, blocked by <strong>$actor</strong> .' . "\n";
$lang->action->desc->moved = '$date, moved by <strong>$actor</strong> , which was "$extra".' . "\n";
$lang->action->desc->confirmed = '$date, <strong>$actor</strong> confirmed the story change. The latest build is <strong>#$extra</strong>.' . "\n";
$lang->action->desc->caseconfirmed = '$date, <strong>$actor</strong> confirmed the case change. The latest build is <strong>#$extra</strong>' . "\n";
$lang->action->desc->bugconfirmed = '$date, <strong>$actor</strong> confirmed Bug.' . "\n";
$lang->action->desc->frombug = '$date, converted from <strong>$actor</strong>. Its ID was <strong>$extra</strong>.';
$lang->action->desc->started = '$date, started by <strong>$actor</strong>.' . "\n";
$lang->action->desc->restarted = '$date, continued by <strong>$actor</strong>.' . "\n";
$lang->action->desc->delayed = '$date, postponed by <strong>$actor</strong>.' . "\n";
$lang->action->desc->suspended = '$date, suspended by <strong>$actor</strong>.' . "\n";
$lang->action->desc->recordestimate = '$date, recorded by <strong>$actor</strong> and it cost <strong>$extra</strong> hours.';
$lang->action->desc->editestimate = '$date, <strong>$actor</strong> edited Hour.';
$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> deleted Hour.';
$lang->action->desc->canceled = '$date, cancelled by <strong>$actor</strong>.' . "\n";
$lang->action->desc->svncommited = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
$lang->action->desc->gitcommited = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
$lang->action->desc->finished = '$date, finished by <strong>$actor</strong>.' . "\n";
$lang->action->desc->paused = '$date, paused by <strong>$actor</strong>.' . "\n";
$lang->action->desc->verified = '$date, verified by <strong>$actor</strong>.' . "\n";
$lang->action->desc->diff1 = '<strong><i>%s</i></strong> is changed. It was "%s" and it is "%s".<br />' . "\n";
$lang->action->desc->diff2 = '<strong><i>%s</i></strong> is changed. The difference is ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n";
$lang->action->desc->linked2bug = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
$lang->action->desc->linked2testtask = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
$lang->action->desc->resolved = '$date, resolved by <strong>$actor</strong> ' . "\n";
$lang->action->desc->managed = '$date, by <strong>$actor</strong> managed.' . "\n";
$lang->action->desc->estimated = '$date, by <strong>$actor</strong> estimated.' . "\n";
$lang->action->desc->run = '$date, by <strong>$actor</strong> executed.' . "\n";
$lang->action->desc->syncprogram = '$date, started by <strong>$actor</strong>(starting the project sets the program status as Ongoing).' . "\n";
$lang->action->desc->syncproject = '$date, starting the execution sets the project status as Ongoing.' . "\n";
$lang->action->desc->syncexecution = '$date, starting the task sets the execution status as Ongoing.' . "\n";
$lang->action->desc->common = '$date, <strong>$action</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->extra = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>.' . "\n";
$lang->action->desc->opened = '$date, created by <strong>$actor</strong> .' . "\n";
$lang->action->desc->openedbysystem = '$date, opened by system.' . "\n";
$lang->action->desc->created = '$date, created by <strong>$actor</strong> .' . "\n";
$lang->action->desc->added = '$date, added by <strong>$actor</strong> .' . "\n";
$lang->action->desc->changed = '$date, changed by <strong>$actor</strong> .' . "\n";
$lang->action->desc->edited = '$date, edited by <strong>$actor</strong> .' . "\n";
$lang->action->desc->assigned = '$date, <strong>$actor</strong> assigned to <strong>$extra</strong>.' . "\n";
$lang->action->desc->closed = '$date, closed by <strong>$actor</strong> .' . "\n";
$lang->action->desc->closedbysystem = '$date, closed by system.' . "\n";
$lang->action->desc->deleted = '$date, deleted by <strong>$actor</strong> .' . "\n";
$lang->action->desc->deletedfile = '$date, <strong>$actor</strong> deleted <strong><i>$extra</i></strong>.' . "\n";
$lang->action->desc->editfile = '$date, <strong>$actor</strong> edited <strong><i>$extra</i></strong>.' . "\n";
$lang->action->desc->erased = '$date, deleted by <strong>$actor</strong> .' . "\n";
$lang->action->desc->undeleted = '$date, restored by <strong>$actor</strong> .' . "\n";
$lang->action->desc->hidden = '$date, hidden by <strong>$actor</strong> .' . "\n";
$lang->action->desc->commented = '$date, added by <strong>$actor</strong>.' . "\n";
$lang->action->desc->activated = '$date, activated by <strong>$actor</strong> .' . "\n";
$lang->action->desc->blocked = '$date, blocked by <strong>$actor</strong> .' . "\n";
$lang->action->desc->moved = '$date, moved by <strong>$actor</strong> , which was "$extra".' . "\n";
$lang->action->desc->confirmed = '$date, <strong>$actor</strong> confirmed the story change. The latest build is <strong>#$extra</strong>.' . "\n";
$lang->action->desc->caseconfirmed = '$date, <strong>$actor</strong> confirmed the case change. The latest build is <strong>#$extra</strong>' . "\n";
$lang->action->desc->bugconfirmed = '$date, <strong>$actor</strong> confirmed Bug.' . "\n";
$lang->action->desc->frombug = '$date, converted from <strong>$actor</strong>. Its ID was <strong>$extra</strong>.';
$lang->action->desc->started = '$date, started by <strong>$actor</strong>.' . "\n";
$lang->action->desc->restarted = '$date, continued by <strong>$actor</strong>.' . "\n";
$lang->action->desc->delayed = '$date, postponed by <strong>$actor</strong>.' . "\n";
$lang->action->desc->suspended = '$date, suspended by <strong>$actor</strong>.' . "\n";
$lang->action->desc->recordestimate = '$date, recorded by <strong>$actor</strong> and it cost <strong>$extra</strong> hours.';
$lang->action->desc->editestimate = '$date, <strong>$actor</strong> edited Hour.';
$lang->action->desc->deleteestimate = '$date, <strong>$actor</strong> deleted Hour.';
$lang->action->desc->canceled = '$date, cancelled by <strong>$actor</strong>.' . "\n";
$lang->action->desc->svncommited = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
$lang->action->desc->gitcommited = '$date, <strong>$actor</strong> committed and the build is <strong>#$extra</strong>.' . "\n";
$lang->action->desc->finished = '$date, finished by <strong>$actor</strong>.' . "\n";
$lang->action->desc->paused = '$date, paused by <strong>$actor</strong>.' . "\n";
$lang->action->desc->verified = '$date, verified by <strong>$actor</strong>.' . "\n";
$lang->action->desc->diff1 = '<strong><i>%s</i></strong> is changed. It was "%s" and it is "%s".<br />' . "\n";
$lang->action->desc->diff2 = '<strong><i>%s</i></strong> is changed. The difference is ' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff3 = 'File Name %s was changed to %s .' . "\n";
$lang->action->desc->linked2bug = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
$lang->action->desc->linked2testtask = '$date, linked to <strong>$extra</strong> by <strong>$actor</strong>';
$lang->action->desc->resolved = '$date, resolved by <strong>$actor</strong> ' . "\n";
$lang->action->desc->managed = '$date, by <strong>$actor</strong> managed.' . "\n";
$lang->action->desc->estimated = '$date, by <strong>$actor</strong> estimated.' . "\n";
$lang->action->desc->run = '$date, by <strong>$actor</strong> executed.' . "\n";
$lang->action->desc->syncprogram = '$date, started by <strong>$actor</strong>(starting the project sets the program status as Ongoing).' . "\n";
$lang->action->desc->syncproject = '$date, starting the execution sets the project status as Ongoing.' . "\n";
$lang->action->desc->syncexecution = '$date, starting the task sets the execution status as Ongoing.' . "\n";
$lang->action->desc->importfromgitlab = '$date, Issue associate created from gitlab by <strong>$actor</strong>.' . "\n";
/* Used to describe the history of operations related to parent-child tasks. */
$lang->action->desc->createchildren = '$date, <strong>$actor</strong> created a child task <strong>$extra</strong>。' . "\n";
@@ -304,6 +306,7 @@ $lang->action->label->compilefail = 'Compile Fail';
$lang->action->label->reopen = 'Reopen';
$lang->action->label->approve = 'Passed';
$lang->action->label->reject = 'Rejected';
$lang->action->label->importfromgitlab = 'Issue associate created';
/* Dynamic information is grouped by object. */
$lang->action->dynamicAction = new stdclass;
@@ -354,6 +357,7 @@ $lang->action->dynamicAction->release['notified'] = 'Notify Release';
$lang->action->dynamicAction->release['hidden'] = 'Hide Release';
$lang->action->dynamicAction->story['opened'] = 'Create Story';
$lang->action->dynamicAction->story['importfromgitlab'] = "Issue associate create story";
$lang->action->dynamicAction->story['edited'] = 'Edit Story';
$lang->action->dynamicAction->story['activated'] = 'Activate Story';
$lang->action->dynamicAction->story['reviewed'] = 'Review Story';
@@ -394,6 +398,7 @@ $lang->action->dynamicAction->kanbanlane['moved'] = 'Move Swimlane';
$lang->action->dynamicAction->team['managedTeam'] = 'Manage Team';
$lang->action->dynamicAction->task['opened'] = 'Create Task';
$lang->action->dynamicAction->task['importfromgitlab'] = "Issue associate create task";
$lang->action->dynamicAction->task['edited'] = 'Edit Task';
$lang->action->dynamicAction->task['commented'] = 'Task Comment';
$lang->action->dynamicAction->task['assigned'] = 'Assign Task';
@@ -427,6 +432,7 @@ $lang->action->dynamicAction->build['edited'] = 'Edit Build';
$lang->action->dynamicAction->build['deleted'] = 'Delete Build';
$lang->action->dynamicAction->bug['opened'] = 'Report Bug';
$lang->action->dynamicAction->bug['importfromgitlab'] = "Issue associate create bug";
$lang->action->dynamicAction->bug['edited'] = 'Edit Bug';
$lang->action->dynamicAction->bug['activated'] = 'Activate Bug';
$lang->action->dynamicAction->bug['assigned'] = 'Assign Bug';
@@ -615,6 +621,7 @@ $lang->action->search->label['canceled'] = $lang->action->label->ca
$lang->action->search->label['finished'] = $lang->action->label->finished;
$lang->action->search->label['paused'] = $lang->action->label->paused;
$lang->action->search->label['verified'] = $lang->action->label->verified;
$lang->action->search->label['importfromgitlab'] = $lang->action->label->importfromgitlab;
$lang->action->search->label['login'] = $lang->action->label->login;
$lang->action->search->label['logout'] = $lang->action->label->logout;
module/action/lang/zh-cn.php
+100 -93
View File
@@ -79,102 +79,104 @@ $lang->action->periods['lastweek'] = $lang->action->dynamic->lastWeek;
$lang->action->periods['thismonth'] = $lang->action->dynamic->thisMonth;
$lang->action->periods['lastmonth'] = $lang->action->dynamic->lastMonth;
$lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['branch'] = '分支';
$lang->action->objectTypes['story'] = $lang->SRCommon;
$lang->action->objectTypes['design'] = '设计';
$lang->action->objectTypes['productplan'] = '计划';
$lang->action->objectTypes['release'] = '发布';
$lang->action->objectTypes['program'] = '项目集';
$lang->action->objectTypes['project'] = '项目';
$lang->action->objectTypes['execution'] = $config->systemMode == 'new' ? '执行' : $lang->executionCommon;
$lang->action->objectTypes['task'] = '任务';
$lang->action->objectTypes['build'] = '版本';
$lang->action->objectTypes['job'] = '构建';
$lang->action->objectTypes['bug'] = 'Bug';
$lang->action->objectTypes['case'] = '用例';
$lang->action->objectTypes['caseresult'] = '用例结果';
$lang->action->objectTypes['stepresult'] = '用例步骤';
$lang->action->objectTypes['caselib'] = '用例库';
$lang->action->objectTypes['testsuite'] = '套件';
$lang->action->objectTypes['testtask'] = '测试单';
$lang->action->objectTypes['testreport'] = '报告';
$lang->action->objectTypes['doc'] = '文档';
$lang->action->objectTypes['api'] = '接口';
$lang->action->objectTypes['doclib'] = '文档库';
$lang->action->objectTypes['apistruct'] = '数据结构';
$lang->action->objectTypes['todo'] = '待办';
$lang->action->objectTypes['risk'] = '风险';
$lang->action->objectTypes['issue'] = '问题';
$lang->action->objectTypes['module'] = '模块';
$lang->action->objectTypes['user'] = '用户';
$lang->action->objectTypes['stakeholder'] = '干系人';
$lang->action->objectTypes['budget'] = '费用估算';
$lang->action->objectTypes['entry'] = '应用';
$lang->action->objectTypes['webhook'] = 'Webhook';
$lang->action->objectTypes['team'] = '团队';
$lang->action->objectTypes['whitelist'] = '白名单';
$lang->action->objectTypes['pipeline'] = 'GitLab';
$lang->action->objectTypes['gitlab'] = 'GitLab';
$lang->action->objectTypes['jenkins'] = 'Jenkins';
$lang->action->objectTypes['mr'] = '合并请求';
$lang->action->objectTypes['gitlabproject'] = 'GitLab项目';
$lang->action->objectTypes['gitlabuser'] = 'GitLab用户';
$lang->action->objectTypes['gitlabgroup'] = 'GitLab群组';
$lang->action->objectTypes['gitlabbranch'] = 'GitLab分支';
$lang->action->objectTypes['product'] = $lang->productCommon;
$lang->action->objectTypes['branch'] = '分支';
$lang->action->objectTypes['story'] = $lang->SRCommon;
$lang->action->objectTypes['design'] = '设计';
$lang->action->objectTypes['productplan'] = '计划';
$lang->action->objectTypes['release'] = '发布';
$lang->action->objectTypes['program'] = '项目集';
$lang->action->objectTypes['project'] = '项目';
$lang->action->objectTypes['execution'] = $config->systemMode == 'new' ? '执行' : $lang->executionCommon;
$lang->action->objectTypes['task'] = '任务';
$lang->action->objectTypes['build'] = '版本';
$lang->action->objectTypes['job'] = '构建';
$lang->action->objectTypes['bug'] = 'Bug';
$lang->action->objectTypes['case'] = '用例';
$lang->action->objectTypes['caseresult'] = '用例结果';
$lang->action->objectTypes['stepresult'] = '用例步骤';
$lang->action->objectTypes['caselib'] = '用例库';
$lang->action->objectTypes['testsuite'] = '套件';
$lang->action->objectTypes['testtask'] = '测试单';
$lang->action->objectTypes['testreport'] = '报告';
$lang->action->objectTypes['doc'] = '文档';
$lang->action->objectTypes['api'] = '接口';
$lang->action->objectTypes['doclib'] = '文档库';
$lang->action->objectTypes['apistruct'] = '数据结构';
$lang->action->objectTypes['todo'] = '待办';
$lang->action->objectTypes['risk'] = '风险';
$lang->action->objectTypes['issue'] = '问题';
$lang->action->objectTypes['module'] = '模块';
$lang->action->objectTypes['user'] = '用户';
$lang->action->objectTypes['stakeholder'] = '干系人';
$lang->action->objectTypes['budget'] = '费用估算';
$lang->action->objectTypes['entry'] = '应用';
$lang->action->objectTypes['webhook'] = 'Webhook';
$lang->action->objectTypes['team'] = '团队';
$lang->action->objectTypes['whitelist'] = '白名单';
$lang->action->objectTypes['pipeline'] = 'GitLab';
$lang->action->objectTypes['gitlab'] = 'GitLab';
$lang->action->objectTypes['jenkins'] = 'Jenkins';
$lang->action->objectTypes['mr'] = '合并请求';
$lang->action->objectTypes['gitlabproject'] = 'GitLab项目';
$lang->action->objectTypes['gitlabuser'] = 'GitLab用户';
$lang->action->objectTypes['gitlabgroup'] = 'GitLab群组';
$lang->action->objectTypes['gitlabbranch'] = 'GitLab分支';
$lang->action->objectTypes['gitlabbranchpriv'] = 'GitLab保护分支';
/* 用来描述操作历史记录。*/
$lang->action->desc = new stdclass();
$lang->action->desc->common = '$date, <strong>$action</strong> by <strong>$actor</strong>。' . "\n";
$lang->action->desc->extra = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>。' . "\n";
$lang->action->desc->opened = '$date, 由 <strong>$actor</strong> 创建。' . "\n";
$lang->action->desc->openedbysystem = '$date, 由系统创建。' . "\n";
$lang->action->desc->created = '$date, 由 <strong>$actor</strong> 创建。' . "\n";
$lang->action->desc->added = '$date, 由 <strong>$actor</strong> 添加。' . "\n";
$lang->action->desc->changed = '$date, 由 <strong>$actor</strong> 变更。' . "\n";
$lang->action->desc->edited = '$date, 由 <strong>$actor</strong> 编辑。' . "\n";
$lang->action->desc->assigned = '$date, 由 <strong>$actor</strong> 指派给 <strong>$extra</strong>。' . "\n";
$lang->action->desc->closed = '$date, 由 <strong>$actor</strong> 关闭。' . "\n";
$lang->action->desc->closedbysystem = '$date, 由系统关闭。' . "\n";
$lang->action->desc->deleted = '$date, 由 <strong>$actor</strong> 删除。' . "\n";
$lang->action->desc->deletedfile = '$date, 由 <strong>$actor</strong> 删除了附件：<strong><i>$extra</i></strong>。' . "\n";
$lang->action->desc->editfile = '$date, 由 <strong>$actor</strong> 编辑了附件：<strong><i>$extra</i></strong>。' . "\n";
$lang->action->desc->erased = '$date, 由 <strong>$actor</strong> 删除。' . "\n";
$lang->action->desc->undeleted = '$date, 由 <strong>$actor</strong> 还原。' . "\n";
$lang->action->desc->hidden = '$date, 由 <strong>$actor</strong> 隐藏。' . "\n";
$lang->action->desc->commented = '$date, 由 <strong>$actor</strong> 添加备注。' . "\n";
$lang->action->desc->activated = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
$lang->action->desc->blocked = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
$lang->action->desc->moved = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"。' . "\n";
$lang->action->desc->confirmed = '$date, 由 <strong>$actor</strong> 确认' . $lang->SRCommon . '变动，最新版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->caseconfirmed = '$date, 由 <strong>$actor</strong> 确认用例变动，最新版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->bugconfirmed = '$date, 由 <strong>$actor</strong> 确认Bug。' . "\n";
$lang->action->desc->frombug = '$date, 由 <strong>$actor</strong> Bug转化而来，Bug编号为 <strong>$extra</strong>。';
$lang->action->desc->started = '$date, 由 <strong>$actor</strong> 启动。' . "\n";
$lang->action->desc->restarted = '$date, 由 <strong>$actor</strong> 继续。' . "\n";
$lang->action->desc->delayed = '$date, 由 <strong>$actor</strong> 延期。' . "\n";
$lang->action->desc->suspended = '$date, 由 <strong>$actor</strong> 挂起。' . "\n";
$lang->action->desc->recordestimate = '$date, 由 <strong>$actor</strong> 记录工时，消耗 <strong>$extra</strong> 小时。';
$lang->action->desc->editestimate = '$date, 由 <strong>$actor</strong> 编辑工时。';
$lang->action->desc->deleteestimate = '$date, 由 <strong>$actor</strong> 删除工时。';
$lang->action->desc->canceled = '$date, 由 <strong>$actor</strong> 取消。' . "\n";
$lang->action->desc->svncommited = '$date, 由 <strong>$actor</strong> 提交代码，版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->gitcommited = '$date, 由 <strong>$actor</strong> 提交代码，版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->finished = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
$lang->action->desc->paused = '$date, 由 <strong>$actor</strong> 暂停。' . "\n";
$lang->action->desc->verified = '$date, 由 <strong>$actor</strong> 验收。' . "\n";
$lang->action->desc->diff1 = '修改了 <strong><i>%s</i></strong>，旧值为 "%s"，新值为 "%s"。<br />' . "\n";
$lang->action->desc->diff2 = '修改了 <strong><i>%s</i></strong>，区别为：' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff3 = '将文件名 %s 改为 %s 。' . "\n";
$lang->action->desc->linked2bug = '$date 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>';
$lang->action->desc->linked2testtask = '$date 由 <strong>$actor</strong> 关联到测试单 <strong>$extra</strong>';
$lang->action->desc->resolved = '$date, 由 <strong>$actor</strong> 解决。' . "\n";
$lang->action->desc->managed = '$date, 由 <strong>$actor</strong> 维护。' . "\n";
$lang->action->desc->estimated = '$date, 由 <strong>$actor</strong> 估算。' . "\n";
$lang->action->desc->run = '$date, 由 <strong>$actor</strong> 执行。' . "\n";
$lang->action->desc->syncprogram = '$date, 由 <strong>$actor</strong> 启动(因项目开始而启动项目集)。' . "\n";
$lang->action->desc->syncproject = '$date, 系统判断由于执行开始，将项目状态置为进行中。' . "\n";
$lang->action->desc->syncexecution = '$date, 系统判断由于任务开始，将执行状态置为进行中。' . "\n";
$lang->action->desc->common = '$date, <strong>$action</strong> by <strong>$actor</strong>。' . "\n";
$lang->action->desc->extra = '$date, <strong>$action</strong> as <strong>$extra</strong> by <strong>$actor</strong>。' . "\n";
$lang->action->desc->opened = '$date, 由 <strong>$actor</strong> 创建。' . "\n";
$lang->action->desc->openedbysystem = '$date, 由系统创建。' . "\n";
$lang->action->desc->created = '$date, 由 <strong>$actor</strong> 创建。' . "\n";
$lang->action->desc->added = '$date, 由 <strong>$actor</strong> 添加。' . "\n";
$lang->action->desc->changed = '$date, 由 <strong>$actor</strong> 变更。' . "\n";
$lang->action->desc->edited = '$date, 由 <strong>$actor</strong> 编辑。' . "\n";
$lang->action->desc->assigned = '$date, 由 <strong>$actor</strong> 指派给 <strong>$extra</strong>。' . "\n";
$lang->action->desc->closed = '$date, 由 <strong>$actor</strong> 关闭。' . "\n";
$lang->action->desc->closedbysystem = '$date, 由系统关闭。' . "\n";
$lang->action->desc->deleted = '$date, 由 <strong>$actor</strong> 删除。' . "\n";
$lang->action->desc->deletedfile = '$date, 由 <strong>$actor</strong> 删除了附件：<strong><i>$extra</i></strong>。' . "\n";
$lang->action->desc->editfile = '$date, 由 <strong>$actor</strong> 编辑了附件：<strong><i>$extra</i></strong>。' . "\n";
$lang->action->desc->erased = '$date, 由 <strong>$actor</strong> 删除。' . "\n";
$lang->action->desc->undeleted = '$date, 由 <strong>$actor</strong> 还原。' . "\n";
$lang->action->desc->hidden = '$date, 由 <strong>$actor</strong> 隐藏。' . "\n";
$lang->action->desc->commented = '$date, 由 <strong>$actor</strong> 添加备注。' . "\n";
$lang->action->desc->activated = '$date, 由 <strong>$actor</strong> 激活。' . "\n";
$lang->action->desc->blocked = '$date, 由 <strong>$actor</strong> 阻塞。' . "\n";
$lang->action->desc->moved = '$date, 由 <strong>$actor</strong> 移动，之前为 "$extra"。' . "\n";
$lang->action->desc->confirmed = '$date, 由 <strong>$actor</strong> 确认' . $lang->SRCommon . '变动，最新版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->caseconfirmed = '$date, 由 <strong>$actor</strong> 确认用例变动，最新版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->bugconfirmed = '$date, 由 <strong>$actor</strong> 确认Bug。' . "\n";
$lang->action->desc->frombug = '$date, 由 <strong>$actor</strong> Bug转化而来，Bug编号为 <strong>$extra</strong>。';
$lang->action->desc->started = '$date, 由 <strong>$actor</strong> 启动。' . "\n";
$lang->action->desc->restarted = '$date, 由 <strong>$actor</strong> 继续。' . "\n";
$lang->action->desc->delayed = '$date, 由 <strong>$actor</strong> 延期。' . "\n";
$lang->action->desc->suspended = '$date, 由 <strong>$actor</strong> 挂起。' . "\n";
$lang->action->desc->recordestimate = '$date, 由 <strong>$actor</strong> 记录工时，消耗 <strong>$extra</strong> 小时。';
$lang->action->desc->editestimate = '$date, 由 <strong>$actor</strong> 编辑工时。';
$lang->action->desc->deleteestimate = '$date, 由 <strong>$actor</strong> 删除工时。';
$lang->action->desc->canceled = '$date, 由 <strong>$actor</strong> 取消。' . "\n";
$lang->action->desc->svncommited = '$date, 由 <strong>$actor</strong> 提交代码，版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->gitcommited = '$date, 由 <strong>$actor</strong> 提交代码，版本为<strong>#$extra</strong>。' . "\n";
$lang->action->desc->finished = '$date, 由 <strong>$actor</strong> 完成。' . "\n";
$lang->action->desc->paused = '$date, 由 <strong>$actor</strong> 暂停。' . "\n";
$lang->action->desc->verified = '$date, 由 <strong>$actor</strong> 验收。' . "\n";
$lang->action->desc->diff1 = '修改了 <strong><i>%s</i></strong>，旧值为 "%s"，新值为 "%s"。<br />' . "\n";
$lang->action->desc->diff2 = '修改了 <strong><i>%s</i></strong>，区别为：' . "\n" . "<blockquote class='textdiff'>%s</blockquote>" . "\n<blockquote class='original'>%s</blockquote>";
$lang->action->desc->diff3 = '将文件名 %s 改为 %s 。' . "\n";
$lang->action->desc->linked2bug = '$date 由 <strong>$actor</strong> 关联到版本 <strong>$extra</strong>';
$lang->action->desc->linked2testtask = '$date 由 <strong>$actor</strong> 关联到测试单 <strong>$extra</strong>';
$lang->action->desc->resolved = '$date, 由 <strong>$actor</strong> 解决。' . "\n";
$lang->action->desc->managed = '$date, 由 <strong>$actor</strong> 维护。' . "\n";
$lang->action->desc->estimated = '$date, 由 <strong>$actor</strong> 估算。' . "\n";
$lang->action->desc->run = '$date, 由 <strong>$actor</strong> 执行。' . "\n";
$lang->action->desc->syncprogram = '$date, 由 <strong>$actor</strong> 启动(因项目开始而启动项目集)。' . "\n";
$lang->action->desc->syncproject = '$date, 系统判断由于执行开始，将项目状态置为进行中。' . "\n";
$lang->action->desc->syncexecution = '$date, 系统判断由于任务开始，将执行状态置为进行中。' . "\n";
$lang->action->desc->importfromgitlab = '$date, 由 <strong>$actor</strong> 从Gitlab的Issue关联创建。' . "\n";
/* 用来描述和父子任务相关的操作历史记录。*/
$lang->action->desc->createchildren = '$date, 由 <strong>$actor</strong> 创建子任务 <strong>$extra</strong>。' . "\n";
@@ -304,6 +306,7 @@ $lang->action->label->compilefail = '构建失败';
$lang->action->label->reopen = '重新打开';
$lang->action->label->approve = '通过了';
$lang->action->label->reject = '拒绝了';
$lang->action->label->importfromgitlab = '从Gitlab关联创建了';
/* 动态信息按照对象分组 */
$lang->action->dynamicAction = new stdclass();
@@ -354,6 +357,7 @@ $lang->action->dynamicAction->release['notified'] = '通知发布';
$lang->action->dynamicAction->release['hidden'] = '隐藏发布';
$lang->action->dynamicAction->story['opened'] = "创建{$lang->SRCommon}";
$lang->action->dynamicAction->story['importfromgitlab'] = "从Gitlab关联创建{$lang->SRCommon}";
$lang->action->dynamicAction->story['edited'] = "编辑{$lang->SRCommon}";
$lang->action->dynamicAction->story['activated'] = "激活{$lang->SRCommon}";
$lang->action->dynamicAction->story['reviewed'] = "评审{$lang->SRCommon}";
@@ -394,6 +398,7 @@ $lang->action->dynamicAction->kanbanlane['moved'] = '移动泳道';
$lang->action->dynamicAction->team['managedTeam'] = '维护团队';
$lang->action->dynamicAction->task['opened'] = '创建任务';
$lang->action->dynamicAction->task['importfromgitlab'] = "从Gitlab关联创建任务";
$lang->action->dynamicAction->task['edited'] = '编辑任务';
$lang->action->dynamicAction->task['commented'] = '备注任务';
$lang->action->dynamicAction->task['assigned'] = '指派任务';
@@ -427,6 +432,7 @@ $lang->action->dynamicAction->build['edited'] = '编辑版本';
$lang->action->dynamicAction->build['deleted'] = '删除版本';
$lang->action->dynamicAction->bug['opened'] = '创建Bug';
$lang->action->dynamicAction->bug['importfromgitlab'] = "从Gitlab关联创建Bug";
$lang->action->dynamicAction->bug['edited'] = '编辑Bug';
$lang->action->dynamicAction->bug['activated'] = '激活Bug';
$lang->action->dynamicAction->bug['assigned'] = '指派Bug';
@@ -615,6 +621,7 @@ $lang->action->search->label['canceled'] = $lang->action->label->ca
$lang->action->search->label['finished'] = $lang->action->label->finished;
$lang->action->search->label['paused'] = $lang->action->label->paused;
$lang->action->search->label['verified'] = $lang->action->label->verified;
$lang->action->search->label['importfromgitlab'] = $lang->action->label->importfromgitlab;
$lang->action->search->label['login'] = $lang->action->label->login;
$lang->action->search->label['logout'] = $lang->action->label->logout;
module/gitlab/control.php
+29 -28
View File
@@ -948,7 +948,6 @@ class gitlab extends control
if($gitlab) $user = $this->gitlab->apiGetCurrentUser($gitlab->url, $gitlab->token);
if(empty($user->is_admin)) die(js::alert($this->lang->gitlab->tokenLimit) . js::locate($this->createLink('gitlab', 'edit', array('gitlabID' => $gitlabID))));
if($_POST)
{
$executionList = $this->post->executionList;
@@ -958,38 +957,40 @@ class gitlab extends control
$failedIssues = array();
foreach($executionList as $issueID => $executionID)
{
if($executionID)
if(empty($executionID) and $productList[$issueID] != 0) return $this->send(array('result' => 'fail', 'message' => $this->lang->gitlab->importIssueError, 'locate' => $this->server->http_referer));
}
foreach($executionList as $issueID => $executionID)
{
if(empty($executionID)) continue;
$objectType = $objectTypeList[$issueID];
$issue = $this->gitlab->apiGetSingleIssue($gitlabID, $projectID, $issueID);
$issue->objectType = $objectType;
$issue->objectID = 0; // Meet the required parameters for issueToZentaoObject.
if(isset($issue->assignee)) $issue->assignee_id = $issue->assignee->id;
$issue->updated_by_id = $issue->author->id; // Here can be replaced by current zentao user.
$object = $this->gitlab->issueToZentaoObject($issue, $gitlabID);
$object->product = $productList[$issueID];
$object->execution = $executionID;
$clonedObject = clone $object;
if($objectType == 'task') $objectID = $this->loadModel('task')->createTaskFromGitlabIssue($clonedObject, $executionID);
if($objectType == 'bug') $objectID = $this->loadModel('bug')->createBugFromGitlabIssue($clonedObject, $executionID);
if($objectType == 'story') $objectID = $this->loadModel('story')->createStoryFromGitlabIssue($clonedObject, $executionID);
if($objectID)
{
$objectType = $objectTypeList[$issueID];
$this->loadModel('action')->create($objectType, $objectID, 'ImportFromGitlab', '', $issueID);
$issue = $this->gitlab->apiGetSingleIssue($gitlabID, $projectID, $issueID);
$issue->objectType = $objectType;
$issue->objectID = 0; // Meet the required parameters for issueToZentaoObject.
if(isset($issue->assignee)) $issue->assignee_id = $issue->assignee->id;
$issue->updated_by_id = $issue->author->id; // Here can be replaced by current zentao user.
$object = $this->gitlab->issueToZentaoObject($issue, $gitlabID);
$object->product = $productList[$issueID];
$object->execution = $executionID;
$clonedObject = clone $object;
if($objectType == 'task') $objectID = $this->loadModel('task')->createTaskFromGitlabIssue($clonedObject, $executionID);
if($objectType == 'bug') $objectID = $this->loadModel('bug')->createBugFromGitlabIssue($clonedObject, $executionID);
if($objectType == 'story') $objectID = $this->loadModel('story')->createStoryFromGitlabIssue($clonedObject, $executionID);
if($objectID)
{
$object->id = $objectID;
$this->gitlab->saveImportedIssue($gitlabID, $projectID, $objectType, $objectID, $issue, $object);
}
else
{
$failedIssues[] = $issue->iid;
}
$object->id = $objectID;
$this->gitlab->saveImportedIssue($gitlabID, $projectID, $objectType, $objectID, $issue, $object);
}
else
{
if($productList[$issueID] != 0) return $this->send(array('result' => 'fail', 'message' => $this->lang->gitlab->importIssueError, 'locate' => $this->server->http_referer));
$failedIssues[] = $issue->iid;
}
}
module/gitlab/js/managegroupmembers.js
+20 -1
View File
@@ -41,6 +41,25 @@ function addItem(obj)
*/
function deleteItem(obj)
{
if($('#teamForm .table tbody').children().length < 2) return false;
if($('#teamForm .table-form tbody').children().length < 2) return false;
$(obj).closest('tr').remove();
}
$(document).on('change', '[id^="levels"]', function()
{
$tr = $(this).closest('tr');
$next = $(this).closest('td').next()
var ownerLevel = 50;
if($(this).val() == ownerLevel)
{
$next.prepend('<input type="text" value="" class="form-control disabled" disabled autocomplete="off" />');
$next.find('[id^="expires"]').addClass('hidden');
$tr.find('a[onclick^="deleteItem"]').addClass('disabled');
}
else
{
$next.find('[id^="expires"]').removeClass('hidden');
$next.find('input.disabled').remove();
$tr.find('a[onclick^="deleteItem"]').removeClass('disabled');
}
})
module/gitlab/js/manageprojectmembers.js
+1 -1
View File
@@ -41,6 +41,6 @@ function addItem(obj)
*/
function deleteItem(obj)
{
if($('#teamForm .table tbody').children().length < 2) return false;
if($('#teamForm .table-form tbody').children().length < 2) return false;
$(obj).closest('tr').remove();
}
module/gitlab/lang/en.php
+4 -2
View File
@@ -63,7 +63,7 @@ $lang->gitlab->lblCreate = 'Create GitLab Server';
$lang->gitlab->desc = 'Description';
$lang->gitlab->tokenFirst = 'When the Token is not empty, the Token will be used first';
$lang->gitlab->tips = 'When using a password, please disable the "Prevent cross-site request forgery" option in the GitLab global security settings.';
$lang->gitlab->emptyError = "cannot be empty";
$lang->gitlab->emptyError = " cannot be empty";
$lang->gitlab->createSuccess = "Create success";
$lang->gitlab->placeholder = new stdclass;
@@ -91,12 +91,14 @@ $lang->gitlab->apiError[1] = 'public is not allowed in a private group.';
$lang->gitlab->apiError[2] = 'is too short (minimum is 8 characters)';
$lang->gitlab->apiError[3] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->gitlab->apiError[4] = 'Branch already exists';
$lang->gitlab->apiError[5] = 'Failed to save group {:path=>["has already been taken"]}';
$lang->gitlab->errorLang[0] = 'You cannot set Internal as its Visibility Level, if it is private in GitLab.';
$lang->gitlab->errorLang[1] = 'You cannot set Public as its Visibility Level, if it is private in GitLab.';
$lang->gitlab->errorLang[2] = 'Password is too short (minimum is 8 characters)';
$lang->gitlab->errorLang[3] = 'It should contain only letters, digits, underscore, hyphen and period. It should not start with hypen, or end with .git or .atom.';
$lang->gitlab->errorLang[4] = 'Branch already exists.';
$lang->gitlab->errorLang[5] = 'Failed to save group, path has already been taken.';
$lang->gitlab->project = new stdclass;
$lang->gitlab->project->id = "Project ID";
@@ -184,7 +186,7 @@ $lang->gitlab->group->memberExpiresAt = 'Expiration time
$lang->gitlab->group->repeatError = "Group members cannot be added repeatedly";
$lang->gitlab->branch = new stdclass();
$lang->gitlab->branch->name = 'Branch Name';
$lang->gitlab->branch->name = 'Branch name';
$lang->gitlab->branch->from = 'Create from';
$lang->gitlab->branch->create = 'Create';
$lang->gitlab->branch->lastCommitter = 'Last Committer';
module/gitlab/lang/zh-cn.php
+2
View File
@@ -91,12 +91,14 @@ $lang->gitlab->apiError[1] = 'public is not allowed in a private group.';
$lang->gitlab->apiError[2] = 'is too short (minimum is 8 characters)';
$lang->gitlab->apiError[3] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->gitlab->apiError[4] = 'Branch already exists';
$lang->gitlab->apiError[5] = 'Failed to save group {:path=>["has already been taken"]}';
$lang->gitlab->errorLang[0] = '私有分组的项目，可见性级别不能设为内部。';
$lang->gitlab->errorLang[1] = '私有分组的项目，可见性级别不能设为公开。';
$lang->gitlab->errorLang[2] = '密码太短（最少8个字符）';
$lang->gitlab->errorLang[3] = "只能包含字母、数字、'.'-'和'.'。不能以'-'开头、以'.git'结尾或以'.atom'结尾。";
$lang->gitlab->errorLang[4] = '分支名已存在。';
$lang->gitlab->errorLang[5] = '保存失败，群组URL路径已经被使用。';
$lang->gitlab->project = new stdclass;
$lang->gitlab->project->id = "项目ID";
module/gitlab/model.php
+40 -40
View File
@@ -2050,15 +2050,15 @@ class gitlabModel extends model
if(empty($project->path)) dao::$errors['path'][] = $this->lang->gitlab->project->emptyPathError;
if(dao::isError()) return false;
$reponse = $this->apiCreateProject($gitlabID, $project);
$response = $this->apiCreateProject($gitlabID, $project);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabproject', $reponse->id, 'created', '', $reponse->name);
$this->loadModel('action')->create('gitlabproject', $response->id, 'created', '', $response->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2074,15 +2074,15 @@ class gitlabModel extends model
if(empty($project->name)) dao::$errors['name'][] = $this->lang->gitlab->project->emptyNameError;
if(dao::isError()) return false;
$reponse = $this->apiUpdateProject($gitlabID, $project);
$response = $this->apiUpdateProject($gitlabID, $project);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabproject', $project->id, 'edited', '', $project->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2119,11 +2119,11 @@ class gitlabModel extends model
}
}
$reponse = $this->apiCreateUser($gitlabID, $user);
$response = $this->apiCreateUser($gitlabID, $user);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabuser', $reponse->id, 'created', '', $reponse->name);
$this->loadModel('action')->create('gitlabuser', $response->id, 'created', '', $response->name);
/* Bind user. */
if($user->account)
@@ -2132,13 +2132,13 @@ class gitlabModel extends model
$userBind->providerID = $gitlabID;
$userBind->providerType = 'gitlab';
$userBind->account = $user->account;
$userBind->openID = $reponse->id;
$userBind->openID = $response->id;
$this->dao->insert(TABLE_OAUTH)->data($userBind)->exec();
}
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2179,14 +2179,14 @@ class gitlabModel extends model
}
}
$reponse = $this->apiUpdateUser($gitlabID, $user);
$response = $this->apiUpdateUser($gitlabID, $user);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabuser', $reponse->id, 'edited', '', $reponse->name);
$this->loadModel('action')->create('gitlabuser', $response->id, 'edited', '', $response->name);
/* Delete old bind. */
$this->dao->delete()->from(TABLE_OAUTH)->where('providerType')->eq('gitlab')->andWhere('providerID')->eq($gitlabID)->andWhere('openID')->eq($reponse->id)->andWhere('account')->ne($user->account)->exec();
$this->dao->delete()->from(TABLE_OAUTH)->where('providerType')->eq('gitlab')->andWhere('providerID')->eq($gitlabID)->andWhere('openID')->eq($response->id)->andWhere('account')->ne($user->account)->exec();
/* Bind user. */
if($user->account && $changeBind)
{
@@ -2194,13 +2194,13 @@ class gitlabModel extends model
$userBind->providerID = $gitlabID;
$userBind->providerType = 'gitlab';
$userBind->account = $user->account;
$userBind->openID = $reponse->id;
$userBind->openID = $response->id;
$this->dao->replace(TABLE_OAUTH)->data($userBind)->exec();
}
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2218,15 +2218,15 @@ class gitlabModel extends model
if(empty($group->path)) dao::$errors['path'][] = $this->lang->gitlab->group->path . $this->lang->gitlab->group->emptyError;
if(dao::isError()) return false;
$reponse = $this->apiCreateGroup($gitlabID, $group);
$response = $this->apiCreateGroup($gitlabID, $group);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabgroup', $reponse->id, 'created', '', $reponse->name);
$this->loadModel('action')->create('gitlabgroup', $response->id, 'created', '', $response->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2243,15 +2243,15 @@ class gitlabModel extends model
if(empty($group->name)) dao::$errors['name'][] = $this->lang->gitlab->group->name . $this->lang->gitlab->group->emptyError;
if(dao::isError()) return false;
$reponse = $this->apiUpdateGroup($gitlabID, $group);
$response = $this->apiUpdateGroup($gitlabID, $group);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabgroup', $reponse->id, 'edited', '', $reponse->name);
$this->loadModel('action')->create('gitlabgroup', $response->id, 'edited', '', $response->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2270,41 +2270,41 @@ class gitlabModel extends model
if(empty($branch->ref)) dao::$errors['ref'][] = $this->lang->gitlab->branch->from . $this->lang->gitlab->emptyError;
if(dao::isError()) return false;
$reponse = $this->apiCreateBranch($gitlabID, $projectID, $branch);
$response = $this->apiCreateBranch($gitlabID, $projectID, $branch);
if(!empty($reponse->name))
if(!empty($response->name))
{
$this->loadModel('action')->create('gitlabbranch', 0, 'created', '', $reponse->name);
$this->loadModel('action')->create('gitlabbranch', 0, 'created', '', $response->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
* Api error handling.
*
* @param object $reponse
* @param object $response
* @access public
* @return bool
*/
public function apiErrorHandling($reponse)
public function apiErrorHandling($response)
{
if(!empty($reponse->error))
if(!empty($response->error))
{
dao::$errors[] = $reponse->error;
dao::$errors[] = $response->error;
return false;
}
if(!empty($reponse->message))
if(!empty($response->message))
{
if(is_string($reponse->message))
if(is_string($response->message))
{
$errorKey = array_search($reponse->message, $this->lang->gitlab->apiError);
dao::$errors[] = $errorKey === false ? $reponse->message : zget($this->lang->gitlab->errorLang, $errorKey);
$errorKey = array_search($response->message, $this->lang->gitlab->apiError);
dao::$errors[] = $errorKey === false ? $response->message : zget($this->lang->gitlab->errorLang, $errorKey);
}
else
{
foreach($reponse->message as $field => $fieldErrors)
foreach($response->message as $field => $fieldErrors)
{
foreach($fieldErrors as $error)
{
@@ -2315,7 +2315,7 @@ class gitlabModel extends model
}
}
if(!$reponse) dao::$errors[] = false;
if(!$response) dao::$errors[] = false;
return false;
}
module/gitlab/view/binduser.html.php
+3 -2
View File
@@ -21,7 +21,7 @@
<thead>
<tr>
<th colspan='2'><?php echo $lang->gitlab->gitlabAccount;?></th>
<th><?php echo $lang->gitlab->zentaoAccount;?></th>
<th class='w-150px'><?php echo $lang->gitlab->zentaoAccount;?></th>
<th class='w-150px'><?php echo $lang->gitlab->bindingStatus;?></th>
</tr>
</thead>
@@ -51,7 +51,8 @@
<td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, $gitlabUser->zentaoAccount, "class='form-control select chosen'" );?></td>
<td>
<?php if(isset($bindedUsers[$gitlabUser->zentaoAccount])):?>
<?php if(!empty(zget($userPairs, $gitlabUser->zentaoAccount, ''))):?>
<?php $zentaoAccount = zget($userPairs, $gitlabUser->zentaoAccount, '');?>
<?php if(!empty($zentaoAccount)):?>
<?php echo $lang->gitlab->binded;?>
<?php else:?>
<?php echo '<span class="text-red">' . $lang->gitlab->bindedError . '</span>';?>
module/gitlab/view/browse.html.php
+5 -5
View File
@@ -47,11 +47,11 @@
<td class='c-actions text-left'>
<?php
$disabled = !empty($gitlab->isAdminToken) ? '' : 'disabled';
common::printLink('gitlab', 'browseProject', "gitlabID=$id", "<i class='icon icon-list-box'></i> ", '',"title={$lang->gitlab->browseProject} class='btn btn-primary'");
common::printLink('gitlab', 'browseGroup', "gitlabID=$id", "<i class='icon icon-groups'></i> ", '', "title={$lang->gitlab->browseGroup} class='btn btn-primary'");
common::printLink('gitlab', 'edit', "gitlabID=$id", "<i class='icon icon-edit'></i> ", '',"title={$lang->gitlab->edit} class='btn btn-primary'");
common::printLink('gitlab', 'browseUser', "gitlabID=$id", "<i class='icon icon-person'></i> ", '', "title={$lang->gitlab->browseUser} class='btn {$disabled}' ,'disabled'");
common::printLink('gitlab', 'bindUser', "id=$id", "<i class='icon icon-link'></i> ", '', "title={$lang->gitlab->bindUser} class='btn {$disabled}' ,'disabled'");
common::printLink('gitlab', 'browseProject', "gitlabID=$id", "<i class='icon icon-list-box'></i> ", '',"title='{$lang->gitlab->browseProject}' class='btn btn-primary'");
common::printLink('gitlab', 'browseGroup', "gitlabID=$id", "<i class='icon icon-groups'></i> ", '', "title='{$lang->gitlab->browseGroup}' class='btn btn-primary'");
common::printLink('gitlab', 'edit', "gitlabID=$id", "<i class='icon icon-edit'></i> ", '',"title='{$lang->gitlab->edit}' class='btn btn-primary'");
common::printLink('gitlab', 'browseUser', "gitlabID=$id", "<i class='icon icon-person'></i> ", '', "title='{$lang->gitlab->browseUser}' class='btn {$disabled}' ,'disabled'");
common::printLink('gitlab', 'bindUser', "id=$id", "<i class='icon icon-link'></i> ", '', "title='{$lang->gitlab->bindUser}' class='btn {$disabled}' ,'disabled'");
if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'delete', "gitlabID=$id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->delete}' class='btn'");
?>
</td>
module/gitlab/view/browsegroup.html.php
+2 -2
View File
@@ -54,8 +54,8 @@
<td class='text' title='<?php echo substr($gitlabGroup->created_at, 0, 10);?>'><?php echo substr($gitlabGroup->created_at, 0, 10);?></td>
<td class='c-actions text-left'>
<?php
common::printLink('gitlab', 'manageGroupMembers', "gitlabID=$gitlabID&groupID=$gitlabGroup->id", "<i class='icon icon-team'></i> ", '',"title={$lang->gitlab->group->manageMembers} class='btn btn-primary'");
common::printLink('gitlab', 'editGroup', "gitlabID=$gitlabID&groupID=$gitlabGroup->id", "<i class='icon icon-edit'></i> ", '', "title={$lang->gitlab->group->edit} class='btn btn-primary'");
common::printLink('gitlab', 'manageGroupMembers', "gitlabID=$gitlabID&groupID=$gitlabGroup->id", "<i class='icon icon-team'></i> ", '',"title='{$lang->gitlab->group->manageMembers}' class='btn btn-primary'");
common::printLink('gitlab', 'editGroup', "gitlabID=$gitlabID&groupID=$gitlabGroup->id", "<i class='icon icon-edit'></i> ", '', "title='{$lang->gitlab->group->edit}' class='btn btn-primary'");
if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'deleteGroup', "gitlabID=$gitlabID&groupID=$gitlabGroup->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->deleteGroup}' class='btn'");
?>
</td>
module/gitlab/view/browseproject.html.php
+4 -3
View File
@@ -67,9 +67,10 @@
<td class='text' title='<?php echo substr($gitlabProject->last_activity_at, 0, 10);?>'><?php echo substr($gitlabProject->last_activity_at, 0, 10);?></td>
<td class='c-actions text-left'>
<?php
common::printLink('gitlab', 'browseBranch', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-treemap'></i> ", '', "title={$lang->gitlab->browseBranch} class='btn btn-primary'");
common::printLink('gitlab', 'browseBranchPriv', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-branch-lock'></i> ", '', "title={$lang->gitlab->branch->accessLevel} class='btn btn-primary'");
common::printLink('gitlab', 'editProject', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-edit'></i> ", '', "title={$lang->gitlab->project->edit} class='btn btn-primary'");
common::printLink('gitlab', 'browseBranch', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-treemap'></i> ", '', "title='{$lang->gitlab->browseBranch}' class='btn btn-primary'");
common::printLink('gitlab', 'browseBranchPriv', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-branch-lock'></i> ", '', "title='{$lang->gitlab->branch->accessLevel}' class='btn btn-primary'");
common::printLink('gitlab', 'editProject', "gitlabID=$gitlabID&projectID=$gitlabProject->id", "<i class='icon icon-edit'></i> ", '', "title='{$lang->gitlab->project->edit}' class='btn btn-primary'");
if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'deleteProject', "gitlabID=$gitlabID&projectID=$gitlabProject->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->deleteProject}' class='btn'");
?>
</td>
module/gitlab/view/browseuser.html.php
+1 -1
View File
@@ -54,7 +54,7 @@
<td class='text' title='<?php echo substr($gitlabUser->lastActivityOn, 0, 10);?>'><?php echo substr($gitlabUser->lastActivityOn, 0, 10);?></td>
<td class='c-actions text-left'>
<?php
common::printLink('gitlab', 'editUser', "gitlabID=$gitlabID&userID=$gitlabUser->id", "<i class='icon icon-edit'></i> ", '', "title={$lang->gitlab->user->edit} class='btn btn-primary'");
common::printLink('gitlab', 'editUser', "gitlabID=$gitlabID&userID=$gitlabUser->id", "<i class='icon icon-edit'></i> ", '', "title='{$lang->gitlab->user->edit}' class='btn btn-primary'");
if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'deleteUser', "gitlabID=$gitlabID&userID=$gitlabUser->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->deleteUser}' class='btn'");
?>
</td>
module/gitlab/view/createproject.html.php
+2 -2
View File
@@ -20,9 +20,9 @@
<form id='gitlabForm' method='post' class='form-ajax'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->gitlab->project->name;?></th>
<th class='w-150px'><?php echo $lang->gitlab->project->name;?></th>
<td class='required'><?php echo html::input('name', '', "class='form-control' placeholder='{$lang->gitlab->project->name}'");?></td>
<td class="tips-git"></td>
<td class="tips-git w-p20"></td>
</tr>
<tr>
<th><?php echo $lang->gitlab->project->url;?></th>
module/gitlab/view/editproject.html.php
+2 -1
View File
@@ -20,8 +20,9 @@
<form id='gitlabForm' method='post' class='form-ajax'>
<table class='table table-form'>
<tr>
<th><?php echo $lang->gitlab->project->id;?></th>
<th class='w-150px'><?php echo $lang->gitlab->project->id;?></th>
<td><?php echo html::input('id', $project->id, "class='form-control' readonly placeholder='{$lang->gitlab->project->id}'");?></td>
<td class="tips-git w-p20"></td>
</tr>
<tr>
<th><?php echo $lang->gitlab->project->name;?></th>
module/gitlab/view/managegroupmembers.html.php
+7 -1
View File
@@ -19,18 +19,24 @@
</tr>
</thead>
<tbody>
<?php $ownerLevel = 50;?>
<?php $i = 0;?>
<?php foreach($currentMembers as $member):?>
<tr>
<td><?php echo html::input("names[$i]", $member->name, "class='form-control' readonly");?></td>
<td><?php echo html::select("levels[$i]", array(''=>'') + $this->lang->gitlab->accessLevels, $member->access_level, "class='form-control chosen'");?></td>
<td>
<?php if($member->access_level == $ownerLevel):?>
<input type="text" value="" class="form-control disabled" disabled autocomplete="off" />
<?php echo html::input("expires[$i]", $member->expires_at, "class='form-control form-date hidden'");?>
<?php else:?>
<?php echo html::input("expires[$i]", $member->expires_at, "class='form-control form-date'");?>
<?php endif;?>
<?php echo html::hidden("ids[$i]", $member->id);?>
</td>
<td class='c-actions text-center'>
<?php echo html::a('javascript:;', "<i class='icon-plus'></i>", '', "onclick='addItem(this)' class='btn btn-link'");?>
<?php echo html::a('javascript:;', "<i class='icon icon-close'></i>", '', "onclick='deleteItem(this)' class='btn btn-link'");?>
<?php echo html::a('javascript:;', "<i class='icon icon-close'></i>", '', "onclick='deleteItem(this)' class='btn btn-link" . ($member->access_level == $ownerLevel ? ' disabled' : '') . "'");?>
</td>
</tr>
<?php $i ++;?>
module/group/lang/resource.php
+2 -2
View File
@@ -1298,7 +1298,7 @@ $lang->resource->mr->unlink = 'unlink';
$lang->resource->mr->approval = 'approval';
$lang->resource->mr->close = 'close';
$lang->resource->mr->reopen = 'reopen';
$lang->resource->mr->addBug = 'addBug';
$lang->resource->mr->addReview = 'addReview';
$lang->mr->methodOrder[10] = 'create';
$lang->mr->methodOrder[15] = 'browse';
@@ -1315,7 +1315,7 @@ $lang->mr->methodOrder[75] = 'unlink';
$lang->mr->methodOrder[80] = 'approval';
$lang->mr->methodOrder[85] = 'close';
$lang->mr->methodOrder[90] = 'reopen';
$lang->mr->methodOrder[95] = 'addBug';
$lang->mr->methodOrder[95] = 'addReview';
/* Git. */
$lang->resource->git = new stdclass();
module/mr/control.php
+14 -27
View File
@@ -300,7 +300,7 @@ class mr extends control
* @access public
* @return void
*/
public function diff($MRID, $encoding= '')
public function diff($MRID, $encoding = '')
{
$this->app->loadLang('productplan');
$this->app->loadLang('bug');
@@ -316,7 +316,7 @@ class mr extends control
$this->view->rawMR = $rawMR;
if(!isset($rawMR->id) or (isset($rawMR->message) and $rawMR->message == '404 Not found') or empty($rawMR)) return $this->display();
$diffs = $this->mr->getDiffs($MR, $encoding = '');
$diffs = $this->mr->getDiffs($MR, $encoding);
$arrange = $this->cookie->arrange ? $this->cookie->arrange : 'inline';
if($this->server->request_method == 'POST')
@@ -455,7 +455,6 @@ class mr extends control
$this->view->modulePairs = $this->loadModel('tree')->getOptionMenu($product->id, 'story');
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->stories = $stories;
$this->view->summary = $this->loadModel('product')->summary($stories);
$this->view->bugs = $bugs;
$this->view->tasks = $tasks;
$this->view->product = $product;
@@ -782,49 +781,37 @@ class mr extends control
}
/**
* Add a Bug for this review.
* Add a review for this review.
*
* @param int $repoID
* @param string $file
* @param int $mr
* @param int $v1
* @param int $v2
* @access public
* @return void
*/
public function addBug($repoID, $file, $v1, $v2)
public function addReview($repoID, $mr, $v1, $v2)
{
/* Handle the exception that when $repoID is empty. */
if($repoID == "0") $this->send(array());
$this->loadModel('repo');
if($this->get->repoPath) $file = $this->get->repoPath;
if(!empty($_POST))
{
$result = $this->mr->saveBug($repoID, $file, $v1, $v2);
if(dao::isError()) die(json_encode($result));
if($this->post->reviewType == 'bug') $result = $this->mr->saveBug($repoID, $mr, $v1, $v2);
if($this->post->reviewType == 'task') $result = $this->mr->saveTask($repoID, $mr, $v1, $v2);
if($result['result'] == 'fail') die(json_encode($result));
$bugID = $result['id'];
$objectID = $result['id'];
$repo = $this->repo->getRepoById($repoID);
/* Handle the exception that when $repo is empty. */
if(empty($repo)) $this->send(array());
if(empty($repo) or empty($result)) $this->send(json_encode(array()));
$entry = isset($repo->name) ? $repo->name . '/' . $this->repo->decodePath($file) : '';
$location = sprintf($this->lang->repo->reviewLocation, $entry, $repo->SCM != 'Subversion' ? substr($v2, 0, 10) : $v2, $this->post->begin, $this->post->end);
if(empty($v1))
{
$revision = $repo->SCM != 'Subversion' ? substr($v2, 0, 10) : $v2;
$link = $this->repo->createLink('view', "repoID=$repoID&objectID=0&entry={$file}&revision=$v2&showBug=true") . '#L' . $this->post->begin;
}
else
{
$revision = $repo->SCM != 'Subversion' ? substr($v1, 0, 10) : $v1;
$revision .= ' : ';
$revision .= $repo->SCM != 'Subversion' ? substr($v2, 0, 10) : $v2;
$link = $this->repo->createLink('diff', "repoID=$repoID&objectID=0&entry={$file}&oldRevision=$v1&newRevision=$v2&showBug=true") . '#L' . $this->post->begin;
}
$location = sprintf($this->lang->repo->reviewLocation, $this->post->entry ? base64_decode($this->post->entry) : '', $repo->SCM != 'Subversion' ? substr($v2, 0, 10) : $v2, $this->post->begin, $this->post->end);
$link = $this->createLink('mr', 'diff', "mr=$mr") . '#L' . $this->post->begin;
$actionID = $this->loadModel('action')->create('bug', $bugID, 'repoCreated', '', html::a($link, $location));
$this->loadModel('mail')->sendmail($bugID, $actionID);
$actionID = $this->loadModel('action')->create($this->post->reviewType, $objectID, 'repoCreated', '', html::a($link, $location));
$this->loadModel('mail')->sendmail($objectID, $actionID);
echo json_encode($result);
}
module/mr/css/common.css
+20 -20
View File
@@ -88,8 +88,8 @@ h3 {font-size: 16px;}
/* repo action form */
.repoCode .comment-list, .repoCode .comment-actions {max-width: 900px;}
.repoCode .bugFormContainer {border: 1px solid #bbb; margin: 0 0 0 15px; padding: 10px 20px 10px 10px; max-width: 880px; background: #fff;}
.repoCode .bugFormContainer th {width: 70px;}
.repoCode .reviewFormContainer {border: 1px solid #bbb; margin: 0 0 0 15px; padding: 10px 20px 10px 10px; max-width: 880px; background: #fff;}
.repoCode .reviewFormContainer th {width: 70px;}
.repoCode .action-row {display: none;}
.repoCode .with-action-row .action-row {display: table-row;}
@@ -106,26 +106,26 @@ h3 {font-size: 16px;}
.repoCode .comment-cell .panel-body {padding: 6px 10px;}
.repoCode .comment-cell .panel-actions.pull-right {margin-right: 0; margin-top: 0;}
.repoCode .comment-cell .editing .panel-body, .repoCode .comment-cell .commentContainer.show-form .panel-body {display: none;}
.repoCode .comment-cell .bug-edit-form, {padding: 10px; display: none;}
.repoCode .comment-cell .editing .bug-edit-form, .repoCode .comment-cell .commentContainer.show-form .comment-edit-form {display: block;}
.repoCode .comment-cell .review-edit-form, {padding: 10px; display: none;}
.repoCode .comment-cell .editing .review-edit-form, .repoCode .comment-cell .commentContainer.show-form .comment-edit-form {display: block;}
.repoCode .comment {border: 1px solid #e5e5e5; background: #fafafa; padding: 5px 10px; margin-bottom: 10px;}
.repoCode .comment .comment-edit-form {margin-top: 10px;}
.repoCode .panel-bug .steps {background: #f1f1f1; padding: 5px 10px;}
.repoCode .panel-bug .bug-edit-form {margin-bottom: 10px;}
.repoCode .panel-bug .panel-body {display: none;}
.repoCode .panel-bug .panel-heading {cursor: pointer;}
.repoCode .panel-bug.show .panel-body {display: block;}
.repoCode .panel-bug.show .icon-chevron-sign-down:before {content: '\e711';}
.repoCode .panel-bug.show-edit-form .bug-edit-form,
.repoCode .panel-bug.show-form .commentForm,
.repoCode .panel-review .steps {background: #f1f1f1; padding: 5px 10px;}
.repoCode .panel-review .review-edit-form {margin-bottom: 10px;}
.repoCode .panel-review .panel-body {display: none;}
.repoCode .panel-review .panel-heading {cursor: pointer;}
.repoCode .panel-review.show .panel-body {display: block;}
.repoCode .panel-review.show .icon-chevron-sign-down:before {content: '\e711';}
.repoCode .panel-review.show-edit-form .review-edit-form,
.repoCode .panel-review.show-form .commentForm,
.repoCode .comment.show-form .comment-edit-form {display: block;}
.repoCode .panel-bug .bug-edit-form,
.repoCode .panel-bug.show-form .addComment,
.repoCode .panel-bug .commentForm,
.repoCode .panel-review .review-edit-form,
.repoCode .panel-review.show-form .addComment,
.repoCode .panel-review .commentForm,
.repoCode .comment .comment-edit-form,
.repoCode .panel-bug.show-edit-form .panel-body .title,
.repoCode .panel-bug.show-edit-form .bug-date,
.repoCode .panel-review.show-edit-form .panel-body .title,
.repoCode .panel-review.show-edit-form .bug-date,
.repoCode .comment.show-form .comment-content, .repoCode .comment.show-form .comment-date {display: none;}
.repoCode .text-content {white-space: normal; white-space: pre-line;}
@@ -154,8 +154,8 @@ h3 {font-size: 16px;}
.repoCode #diff tr.commented .row-tip {right: 0;}
.repoCode #diff tr.commented .icon-chat-dot {left: 0;}
.repoCode .panel, .bugFormContainer {transition: border 0.4s;}
.repoCode .panel.highlight, #bugForm.highlight .bugFormContainer {border-color: #e48600;}
.repoCode .panel, .reviewFormContainer {transition: border 0.4s;}
.repoCode .panel.highlight, #reviewForm.highlight .reviewFormContainer {border-color: #e48600;}
#bugsPreview {white-space: normal;}
#bugsPreview .dropdown-menu {top: -100%; left: 30%; padding-top: 0; min-width: 300px; max-width: 500px;}
@@ -166,7 +166,7 @@ h3 {font-size: 16px;}
.icon-comments {position: relative; left: -50px;}
/* bug form */
#bugForm, #bugForm table {margin: 0; padding: 0;}
#reviewForm, #reviewForm table {margin: 0; padding: 0;}
.panel .table + .panel-footer {border-top: 0; background: #fff;}
module/mr/js/diff.js
+115 -308
View File
@@ -5,6 +5,13 @@ $(document).ready(function()
$(".label-exchange").click(function(){ $('#exchange').submit();});
});
/**
* Change encoding.
*
* @param string $encoding
* @access public
* @return void
*/
function changeEncoding(encoding)
{
$('#encoding').val(encoding);
@@ -14,11 +21,8 @@ function changeEncoding(encoding)
$(document).ready(function()
{
var $diffCode = $('.diff');
var hidePreview;
var $bugsPreview = $('#bugsPreview');
var $bugsPreviewMenu = $('#bugsPreview').children('.dropdown-menu');
var $rows = $diffCode.find('tr');
var rowTip = $('#rowTip').html();
var $rows = $diffCode.find('tr');
var rowTip = $('#rowTip').html();
var lastLine;
$rows.each(function()
{
@@ -48,13 +52,11 @@ $(document).ready(function()
$(this).removeClass("over");
});
var isInline = $.cookie('arrange') == 'inline';
var $bugFormRow = $('<tr class="action-row"><th></th>' + (isInline ? '<th></th><td class="action-cell"></td>' : '<td colspan="3" class="action-cell"></td>') + '</tr>');
var $bugForm = $('#bugForm');
var $commentCell = $('#commentCell');
var $bugPanel = $('#bugPanel');
// $bugForm.find('input[name="begin"], input[name="end"]').attr('max', lastLine);
$bugFormRow.find('td').append($bugForm.removeClass('hide'));
var isInline = $.cookie('arrange') == 'inline';
var $reviewFormRow = $('<tr class="action-row"><th></th>' + (isInline ? '<th></th><td class="action-cell"></td>' : '<td colspan="3" class="action-cell"></td>') + '</tr>');
var $reviewForm = $('#reviewForm');
var $reviewPanel = $('#reviewPanel');
$reviewFormRow.find('td').append($reviewForm.removeClass('hide'));
var highlight = function($e)
{
@@ -62,76 +64,47 @@ $(document).ready(function()
$e.addClass('highlight');
};
var createComment = function(comment, $comments)
var createReview = function(review, line, show)
{
console.log();
var $comment = $commentCell.clone()
.removeClass('hide')
.attr('id', 'comment-' + comment.id)
.attr('data-comment', comment.id);
$comment.find('.realname').text(comment.realname);
$comment.find('.comment-content').text(comment.comment);
$comment.find('.date').text(comment.date);
$comment.find('.edit').toggle(comment.edit);
$comment.find('.comment-edit-form').attr('action', createLink('repo', 'editComment', 'commentID=' + comment.id));
var $review = $reviewPanel.clone().removeClass('hide').attr('id', review.objectType + '-' + review.id);
$review.find('.realname').text(review.realname);
$review.find('.openedDate').text(review.openedDate);
$review.find('.title').text(review.title);
$review.find('.content').toggle(review.content != '').html(review.content);
$review.find('.code-lines').text(review.lines);
$review.find('input[name="objectID"]').val(review.id);
$review.data(review);
if($comments)
{
if(typeof $comments !== 'object') $comments = $('#bug-' + $comments + ' .comments');
($comments.hasClass('comments') ? $comments : $comments.find('.comments')).append($comment);
}
id = review.objectType == 'bug' ? 'Bug' : 'Task';
id += '#' + review.id;
if(review.view) id = "<a href='" + createLink(review.objectType, 'view', 'id=' + review.id) + "'>" + id + "</a>";
$review.find('.title').closest('.panel-heading').find('.panel-actions').prepend(id);
if(!review.delete) $review.find('.title').closest('.panel-heading').find('.panel-actions .reviewDelete').hide();
return $comment;
};
$review.toggleClass('show', show > 1);
if(show > 2) highlight($review);
var createBug = function(bug, line, $commentRow, show)
{
var commentCount, j;
var $bug = $bugPanel.clone().removeClass('hide').attr('id', 'bug-' + bug.id).attr('data-bug', bug.id);
$bug.find('.bugid').text(bug.id);
$bug.find('.realname').text(bug.realname);
$bug.find('.openedDate').text(bug.openedDate);
$bug.find('.title').text(bug.title);
$bug.find('.steps').toggle(bug.steps != '').html(bug.steps);
$bug.find('.edit').toggle(bug.edit);
$bug.find('.code-lines').text(bug.lines);
$bug.find('.delete').toggle(bug.delete);
$bug.find('input[name="objectID"]').val(bug.id);
$bug.find('.bug-edit-form').attr('action', createLink('repo', 'editBug', 'bugID=' + bug.id));
$bug.find('a.view-bug').attr('href', createLink('bug', 'view', "bugID=" + bug.id));
$bug.data('data', bug);
$bug.toggleClass('show', show > 1);
if(show > 2) highlight($bug);
if(bug.comments)
{
commentCount = bug.comments.length;
$bugComments = $bug.find('.comments');
for(j = 0; j < commentCount; j++)
{
createComment(bug.comments[j], $bugComments);
}
}
if(!line && bug.line) line = bug.line;
if(!line && review.line) line = review.line;
if(line)
{
if(!$commentRow)
var $row = $rows.filter('[data-line="' + line + '"]').last();
if(review.entry) $row = $('#diff[data-entry="' + review.entry + '"]').find('tr').filter('[data-line="' + line + '"]');
if($row.length == 0) return false;
$commentRow = $row.next('tr');
if($row.hasClass('commented')) $commentRow = $row.nextAll('tr.comment-row').first();
if(!$commentRow.hasClass('comment-row'))
{
var $row = $rows.filter('[data-line="' + line + '"]').last();
$commentRow = $row.next('tr');
if(!$commentRow.hasClass('comment-row'))
{
$commentRow = $('<tr class="comment-row"><th></th>' + (isInline ? '<th></th><td class="comment-cell"><div class="comment-list"></div></td>' : '<td colspan="3" class="comment-cell"><div class="comment-list"></div></td>') + '</tr>');
$row.addClass('commented').after($commentRow);
}
$commentRow = $('<tr class="comment-row"><th></th>' + (isInline ? '<th></th><td class="comment-cell"><div class="comment-list"></div></td>' : '<td colspan="3" class="comment-cell"><div class="comment-list"></div></td>') + '</tr>');
$row.addClass('commented').after($commentRow);
}
($commentRow.hasClass('comment-list') ? $commentRow : $commentRow.find('.comment-list')).append($bug);
$commentRow.find('.comment-list').append($review);
if(show && $commentRow.hasClass('comment-row')) $commentRow.addClass('show');
}
return $bug;
return $review;
};
var toggleComment = function($row, show)
@@ -182,233 +155,50 @@ $(document).ready(function()
$rows.removeClass('with-action-row')
$row.addClass('with-action-row');
$bugForm.find('input[name="begin"]').val(line);
$bugForm.find('input[name="end"]').attr('min', line).val(line);
$bugForm.find('select#assignedTo').val(blamePairs[line]);
$bugForm.find('select#assignedTo').trigger("chosen:updated");
$reviewForm.find('input[name="begin"]').val(line);
$reviewForm.find('input[name="end"]').attr('min', line).val(line);
$reviewForm.find('select#assignedTo').trigger("chosen:updated");
$reviewForm.find('input#entry').val($row.closest('table#diff').data('entry'));
$row.after($bugFormRow);
$row.after($reviewFormRow);
KindEditor.remove('#commentText');
$('#commentText').kindeditor();
var getCommiterLink = createLink('repo', 'ajaxgetcommitter', 'repoID=' + repoID + "&entry=" + file + "&revision=" + revision + "&line=" + line);
var connector = getCommiterLink.indexOf('&') >= 0 ? '&' : '?';
getCommiterLink = getCommiterLink + connector + 'entry=' + file;
$.ajax({url: getCommiterLink}).done(function(responseText)
{
$bugForm.find('#assignedTo').val(responseText).trigger("chosen:updated");
});
}
highlight($bugForm);
$bugForm.find('input[name="title"]').focus();
highlight($reviewForm);
$reviewForm.find('input[name="title"]').focus();
$row.addClass('selected');
}
e.stopPropagation();
}).on('click', '.bugCancel', function()
}).on('click', '.reviewDelete', function(e)
{
$rows.removeClass('selected');
$diffCode.removeClass('with-action-row');
}).on('click', '.bugEdit', function(e)
{
var $panelBug = $(this).closest('.panel-bug');
if($panelBug.hasClass('show-edit-form'))
{
$panelBug.removeClass('show-edit-form');
e.stopPropagation();
return;
}
$panelBug.addClass('show show-edit-form').find('input[name="commentText"]').val($panelBug.find('.title').first().text()).focus();
e.stopPropagation();
return false;
}).on('submit', '.bug-edit-form', function()
{
var $form = $(this);
$(this).ajaxSubmit(
{
success:function(text)
{
var $bug = $form.closest('.panel-bug');
$bug.find('.title').text(text);
$bug.removeClass('show-edit-form');
},
beforeSubmit:function(formData, jqForm)
{
var form = jqForm[0];
if(!form.commentText.value)
{
alert(contentError);
return false;
}
}
});
return false;
}).on('click', '.bugEditCancel', function()
{
$(this).closest('.panel-bug').removeClass('show-edit-form');
}).on('click', '.bugDelete', function(e)
{
var $bug = $(this).closest('.panel-bug');
if(!$bug.length) return;
var $review = $(this).closest('.panel-review');
if(!$review.length) return;
if(confirm(confirmDelete))
{
var link = createLink('repo', 'deleteBug', 'bugID=' + $bug.data('bug') + '&confirm=yes');
var link = createLink($review.data('objectType'), 'delete', 'id=' + $review.data('id') + '&confirm=yes');
$.get(link, function(data)
{
if(data == 'deleted')
var $commentRow = $review.closest('.comment-row');
if($commentRow.find('.panel-review').length === 1)
{
var $commentRow = $bug.closest('.comment-row');
if($commentRow.find('.panel-bug').length === 1)
{
$commentRow.removeClass('show').prev('tr').removeClass('commented');
}
$bug.remove();
$commentRow.removeClass('show').prev('tr').removeClass('commented');
}
$review.remove();
});
}
e.stopPropagation();
return false;
}).on('click', '.addComment', function()
{
$(this).closest('.panel-bug').addClass('show-form').find('.commentForm textarea').focus();
}).on('click', '.commentCancel', function()
{
$(this).closest('.panel-bug').removeClass('show-form');
}).on('submit', '.commentForm', function()
{
var $form = $(this);
$form.ajaxSubmit(
{
success:function(json)
{
var $panelBug = $form.closest('.panel-bug');
$form.find('textarea').val('');
$panelBug.removeClass('show-form');
createComment($.parseJSON(json), $panelBug.data('bug'));
},
beforeSubmit:function(formData, jqForm)
{
var form = jqForm[0];
if(!form.comment.value)
{
alert(commentError);
return false;
}
}
});
return false;
}).on('click', '.commentEdit', function()
{
var $comment = $(this).closest('.comment');
if($comment.hasClass('show-form'))
{
$comment.removeClass('show-form');
return;
}
$comment.addClass('show-form').find('textarea').val($comment.find('.comment-content').text()).focus();
}).on('click', '.commentEditCancel', function()
{
$(this).closest('.comment').removeClass('show-form');
}).on('submit', '.comment-edit-form', function()
{
var $form = $(this);
$form.ajaxSubmit(
{
success:function(html)
{
var $comment = $form.closest('.comment');
$comment.find('.comment-content').html(html);
$comment.removeClass('show-form');
},
beforeSubmit:function(formData, jqForm)
{
var form = jqForm[0];
if(!form.commentText.value)
{
alert(contentError);
return false;
}
}
});
return false;
}).on('click', '.commentDelete', function()
{
var $container = $(this).closest('.commentContainer');
if(!$container.length) return;
if(confirm(confirmDeleteComment))
{
var commentID = $container.data('comment');
var link = createLink('repo', 'deleteComment', 'commentID=' + commentID + '&confirm=yes');
$.get(link, function(data)
{
if(data == 'deleted')
{
var $commentRow = $container.closest('.comment-row');
if($commentRow.find('.bugContainer, .commentContainer').length === 1)
{
$commentRow.removeClass('show').prev('tr').removeClass('commented');
}
$container.remove();
}
});
}
return false;
}).on('click', 'tr.commented', function()
{
toggleComment($(this));
}).on('click', '.panel-bug > .panel-heading', function()
}).on('click', '.panel-review > .panel-heading', function()
{
$(this).closest('.panel-bug').toggleClass('show');
}).on('mouseenter', 'tr.commented td .preview-icon', function(e)
{
var $cell = $(this).closest('td');
var $row = $cell.closest('tr');
var $commentRow = $row.next('tr');
var $bugs = $commentRow.find('.panel-bug'), line = '?';
$bugsPreviewMenu.children('li:not(.dropdown-header)').remove();
$bugsPreviewMenu.find('.bug-count').text($bugs.length);
$bugsPreviewMenu.find('.comment-count').text($commentRow.find('.comment').length);
$bugs.each(function()
{
var bug = $(this).data('data');
line = bug.line;
$bugsPreviewMenu.append('<li><a href="javascript:;" data-id="#bug-' + bug.id + '"><small class="text-muted">#' + bug.id + '</small> ' + bug.title + '</a></li>');
});
$bugsPreviewMenu.find('.code-line').text(line);
$bugsPreview.prependTo($cell);
clearTimeout(hidePreview);
$bugsPreviewMenu.css({top: 0-$bugsPreviewMenu.outerHeight(), left: Math.max(0, e.offsetX-$bugsPreviewMenu.outerWidth())}).addClass('show');
setTimeout(function(){$bugsPreviewMenu.addClass('in');}, 50);
}).on('mouseleave', 'tr.commented td', function()
{
$bugsPreviewMenu.removeClass('in');
hidePreview = setTimeout(function(){$bugsPreviewMenu.removeClass('show');}, 200);
$(this).closest('.panel-review').toggleClass('show');
});
$bugsPreviewMenu.on('click', 'li', function(e)
{
var $bug = $($(this).find('a').data('id'));
if($bug.length)
{
$bug.addClass('show');
toggleComment($bug.closest('tr.comment-row'), true);
highlight($bug);
$bugsPreviewMenu.removeClass('in');
hidePreview = setTimeout(function(){$bugsPreviewMenu.removeClass('show');}, 200);
}
e.stopPropagation();
});
$bugForm.submit(function()
$reviewForm.submit(function()
{
$(this).ajaxSubmit(
{
@@ -417,14 +207,36 @@ $(document).ready(function()
json = $.parseJSON(json);
if(json.result == 'fail')
{
alert(json.message);
return false;
var message = '';
if(typeof(json.message) != 'string')
{
for(i in json.message)
{
if(typeof(json.message[i]) == 'string')
{
message += json.message[i] + '\n';
}
else
{
for(j in json.message[i])
{
message += json.message[i][j] + '\n';
}
}
}
}
else
{
message += json.message + '\n';
}
alert(message);
return false;
}
createBug(json, null, null, 3);
createReview(json, json.line, 3);
$diffCode.removeClass('with-action-row');
$diffCode.find('tr.with-action-row.selected').removeClass('selected');
$bugForm.find('#title').val('');
$reviewForm.find('#title').val('');
KindEditor.html('#commentText', '');
},
beforeSubmit:function(formData, jqForm)
@@ -438,7 +250,7 @@ $(document).ready(function()
if(!form.title.value)
{
alert(titleError);
$bugForm.find('input[name="title"]').focus();
$reviewForm.find('input[name="title"]').focus();
return false;
}
}
@@ -447,27 +259,22 @@ $(document).ready(function()
}).on('change', 'input[name="begin"]', function()
{
var begin = $(this).val();
var $end = $bugForm.find('input[name="end"]').attr('min', begin);
var $end = $reviewForm.find('input[name="end"]').attr('min', begin);
if(parseInt($end.val()) < parseInt(begin))
{
$end.val(begin);
}
});
if(bugs)
if(reviews)
{
var lineBugs, bugsCount, i;
for(var line in bugs)
var lineReviews;
for(var line in reviews)
{
if(line)
{
lineBugs = bugs[line];
bugsCount = lineBugs.length;
for(i = 0; i < bugsCount; i++)
{
createBug(lineBugs[i], line);
}
lineReviews = reviews[line];
for(var i in lineReviews) createReview(lineReviews[i], line);
}
}
}
@@ -479,30 +286,30 @@ $(document).ready(function()
$('.highlight').removeClass('highlight');
});
/**
* Anchor
*
* @access public
* @return void
*/
function anchor()
{
var hash = window.location.hash;
if(hash)
var hash = window.location.hash;
if(!hash) return false;
var line = hash.substr(1).replace('L', '');
var $row = $('.diff tr[data-line="' + line +'"]').first();
if($row.length) return false;
var anchor = $row.offset().top;
$('body,html').animate({scrollTop:anchor - 50}, 500);
$row.addClass('highlight');
if($row.hasClass('commented'))
{
var line = hash.substr(1).replace('L', '');
var $row = $('.diff tr[data-line="' + line +'"]').first();
if($row.length)
{
var anchor = $row.offset().top;
$('body,html').animate({scrollTop:anchor - 50}, 500);
$row.addClass('highlight');
if($row.hasClass('commented'))
{
toggleComment($row, true);
var $commentRow = $row.next('tr');
if($commentRow.hasClass('comment-row'))
{
$commentRow.addClass('highlight');
}
}
}
toggleComment($row, true);
var $commentRow = $row.next('tr');
if($commentRow.hasClass('comment-row')) $commentRow.addClass('highlight');
}
}
});
module/mr/lang/en.php
+9 -3
View File
@@ -21,11 +21,11 @@ $lang->mr->linkStory = 'Link Stories';
$lang->mr->linkBug = 'Link Bugs';
$lang->mr->linkTask = 'Link Tasks';
$lang->mr->unlink = 'UnLink of stories,Bugs,tasks';
$lang->mr->addBug = 'Add Review';
$lang->mr->addReview = 'Add Review';
$lang->mr->id = 'ID';
$lang->mr->mriid = "raw MR ID";
$lang->mr->title = 'Name';
$lang->mr->title = 'Name';
$lang->mr->status = 'Status';
$lang->mr->author = 'Author';
$lang->mr->assignee = 'Assignee';
@@ -46,7 +46,12 @@ $lang->mr->reject = 'Reject';
$lang->mr->close = 'Close';
$lang->mr->reopen = 'Reopen';
$lang->mr->approvalResult = 'Approval result';
$lang->mr->reviewType = 'Review Type';
$lang->mr->reviewTypeList = array();
$lang->mr->reviewTypeList['bug'] = 'Bug';
$lang->mr->reviewTypeList['task'] = 'Task';
$lang->mr->approvalResult = 'Approval result';
$lang->mr->approvalResultList = array();
$lang->mr->approvalResultList['approve'] = 'Approve';
$lang->mr->approvalResultList['reject'] = 'Reject';
@@ -90,6 +95,7 @@ $lang->mr->notFound = "Merge Request does not exist!";
$lang->mr->toCreatedMessage = "The merge request you submitted：<a href='%s'>%s</a>, the build task succeeded.";
$lang->mr->toReviewerMessage = "You have one merge request <a href='%s'>%s</a> waiting.";
$lang->mr->failMessage = "Your merge request <a href='%s'>%s</a> failed. Please check its execution result. ";
$lang->mr->storySummary = "Total <strong>%s</strong> {$lang->SRCommon} on this page.";
$lang->mr->apiError = new stdclass;
$lang->mr->apiError->createMR = "Failed to create a merge request through API. Reason: %s";
module/mr/lang/zh-cn.php
+9 -3
View File
@@ -21,7 +21,7 @@ $lang->mr->linkStory = '关联需求';
$lang->mr->linkBug = '关联Bug';
$lang->mr->linkTask = '关联任务';
$lang->mr->unlink = '取消关联需求、Bug、任务';
$lang->mr->addBug = '添加评审';
$lang->mr->addReview = '添加评审';
$lang->mr->id = 'ID';
$lang->mr->mriid = "MR原始ID";
@@ -46,7 +46,12 @@ $lang->mr->reject = '拒绝';
$lang->mr->close = '关闭';
$lang->mr->reopen = '重新打开';
$lang->mr->approvalResult = '评审意见';
$lang->mr->reviewType = '评审类型';
$lang->mr->reviewTypeList = array();
$lang->mr->reviewTypeList['bug'] = 'Bug';
$lang->mr->reviewTypeList['task'] = '任务';
$lang->mr->approvalResult = '评审意见';
$lang->mr->approvalResultList = array();
$lang->mr->approvalResultList['approve'] = '通过';
$lang->mr->approvalResultList['reject'] = '拒绝';
@@ -90,6 +95,7 @@ $lang->mr->notFound = "此{$lang->mr->common}不存在。";
$lang->mr->toCreatedMessage = "您提交的合并请求：<a href='%s'>%s</a> 构建任务执行通过。";
$lang->mr->toReviewerMessage = "有一个合并请求：<a href='%s'>%s</a> 待审核。";
$lang->mr->failMessage = "您提交的合并请求：<a href='%s'>%s</a> 构建任务执行失败，查看执行结果。";
$lang->mr->storySummary = "本页共 <strong>%s</strong> 个" . $lang->SRCommon;
$lang->mr->apiError = new stdclass;
$lang->mr->apiError->createMR = "通过API创建合并请求失败，失败原因：%s";
@@ -102,7 +108,7 @@ $lang->mr->closeSuccess = "已关闭合并请求。";
$lang->mr->apiErrorMap[0] = "You can't use same project/branch for source and target";
$lang->mr->errorLang[0] = '源项目分支不能和目标项目分支一样';
$lang->mr->errorLang[0] = '源项目分支与目标项目分支不能相同';
$lang->mr->from = "从";
$lang->mr->to = "合并到";
module/mr/model.php
+162 -42
View File
@@ -552,7 +552,7 @@ class mrModel extends model
public function getDiffs($MR, $encoding = '')
{
$diffVersions = $this->apiGetDiffVersions($MR->gitlabID, $MR->targetProject, $MR->mriid);
$gitlab = $this->gitlab->getByID($MR->gitlabID);
$gitlab = $this->gitlab->getByID($MR->gitlabID);
$this->loadModel('repo');
$repo = new stdclass;
@@ -570,10 +570,10 @@ class mrModel extends model
foreach ($diffVersions as $diffVersion)
{
$singleDiff = $this->apiGetSingleDiffVersion($MR->gitlabID, $MR->targetProject, $MR->mriid, $diffVersion->id);
if ($singleDiff->state == 'empty') continue;
if($singleDiff->state == 'empty') continue;
$commits = $singleDiff->commits;
$diffs = $singleDiff->diffs;
foreach ($diffs as $index => $diff)
foreach($diffs as $index => $diff)
{
if(empty($commits[$index])) continue;
/* Make sure every file with same commitID is unique in $lines. */
@@ -586,9 +586,10 @@ class mrModel extends model
$lines[] = sprintf("--a/%s", $diff->old_path);
$lines[] = sprintf("--b/%s", $diff->new_path);
$diffLines = explode("\n", $diff->diff);
foreach ($diffLines as $diffLine) $lines[] = $diffLine;
foreach($diffLines as $diffLine) $lines[] = $diffLine;
}
}
$scm = $this->app->loadClass('scm');
$scm->setEngine($repo);
$diff = $scm->engine->parseDiff($lines);
@@ -785,45 +786,48 @@ class mrModel extends model
* Get review.
*
* @param int $repoID
* @param string $entry
* @param int $MRID
* @param string $revision
* @access public
* @return array
*/
public function getReview($repoID, $entry, $revision)
public function getReview($repoID, $MRID, $revision = '')
{
if(empty($repoID) OR empty($MRID)) return array();
$reviews = array();
$bugs = $this->dao->select('t1.*, t2.realname')->from(TABLE_BUG)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')
->on('t1.openedBy = t2.account')
->where('t1.repo')->eq($repoID)
->andWhere('t1.entry')->eq($entry)
->andWhere('t1.v2')->eq($revision)
->leftJoin(TABLE_USER)->alias('t2')->on('t1.openedBy = t2.account')
->where('t1.repo')->eq((int)$repoID)
->andWhere('t1.mr')->eq((int)$MRID)
->beginIF($revision)->andWhere('t1.v2')->eq($revision)->fi()
->andWhere('t1.deleted')->eq(0)
->fetchAll('id');
$comments = $this->dao->select('t1.*, t2.realname')->from(TABLE_ACTION)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')
->on('t1.actor = t2.account')
->where('t1.objectType')->eq('bug')
->andWhere('t1.objectID')->in(array_keys($bugs))
->andWhere('t1.action')->eq('commented')
->fetchGroup('objectID', 'id');
foreach($bugs as $bug)
{
if(common::hasPriv('bug', 'edit')) $bug->edit = true;
if(common::hasPriv('bug', 'delete')) $bug->delete = true;
if(common::hasPriv('bug', 'view')) $bug->view = true;
$lines = explode(',', trim($bug->lines, ','));
$line = $lines[0];
$reviews[$line]['bugs'][$bug->id] = $bug;
$reviews[$line]['bug'][$bug->id] = $bug;
}
if(isset($comments[$bug->id]))
{
foreach($comments[$bug->id] as $key => $comment)
{
if($comment->actor == $this->app->user->account) $comment->edit = true;
}
$reviews[$line]['comments'] = $comments;
}
$tasks = $this->dao->select('t1.*, t2.realname')->from(TABLE_TASK)->alias('t1')
->leftJoin(TABLE_USER)->alias('t2')->on('t1.openedBy = t2.account')
->where('t1.repo')->eq((int)$repoID)
->andWhere('t1.mr')->eq((int)$MRID)
->beginIF($revision)->andWhere('t1.v2')->eq($revision)->fi()
->andWhere('t1.deleted')->eq(0)
->fetchAll('id');
foreach($tasks as $task)
{
if(common::hasPriv('task', 'edit')) $task->edit = true;
if(common::hasPriv('task', 'delete')) $task->delete = true;
if(common::hasPriv('task', 'view')) $task->view = true;
$lines = explode(',', trim($task->lines, ','));
$line = $lines[0];
$reviews[$line]['task'][$task->id] = $task;
}
return $reviews;
@@ -881,43 +885,154 @@ class mrModel extends model
* Save bug.
*
* @param int $repoID
* @param string $file
* @param int $mr
* @param int $v1
* @param int $v2
* @access public
* @return array
*/
public function saveBug($repoID, $file, $v1, $v2)
public function saveBug($repoID, $mr, $v1, $v2)
{
$now = helper::now();
$data = fixer::input('post')
->add('severity', 3)
->stripTags('commentText', $this->config->allowedTags)
->add('pri', 2)
->add('severity', 2)
->add('openedBy', $this->app->user->account)
->add('openedDate', $now)
->add('openedBuild', 'trunk')
->add('assignedDate', $now)
->add('type', 'codeimprovement')
->add('type', 'codeerror')
->add('repo', $repoID)
->add('entry', $file)
->add('mr', $mr)
->add('lines', $this->post->begin . ',' . $this->post->end)
->add('v1', $v1)
->add('v2', $v2)
->remove('commentText,begin,end,uid')
->cleanInt('module,execution,mr,repo')
->remove('begin,end,uid,reviewType,taskExecution,taskModule,taskAssignedTo')
->get();
$data->steps = $this->loadModel('file')->pasteImage($this->post->commentText, $this->post->uid);
$this->dao->insert(TABLE_BUG)->data($data)->exec();
$data->steps = $this->loadModel('file')->pasteImage($data->commentText, $this->post->uid);
if($data->assignedTo) $data->assignedDate = $now;
unset($data->commentText);
$this->loadModel('bug');
foreach(explode(',', $this->config->bug->create->requiredFields . ',repo,mr') as $requiredField)
{
$requiredField = trim($requiredField);
if(empty($requiredField)) continue;
if(!isset($data->$requiredField)) continue;
if(empty($data->$requiredField))
{
$fieldName = $requiredField;
if(isset($this->lang->bug->$requiredField)) $fieldName = $this->lang->bug->$requiredField;
dao::$errors[$requiredField][] = sprintf($this->lang->error->notempty, $fieldName);
}
}
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
$this->dao->insert(TABLE_BUG)->data($data)->autocheck()->exec();
if(!dao::isError())
{
$bugID = $this->dao->lastInsertID();
$this->file->updateObjectID($this->post->uid, $bugID, 'bug');
$this->loadModel('file')->updateObjectID($this->post->uid, $bugID, 'bug');
setcookie("repoPairs[$repoID]", $data->product);
return array('result' => 'success', 'id' => $bugID, 'realname' => $this->app->user->realname, 'openedDate' => substr($now, 5, 11), 'edit' => true, 'delete' => true, 'lines' => $data->lines, 'line' => $this->post->begin, 'steps' => $data->steps, 'title' => $data->title);
$bugInfo = array();
$bugInfo['result'] = 'success';
$bugInfo['id'] = $bugID;
$bugInfo['realname'] = $this->app->user->realname;
$bugInfo['openedDate'] = substr($now, 5, 11);
$bugInfo['edit'] = common::hasPriv('bug', 'edit');
$bugInfo['view'] = common::hasPriv('bug', 'view');
$bugInfo['delete'] = common::hasPriv('bug', 'delete');
$bugInfo['lines'] = $data->lines;
$bugInfo['line'] = $this->post->begin;
$bugInfo['content'] = $data->steps;
$bugInfo['title'] = $data->title;
$bugInfo['objectType'] = 'bug';
$bugInfo['entry'] = $data->entry;
return $bugInfo;
}
return array('result' => 'fail', 'message' => join("\n", dao::getError()));
return array('result' => 'fail', 'message' => dao::getError());
}
/**
* Save task.
*
* @param int $repoID
* @param int $mr
* @param int $v1
* @param int $v2
* @access public
* @return array
*/
public function saveTask($repoID, $mr, $v1, $v2)
{
$now = helper::now();
$data = fixer::input('post')->stripTags('commentText', $this->config->allowedTags)->get();
$task = new stdclass();
$task->execution = (int)$data->taskExecution;
$task->project = (int)$this->dao->select('project')->from(TABLE_PROJECT)->where('id')->eq($task->execution)->fetch('project');
$task->module = (int)$data->taskModule;
$task->name = $data->title;
$task->type = 'devel';
$task->pri = '2';
$task->status = 'wait';
$task->version = '1';
$task->openedBy = $this->app->user->account;
$task->assignedTo = $data->taskAssignedTo;
$task->repo = (int)$repoID;
$task->mr = (int)$mr;
$task->lines = $this->post->begin . ',' . $this->post->end;
$task->entry = $data->entry;
$task->v1 = $v1;
$task->v2 = $v2;
$task->desc = $this->loadModel('file')->pasteImage($data->commentText, $this->post->uid);
if($task->assignedTo) $task->assignedDate = $now;
$this->loadModel('task');
foreach(explode(',', $this->config->task->create->requiredFields . ',repo,mr') as $requiredField)
{
$requiredField = trim($requiredField);
if(empty($requiredField)) continue;
if(!isset($task->$requiredField)) continue;
if(empty($task->$requiredField))
{
$fieldName = $requiredField;
if(isset($this->lang->task->$requiredField)) $fieldName = $this->lang->task->$requiredField;
dao::$errors[$requiredField][] = sprintf($this->lang->error->notempty, $fieldName);
}
}
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
$this->dao->insert(TABLE_TASK)->data($task)->autocheck()->exec();
if(!dao::isError())
{
$taskID = $this->dao->lastInsertID();
$this->file->updateObjectID($this->post->uid, $taskID, 'task');
$taskInfo = array();
$taskInfo['result'] = 'success';
$taskInfo['id'] = $taskID;
$taskInfo['realname'] = $this->app->user->realname;
$taskInfo['openedDate'] = substr($now, 5, 11);
$taskInfo['edit'] = common::hasPriv('task', 'edit');
$taskInfo['view'] = common::hasPriv('task', 'view');
$taskInfo['delete'] = common::hasPriv('task', 'delete');
$taskInfo['lines'] = $task->lines;
$taskInfo['line'] = $this->post->begin;
$taskInfo['content'] = $task->desc;
$taskInfo['title'] = $data->title;
$taskInfo['objectType'] = 'task';
$taskInfo['entry'] = $task->entry;
return $taskInfo;
}
return array('result' => 'fail', 'message' => dao::getError());
}
/**
@@ -963,13 +1078,18 @@ class mrModel extends model
/**
* Get last review info.
*
* @param string $entry
* @param int $repoID
* @access public
* @return object
*/
public function getLastReviewInfo($entry)
public function getLastReviewInfo($repoID)
{
return $this->dao->select('*')->from(TABLE_BUG)->where('entry')->eq($entry)->orderby('id_desc')->fetch();
if(empty($repoID)) return null;
$lastReview = new stdclass();
$lastReview->bug = $this->dao->select('*')->from(TABLE_BUG)->where('repo')->eq((int)$repoID)->orderby('id_desc')->fetch();
$lastReview->task = $this->dao->select('*')->from(TABLE_TASK)->where('repo')->eq((int)$repoID)->orderby('id_desc')->fetch();
return $lastReview;
}
/**
module/mr/view/diff.html.php
+5 -2
View File
@@ -55,10 +55,13 @@
<div class='btn-toolbar'>
<div class='btn-group'>
<div class='btn-group'>
<?php $encoding = str_replace('-', '_', $encoding);?>
<?php echo html::commonButton(zget($lang->repo->encodingList, $encoding, $lang->repo->encodingList['utf_8']) . "<span class='caret'></span>", "data-toggle='dropdown'", 'btn dropdown-toggle btn-sm')?>
<ul class='dropdown-menu' role='menu'>
<?php foreach($lang->repo->encodingList as $key => $val):?>
<li><?php echo html::a('javascript:changeEncoding("'. $key . '")', $val)?></li>
<li <?php echo $key == $encoding ? "class='active'" : '';?>>
<?php echo html::a('javascript:changeEncoding("'. $key . '")', $val)?>
</li>
<?php endforeach;?>
</ul>
</div>
@@ -69,7 +72,7 @@
</div>
<?php foreach($diffs as $diffFile):?>
<div class='repoCode'>
<table class='table diff' id='diff'>
<table class='table diff' id='diff' data-entry='<?php echo base64_encode($diffFile->fileName);?>'>
<caption><?php echo $diffFile->fileName;?></caption>
<?php if(empty($diffFile->contents)) continue;?>
<?php foreach($diffFile->contents as $content):?>
module/mr/view/header.review.html.php
+136 -129
View File
@@ -1,9 +1,6 @@
<?php
$file= '';
$suffix = '';
/* get last review info in this file. */
$lastReview = $this->mr->getLastReviewInfo($file);
$repoModule = isset($lastReview) && isset($lastReview->module) ? $lastReview->module : '';
$lastReview = $this->mr->getLastReviewInfo($repo->id);
/* Get product pairs. */
if(isset($repo->product) and $repo->product)
@@ -16,111 +13,97 @@ else
}
/* get product by cookie or last review in this file. */
$repoProduct = isset($_COOKIE['repoPairs'][$repoID]) ? $_COOKIE['repoPairs'][$repoID] : '';
$repoProduct = isset($lastReview) && isset($lastReview->product) ? $lastReview->product : $repoProduct;
$repoProduct = isset($products[$repoProduct]) ? $repoProduct : key($products);
$executions = $this->mr->getExecutionPairs($repoProduct);
$modules = $this->loadModel('tree')->getOptionMenu($repoProduct, $viewType = 'bug', $startModuleID = 0);
$users = $this->loadModel('user')->getPairs('devfirst|nodeleted|noclosed');
$products = array('' => '') + $products;
$executions = array('' => '') + $executions;
$repoProduct = isset($_COOKIE['repoPairs'][$repoID]) ? $_COOKIE['repoPairs'][$repoID] : '';
$repoProduct = (!empty($lastReview->bug) && isset($lastReview->bug->product)) ? $lastReview->bug->product : $repoProduct;
$repoProduct = isset($products[$repoProduct]) ? $repoProduct : key($products);
$bugRepoModule = (!empty($lastReview->bug) && $lastReview->bug->product == $repoProduct) ? $lastReview->bug->module : '';
$executions = $this->mr->getExecutionPairs($repoProduct);
$modules = $this->loadModel('tree')->getOptionMenu($repoProduct, $viewType = 'bug', $startModuleID = 0);
$users = $this->loadModel('user')->getPairs('devfirst|nodeleted|noclosed');
$products = array('' => '') + $products;
$executions = array('' => '') + $executions;
$cwd = getcwd();
$commiters = $this->user->getCommiters();
$blamePairs = array();
if($suffix and $suffix != 'binary' and strpos($this->config->repo->images, "|$suffix|") === false)
$taskExecutions = $executions;
if(empty($repo->product)) $taskExecutions = array('' => '') + $this->loadModel('execution')->getPairs();
$repoExecution = (!empty($lastReview->task) && isset($lastReview->task->execution)) ? $lastReview->task->execution : $this->session->execution;
$repoExecution = isset($taskExecutions[$repoExecution]) ? $repoExecution : key($taskExecutions);
$taskModules = array('' => '');
$taskRepoModule = 0;
$taskMembers = array('' => '');
if($repoExecution)
{
$blames = $this->scm->blame($entry, $info->revision);
foreach($blames as $line => $blame)
{
if(!isset($blame['committer']))
{
if(isset($blamePairs[$line - 1])) $blamePairs[$line] = $blamePairs[$line - 1];
continue;
}
$blamePairs[$line] = zget($commiters, $blame['committer'], $blame['committer']);
}
$taskModules = $this->loadModel('tree')->getTaskOptionMenu($repoExecution, 0, 0, 'allModule');
$taskRepoModule = (!empty($lastReview->task) && $lastReview->task->execution == $repoExecution) ? $lastReview->task->module : '';
$taskMembers = $this->loadModel('user')->getTeamMemberPairs($repoExecution, 'execution', 'nodeleted');
}
chdir($cwd);
//$reviews = $this->mr->getReview($repoID, $file, $info->revision);
$reviews = $this->mr->getReview($repoID, $file, '');
$v1 = isset($oldRevision) ? $oldRevision : 0;
$reviews = $this->mr->getReview($repoID, $MR->id);
$v1 = isset($oldRevision) ? $oldRevision : 0;
$this->loadModel('repo');
// $bugUrl = $this->repo->createLink('addBug', "repoID=$repoID&file=$file&v1=$v1&v2={$info->revision}");
$bugUrl = $this->createLink('mr', 'addBug', "repoID=$repoID&file=$file&v1=$v1&v2=");
$commentUrl = $this->createLink('mr', 'addComment');
$taskModuleSelect = html::select('taskModule', $taskModules, $taskRepoModule, 'class="form-control chosen"');
$taskUserSelect = html::select('taskAssignedTo', $taskMembers, '', 'class="form-control chosen"');
$taskExecutionSelect = html::select('taskExecution', $taskExecutions, $repoExecution, 'class="form-control chosen" onchange="changeExecution(this)"');
$reviewUrl = $this->createLink('mr', 'addReview', "repoID=$repoID&mr={$MR->id}&v1=$v1&v2=");
$productSelect = html::select('product', $products, $repoProduct, 'class="product form-control chosen" onchange="changeProduct(this)"');
$branches = $this->loadModel('branch')->getPairs($repoProduct);
$moduleSelect = html::select('module', $modules, $repoModule, 'class="form-control chosen"');
$moduleSelect = html::select('module', $modules, $bugRepoModule, 'class="form-control chosen"');
$executionSelect = html::select('execution', $executions, '', 'class="form-control chosen"');
$typeSelect = html::select('repoType', $lang->repo->typeList, '', 'class="form-control chosen"');
$userSelect = html::select('assignedTo', $users, '', 'class="form-control chosen assignedTo"');
$bugs = array();
$lineReviews = array();
foreach($reviews as $line => $lineReview)
{
$lineBugs = array();
foreach ($lineReview['bugs'] as $bugID => $bug)
foreach($lineReview as $objectType => $objects)
{
$lineBug = array();
$lineBug['id'] = $bugID;
$lineBug['line'] = $line;
$lineBug['title'] = $bug->title;
$lineBug['steps'] = $bug->steps;
$lineBug['realname'] = $bug->realname;
$lineBug['openedDate'] = substr($bug->openedDate, 5, 11);
$lineBug['lines'] = $bug->lines;
if($bug->edit) $lineBug['edit'] = true;
if($bug->delete) $lineBug['delete'] = true;
if(isset($lineReview['comments']))
foreach($objects as $objectID => $object)
{
if(isset($lineReview['comments'][$bugID]))
{
$comments = $lineReview['comments'][$bugID];
$bugComments = array();
foreach ($comments as $commentID => $comment)
{
$bugComment = array(
'id' => $comment->id,
'edit' => $comment->edit,
'realname' => $comment->realname,
'date' => substr($comment->date, 5, 11),
'comment' => $comment->comment,
);
$bugComments[] = $bugComment;
}
$lineBug['comments'] = $bugComments;
}
$lineReview = array();
$lineReview['id'] = $objectID;
$lineReview['line'] = $line;
$lineReview['title'] = $objectType == 'bug' ? $object->title : $object->name;
$lineReview['content'] = $objectType == 'bug' ? $object->steps : $object->desc;
$lineReview['realname'] = $object->realname;
$lineReview['openedDate'] = substr($object->openedDate, 5, 11);
$lineReview['lines'] = $object->lines;
$lineReview['objectType'] = $objectType;
$lineReview['entry'] = $object->entry;
$lineReview['edit'] = common::hasPriv($objectType, 'edit');
$lineReview['delete'] = common::hasPriv($objectType, 'delete');
$lineReview['view'] = common::hasPriv($objectType, 'view');
$lineReviews[$line][] = $lineReview;
}
$lineBugs[] = $lineBug;
}
$bugs[$line] = $lineBugs;
}
js::set('bugs', $bugs);
js::set('reviews', $lineReviews);
js::set('productError', $lang->repo->error->product);
js::set('contentError', $lang->repo->error->commentText);
js::set('titleError', $lang->repo->error->title);
js::set('commentError', $lang->repo->error->comment);
js::set('submit', $lang->repo->submit);
js::set('cancel', $lang->repo->cancel);
js::set('confirmDelete', $lang->repo->notice->deleteBug);
js::set('confirmDeleteComment', $lang->repo->notice->deleteComment);
js::set('confirmDelete', $lang->repo->notice->deleteReview);
js::set('repoID', $repoID);
// js::set('revision', $info->revision);
js::set('MRID', $MR->id);
js::set('revision', '');
js::set('file', $file);
js::set('blamePairs', $blamePairs);
?>
<?php if(common::hasPriv('mr', 'addBug')):?>
<form id="bugForm" class="bugForm main-form hide" method="post" action="<?php echo $bugUrl?>">
<div class="bugFormContainer">
<?php if(common::hasPriv('mr', 'addReview')):?>
<form id="reviewForm" class="reviewForm main-form hide" method="post" action="<?php echo $reviewUrl?>">
<div class="reviewFormContainer">
<table class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->mr->reviewType;?></th>
<td class='w-p45'><?php echo html::select('reviewType', $lang->mr->reviewTypeList, 'bug', "class='form-control' onchange=changeReviewType(this)")?></td>
<th class='w-100px'></th>
<td class='w-p45'></td>
</tr>
<tr>
<th><?php echo $lang->repo->product?></th>
<td class='w-p45'>
<td>
<div class='input-group'>
<?php echo $productSelect?>
<?php if($branches) echo html::select('branch', $branches, '', "class='form-control' style='width:95px'");?>
@@ -131,13 +114,22 @@ js::set('blamePairs', $blamePairs);
</tr>
<tr>
<th><?php echo $lang->repo->execution?></th>
<td><?php echo $executionSelect?></td>
<td>
<div class='bugExecutionBox'><?php echo $executionSelect?></div>
<div class='taskExecutionBox hide required'><?php echo $taskExecutionSelect?></div>
</td>
<th><?php echo $lang->repo->type?></th>
<td><?php echo $typeSelect?></td>
</tr>
<tr class='taskModuleBox hide'>
<th><?php echo $lang->repo->module?></th>
<td><?php echo $taskModuleSelect?></td>
<tr>
<th><?php echo $lang->repo->assign?></th>
<td><?php echo $userSelect?></td>
<td>
<div class='bugAssignedToBox'><?php echo $userSelect?></div>
<div class='taskAssignedToBox hide'><?php echo $taskUserSelect?></div>
</td>
<th><?php echo $lang->repo->lines?></th>
<td class='lines'>
<div class="input-group">
@@ -149,7 +141,7 @@ js::set('blamePairs', $blamePairs);
</tr>
<tr>
<th><?php echo $lang->repo->title?></th>
<td colspan='3'>
<td colspan='3' class='required'>
<?php echo html::input('title', '', "class='form-control'");?>
</td>
</tr>
@@ -160,8 +152,9 @@ js::set('blamePairs', $blamePairs);
<tr>
<th></th>
<td colspan="3" class='form-actions'>
<?php echo html::submitButton($lang->repo->submit, '', 'btn btn-wide btn-primary bugSubmit');?>
<?php echo html::submitButton($lang->repo->submit, '', 'btn btn-wide btn-primary reviewSubmit');?>
<?php echo html::commonButton($lang->cancel, "onclick='hiddenForm()'", 'btn btn-wide');?>
<input type="hidden" id='entry' name="entry" value=""/>
</td>
</tr>
</table>
@@ -169,73 +162,87 @@ js::set('blamePairs', $blamePairs);
</div>
</form>
<?php else:?>
<form id='bugForm' class='bugForm hide'>
<?php printf($lang->user->errorDeny, $lang->repo->common, $lang->repo->addBug);?>
<form id='reviewForm' class='reviewForm hide'>
<?php printf($lang->user->errorDeny, $lang->mr->common, $lang->mr->addReview);?>
</form>
<?php endif;?>
<div class='panel panel-sm hide panel-bug' id='bugPanel'>
<div class='panel panel-sm hide panel-review' id='reviewPanel'>
<div class='panel-heading'>
<div class='panel-actions pull-right'>
<?php if(common::hasPriv('bug', 'view')):?>
<a href='javascript:;' class='view-bug'>Bug#<span class='bugid'></span></a>
<?php else:?>
Bug#<span class='bugid'></span>
<?php endif;?>
<?php if(common::hasPriv('bug', 'edit')):?>
<a href='javascript:;' class='edit bugEdit'><i class='icon-pencil'></i></a>
<?php endif;?>
<?php if(common::hasPriv('bug', 'delete')):?>
<a href='javascript:;' class='delete bugDelete'><i class='icon-remove'></i></a>
<?php endif;?>
<a href='javascript:;' class='delete reviewDelete'><i class='icon-remove'></i></a>
<a href="javascript:;"><i class='icon-chevron-down'></i></a>
</div>
<i class='icon-bug text-muted'></i> <strong class='title'></strong>
<i class='text-muted'></i> <strong class='title'></strong>
</div>
<div class='panel-body'>
<p><?php echo $lang->repo->lines?> <strong class='code-lines'></strong> &nbsp; <i class='icon-user text-muted'></i> <strong class='realname'></strong> &nbsp;<span class='text-muted bug-date'><i class='icon-time'></i> <span class='openedDate'></span></span></p>
<form method='post' class='bug-edit-form' action>
<input type='text' name='commentText' class='commentInput form-control mgb-10'>
<button type='submit' class='btn btn-sm btn-primary bugEditSubmit'><?php echo $lang->repo->submit?></button>
<button type='button' class='btn btn-sm bugEditCancel'><?php echo $lang->repo->cancel?></button>
</form>
<p class='steps text-content'></p>
<div class='comments'></div>
<?php if(common::hasPriv('repo', 'addComment')):?>
<button class='btn btn-sm addComment' type='button'><?php echo $lang->repo->addComment?></button>
<form class='commentForm' method='post' action='<?php echo $commentUrl?>' id='commentForm'>
<textarea name='comment' class='commentText form-control mgb-10' spellcheck='false' placeholder='<?php echo $lang->repo->notice->commentContent?>'></textarea>
<input class='commentSubmit btn btn-sm btn-primary' type='submit' value='<?php echo $lang->repo->submit?>'>
<input class='commentCancel btn btn-sm' type='button' value='<?php echo $lang->repo->cancel?>'>
<input type='hidden' name='objectID' value=''>
<div class='optional'></div>
</form>
<?php endif;?>
<p class='content text-content'></p>
</div>
</div>
<div class='comment hide' id='commentCell'>
<i class='icon-user text-muted'></i> <strong class='realname'></strong>: <span class='comment-content text-content'></span> <span class='text-muted comment-date'>&nbsp;<i class='icon-time'></i> <span class='date'></span></span> &nbsp;<a href='javascript:;' class='edit commentEdit pull-right'><i class='icon-pencil'></i></a>
<form method='post' class='comment-edit-form' action=''>
<textarea name='commentText' class='commentInput form-control mgb-10'></textarea>
<button type='submit' class='btn btn-sm btn-primary commentEditSubmit'><?php echo $lang->repo->submit?></button>
<button type='button' class='btn btn-sm commentEditCancel'><?php echo $lang->repo->cancel?></button>
</form>
</div>
<div class='dropdown' id="bugsPreview">
<div class='dropdown' id="reviewsPreview">
<ul class='dropdown-menu fade'>
<li class='dropdown-header'><?php echo $lang->repo->line?><strong class='code-line'></strong> &nbsp; <i class='icon-bug'></i> <strong class='bug-count'>0</strong> &nbsp; <i class='icon-comments-alt'></i> <strong class='comment-count'>0</strong></li>
</ul>
</div>
<div id='rowTip' class='hide'><div class='row-tip'><i class='icon-chat-dot preview-icon'></i><div class='on-expand tip'><span><?php echo $lang->repo->expand?> </span><i class='icon-chevron-down'></i></div><div class='on-collapse tip'><span><?php echo $lang->repo->collapse?> </span><i class='icon-chevron-up'></i></div></div></div>
<div id='rowTip' class='hide'><div class='row-tip'><div class='on-expand tip'><span><?php echo $lang->repo->expand?> </span><i class='icon-chevron-down'></i></div><div class='on-collapse tip'><span><?php echo $lang->repo->collapse?> </span><i class='icon-chevron-up'></i></div></div></div>
<script>
function changeReviewType(select)
{
var reviewType = $(select).val();
if(reviewType == 'bug')
{
$('#product').closest('td').show();
$('#product').closest('td').prev().show();
$('#module').closest('td').show();
$('#module').closest('td').prev().show();
$('#repoType').closest('td').show();
$('#repoType').closest('td').prev().show();
$('.taskModuleBox').addClass('hide');
$('.bugAssignedToBox').removeClass('hide');
$('.taskAssignedToBox').addClass('hide');
$('.bugExecutionBox').removeClass('hide');
$('.taskExecutionBox').addClass('hide');
}
else
{
$('#product').closest('td').hide();
$('#product').closest('td').prev().hide();
$('#module').closest('td').hide();
$('#module').closest('td').prev().hide();
$('#repoType').closest('td').hide();
$('#repoType').closest('td').prev().hide();
$('.taskModuleBox').removeClass('hide');
$('.bugAssignedToBox').addClass('hide');
$('.taskAssignedToBox').removeClass('hide');
$('.bugExecutionBox').addClass('hide');
$('.taskExecutionBox').removeClass('hide');
}
}
function changeProduct(select)
{
loadProductBranches(select);
productID = $(select).children('option:selected').val();
link = createLink('repo', 'ajaxGetExecutions', 'productID=' + productID);
$(select).closest('.bugFormContainer').find('select[name=execution]').parent().load(link, '', function(){$('#execution').chosen();});
$(select).closest('.reviewFormContainer').find('select[name=execution]').parent().load(link, '', function(){$('#execution').chosen();});
moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=0&rootModuleID=0&returnType=html');
$(select).closest('.bugFormContainer').find('select[name=module]').parent().load(moduleLink, '', function(){$('#module').chosen();});
$(select).closest('.reviewFormContainer').find('select[name=module]').parent().load(moduleLink, '', function(){$('#module').chosen();});
}
function changeExecution(select)
{
if($('#reviewType').val() == 'bug') return false;
var executionID = $(select).val();
moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'execution=' + executionID + '&viewtype=task&branch=0&rootModuleID=0&returnType=html');
$('.taskModuleBox').find('td:first').load(moduleLink, '', function(){$('.taskModuleBox #module').attr('id', 'taskModule').attr('name', 'taskModule').chosen();});
assignLink = createLink('execution', 'ajaxGetMembers', 'executionID=' + executionID);
$('.taskAssignedToBox').load(assignLink, '', function(){$('.taskAssignedToBox #assignedTo').attr('id', 'taskAssignedTo').attr('name', 'taskAssignedTo').chosen();});
}
function loadProductBranches(select)
@@ -257,9 +264,9 @@ function loadBranch(select)
branch = $(select).val();
productID = $(select).closest('.input-group').find('#product').val();
link = createLink('repo', 'ajaxGetExecutions', 'productID=' + productID + '&branch=' + branch);
$(select).closest('.bugFormContainer').find('select[name=execution]').parent().load(link, '', function(){$('#execution').chosen();});
$(select).closest('.reviewFormContainer').find('select[name=execution]').parent().load(link, '', function(){$('#execution').chosen();});
moduleLink = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=' + branch + '&rootModuleID=0&returnType=html');
$(select).closest('.bugFormContainer').find('select[name=module]').parent().load(moduleLink, '', function(){$('#module').chosen();});
$(select).closest('.reviewFormContainer').find('select[name=module]').parent().load(moduleLink, '', function(){$('#module').chosen();});
}
function hiddenForm()
module/mr/view/link.html.php
+1 -1
View File
@@ -129,7 +129,7 @@
</table>
<?php if($stories):?>
<div class='table-footer'>
<div class='table-statistic'><?php echo $summary;?></div>
<div class='table-statistic'><?php echo sprintf($lang->mr->storySummary, count($stories));?></div>
<?php
$this->app->rawParams['type'] = 'story';
$storyPager->show('right', 'pagerjs');
module/mr/view/view.html.php
-6
View File
@@ -61,12 +61,6 @@
<th class="w-100px"><?php echo $lang->mr->status;?></th>
<td><?php echo zget($lang->mr->statusList, $MR->status);?></td>
</tr>
<?php if(isset($rawMR->head_pipeline->status)): ?>
<tr>
<th><?php echo "{$lang->mr->pipeline}{$lang->mr->status}";?></th>
<td><?php echo zget($lang->mr->pipelineStatus, $rawMR->head_pipeline->status, $lang->mr->pipelineUnknown); ?></td>
</tr>
<?php endif; ?>
<tr>
<th><?php echo $lang->mr->mergeStatus; ?></th>
<?php if(empty($rawMR->changes_count)):?>
module/repo/lang/en.php
+1
View File
@@ -146,6 +146,7 @@ $lang->repo->notice->syncedCount = 'The number of records synchronized is ';
$lang->repo->notice->delete = 'Do you want to delete this repo?';
$lang->repo->notice->successDelete = 'Repository is removed.';
$lang->repo->notice->commentContent = 'Comment';
$lang->repo->notice->deleteReview = 'Do you want to delete this review?';
$lang->repo->notice->deleteBug = 'Do you want to delete this bug?';
$lang->repo->notice->deleteComment = 'Do you want to delete this comment?';
$lang->repo->notice->lastSyncTime = 'Last Sync:';
module/repo/lang/zh-cn.php
+1
View File
@@ -146,6 +146,7 @@ $lang->repo->notice->syncedCount = '已经同步记录条数';
$lang->repo->notice->delete = '是否要删除该版本库？';
$lang->repo->notice->successDelete = '已经成功删除版本库。';
$lang->repo->notice->commentContent = '输入回复内容';
$lang->repo->notice->deleteReview = '确认删除该评审？';
$lang->repo->notice->deleteBug = '确认删除该Bug？';
$lang->repo->notice->deleteComment = '确认删除该回复？';
$lang->repo->notice->lastSyncTime = '最后更新于：';
module/upgrade/model.php
+24
View File
@@ -735,6 +735,10 @@ class upgradeModel extends model
$this->updateObjectBranch();
$this->updateProjectStories();
$this->appendExec('15_7_1');
case '16_0_beta1':
$this->saveLogs('Execute 16_0_beta1');
$this->adjustPriv16_0_beta1();
$this->appendExec('16_0_beta1');
}
$this->deletePatch();
@@ -5404,4 +5408,24 @@ class upgradeModel extends model
return true;
}
/**
* Adjust priv 16_0_beta1.
*
* @access public
* @return bool
*/
public function adjustPriv16_0_beta1()
{
$groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('mr')->andWhere('method')->eq('addBug')->fetchPairs('group', 'group');
foreach($groups as $groupID)
{
$groupPriv = new stdclass();
$groupPriv->group = $groupID;
$groupPriv->module = 'mr';
$groupPriv->method = 'addReview';
$this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
}
return true;
}
}
test/model/gitlab/apicreatebranch.php
+23 -5
View File
@@ -8,15 +8,33 @@ title=测试 gitlabModel::apiCreateBranch();
cid=1
pid=1
通过gitlabID,projectID,分支对象创建GitLab分支 >> test_branch5
使用空的gitlabID、projectID、分支对象创建GitLab分支 >> return false
使用空的gitlabID、projectID，正确的分支对象创建GitLab分支 >> return null
使用正确的gitlabID、分支信息，错误的projectID创建分支 >> 404 Project Not Found
使用正确的gitlabID,projectID，分支对象创建GitLab分支 >> test_branch17
使用重复的分支信息创建分支 >> Branch already exists
*/
$gitlab = $tester->loadModel('gitlab');
$gitlabID = 1;
$projectID = 1555;
$gitlabID = 0;
$projectID = 0;
$branch = new stdclass();
$branch->branch = 'test_branch5';
$result = $gitlab->apiCreateBranch($gitlabID, $projectID, $branch);
if($result === false) $result = 'return false';
r($result) && p() && e('return false'); //使用空的gitlabID,projectID,分支对象创建GitLab分支
$branch->branch = 'test_branch17';
$branch->ref = 'master';
r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('name') && e($branch->branch); //通过gitlabID,projectID,分支对象创建GitLab分支
$result = $gitlab->apiCreateBranch($gitlabID, $projectID, $branch);
if($result === null) $result = 'return null';
r($result) && p() && e('return false'); //使用空的gitlabID、projectID,正确的分支对象创建GitLab分支
$gitlabID = 1;
r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('message') && e('404 Project Not Found'); //使用正确的gitlabID、分支信息，错误的projectID创建分支
$projectID = 1555;
r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('name') && e($branch->branch); //通过gitlabID,projectID,分支对象正确创建GitLab分支
r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('message') && e('Branch already exists'); //使用重复的分支信息创建分支
test/model/gitlab/createbranch.php
Executable
+49
View File
@@ -0,0 +1,49 @@
#!/usr/bin/env php
<?php
include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
/**
title=测试 gitlabModel::createBranch();
cid=1
pid=1
使用空的gitlabID、projectID、分支创建GitLab分支 >> return false
使用空的gitlabID、projectID，正确的分支创建GitLab分支 >> return false
使用正确的gitlabID、分支信息，错误的projectID创建分支 >> return false
使用正确的gitlabID,projectID，分支创建GitLab分支 >> return true
使用重复的分支信息创建分支 >> return false
*/
$gitlab = $tester->loadModel('gitlab');
$gitlabID = 0;
$projectID = 0;
$result = $gitlab->createBranch($gitlabID, $projectID);
if($result === false) $result = 'return false';
r($result) && p() && e('return false'); //使用空的gitlabID,projectID,分支对象创建GitLab分支
dao::$errors = array();
$_POST['branch'] = 'test_branch17';
$_POST['ref'] = 'master';
$result = $gitlab->createBranch($gitlabID, $projectID);
if($result === false) $result = 'return false';
r($result) && p() && e('return false'); //使用空的gitlabID、projectID,正确的分支对象创建GitLab分支
dao::$errors = array();
$gitlabID = 1;
$result = $gitlab->createBranch($gitlabID, $projectID);
if($result === false) $result = 'return false';
r($result) && p() && e('return false'); //使用正确的gitlabID、分支信息，错误的projectID创建分支
dao::$errors = array();
$projectID = 1555;
$result = $gitlab->createBranch($gitlabID, $projectID);
if($result === true) $result = 'return true';
r($result) && p() && e('return true'); //通过gitlabID,projectID,分支对象正确创建GitLab分支
$result = $gitlab->createBranch($gitlabID, $projectID);
if($result === false) $result = 'return false';
r($result) && p() && e('return false'); //使用重复的分支信息创建分支
test/model/mr/getdiffs.php
+30
View File
@@ -0,0 +1,30 @@
#!/usr/bin/env php
<?php
include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
/**
title=测试 mrModel::getDiffs();
cid=1
pid=1
使用空的MR >> return null
使用正确的MR >> return normal
*/
$mrModel = $tester->loadModel('mr');
$MR = '';
$result = $mrModel->getDiffs($MR);
if(empty($result)) $result = 'return null';
r($result) && p() && e('return null'); //使用空的MR
$MR = $tester->dao->select('*')->from(TABLE_MR)->orderBy('id_desc')->limit(1)->fetch();
$result = $mrModel->getDiffs($MR);
if(!empty($result))
{
$first = reset($result);
if(isset($first->fileName) and is_array($first->contents)) $result = 'return normal';
}
r($result) && p() && e('return normal'); //使用正确的MR
test/model/mr/getlastreviewinfo.php
+26
View File
@@ -0,0 +1,26 @@
#!/usr/bin/env php
<?php
include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
/**
title=测试 mrModel::getLastReviewInfo();
cid=1
pid=1
使用空的repoID >> return null
使用正确的repoID >> return normal
*/
$mrModel = $tester->loadModel('mr');
$repoID = 0;
$result = $mrModel->getLastReviewInfo($repoID);
if(empty($result)) $result = 'return null';
r($result) && p() && e('return null'); //使用空的repoID
$repo = $tester->dao->select('*')->from(TABLE_REPO)->orderBy('id_desc')->limit(1)->fetch();
$result = $mrModel->getLastReviewInfo($repo->id);
if(isset($result->bug) and isset($result->task)) $result = 'return normal';
r($result) && p() && e('return normal'); //使用正确的repoID
test/model/mr/getreview.php
+41
View File
@@ -0,0 +1,41 @@
#!/usr/bin/env php
<?php
include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
/**
title=测试 mrModel::getReview();
cid=1
pid=1
使用空的repoID, MRID, revision >> return null
使用正确的repoID, MRID >> return normal
使用正确的repoID, MRID, 错误的revision >> return null
*/
$mrModel = $tester->loadModel('mr');
$repoID = 0;
$MRID = 0;
$revision = '';
$result = $mrModel->getReview($repoID, $MRID, $revision);
if(empty($result)) $result = 'return null';
r($result) && p() && e('return null'); //使用空的repoID, MRID, revision
$MR = $tester->dao->select('*')->from(TABLE_MR)->orderBy('id_desc')->limit(1)->fetch();
$repoID = $MR->repoID;
$MRID = $MR->id;
$result = $mrModel->getReview($repoID, $MRID, $revision);
if(!empty($result))
{
$first = reset($result);
if(isset($first['bug']) or isset($first['task'])) $result = 'return normal';
}
r($result) && p() && e('return normal'); //使用正确的repoID, MRID
$revision = '123qwe';
$result = $mrModel->getReview($repoID, $MRID, $revision);
if(empty($result)) $result = 'return null';
r($result) && p() && e('return null'); //使用正确的repoID, MRID, 错误的revision
test/model/mr/savebug.php
+44
View File
@@ -0,0 +1,44 @@
#!/usr/bin/env php
<?php
include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
/**
title=测试 mrModel::saveBug();
cid=1
pid=1
使用空的repoID, MRID >> return false
使用正确的repoID, MRID。空的title。 >> return false
使用正确的repoID, MRID。POST数据正确。 >> Test Bug Review
*/
$mrModel = $tester->loadModel('mr');
$_POST = array();
$_POST['title'] = 'Test Bug Review';
$_POST['commentText'] = 'Test Bug Review';
$_POST['module'] = '1';
$_POST['begin'] = '8';
$_POST['end'] = '8';
$_POST['product'] = '1';
$_POST['assignedTo'] = '';
$repoID = 0;
$MRID = 0;
$v1 = 0;
$v2 = '';
$result = $mrModel->saveBug($repoID, $MRID, $v1, $v2);
if($result['result'] == 'fail' and isset($result['message']['mr']) and isset($result['message']['repo'])) $result = 'return false';
r($result) && p() && e('return false'); //使用空的repoID, MRID
$_POST['title'] = '';
$MR = $tester->dao->select('*')->from(TABLE_MR)->orderBy('id_desc')->limit(1)->fetch();
$result = $mrModel->saveBug($MR->repoID, $MR->id, $v1, $v2);
if($result['result'] == 'fail' and isset($result['message']['title'])) $result = 'return false';
r($result) && p() && e('return false'); //使用正确的repoID, MRID。空的title。
$_POST['title'] = 'Test Bug Review';
$result = $mrModel->saveBug($MR->repoID, $MR->id, $v1, $v2);
r($result) && p('title') && e('Test Bug Review'); //使用正确的repoID, MRID。POST数据正确。
test/model/mr/savetask.php
+45
View File
@@ -0,0 +1,45 @@
#!/usr/bin/env php
<?php
include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
/**
title=测试 mrModel::saveTask();
cid=1
pid=1
使用空的repoID, MRID >> return false
使用正确的repoID, MRID。空的title。 >> return false
使用正确的repoID, MRID。POST数据正确。 >> Test Task Review
*/
$mrModel = $tester->loadModel('mr');
$_POST = array();
$_POST['title'] = 'Test Task Review';
$_POST['commentText'] = 'Test Task Review';
$_POST['taskModule'] = '1';
$_POST['taskExecution'] = '1';
$_POST['begin'] = '8';
$_POST['end'] = '8';
$_POST['taskAssignedTo'] = '';
$_POST['entry'] = '';
$repoID = 0;
$MRID = 0;
$v1 = 0;
$v2 = '';
$result = $mrModel->saveTask($repoID, $MRID, $v1, $v2);
if($result['result'] == 'fail' and isset($result['message']['mr']) and isset($result['message']['repo'])) $result = 'return false';
r($result) && p() && e('return false'); //使用空的repoID, MRID
$_POST['title'] = '';
$MR = $tester->dao->select('*')->from(TABLE_MR)->orderBy('id_desc')->limit(1)->fetch();
$result = $mrModel->saveTask($MR->repoID, $MR->id, $v1, $v2);
if($result['result'] == 'fail' and isset($result['message']['name'])) $result = 'return false';
r($result) && p() && e('return false'); //使用正确的repoID, MRID。空的title。
$_POST['title'] = 'Test Task Review';
$result = $mrModel->saveTask($MR->repoID, $MR->id, $v1, $v2);
r($result) && p('title') && e('Test Task Review'); //使用正确的repoID, MRID。POST数据正确。