diff --git a/framework/base/helper.class.php b/framework/base/helper.class.php index 01abfd7f3e..4e7958ecf2 100644 --- a/framework/base/helper.class.php +++ b/framework/base/helper.class.php @@ -843,7 +843,7 @@ function getWebRoot($full = false) /** * 当数组/对象变量$var存在$key项时，返回存在的对应值或设定值，否则返回$key或不存在的设定值。 - * When the $var has the $key, return it, esle result one default value. + * When there is a $key in the array/object $var, it returns it or $valueWhenExists, otherwise returns $key or $valueWhenNone. * * @param array|object $var * @param string|int $key diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php index b4f29cc6d7..7b3c455158 100644 --- a/lib/scm/gitlab.class.php +++ b/lib/scm/gitlab.class.php @@ -518,7 +518,8 @@ class gitlab if(!scm::checkRevision($version)) return array(); $api = "commits"; - if(empty($count)) $count = 100; + /* TODO Put getCommits into cron job. And check best size of $count. */ + if(empty($count)) $count = 1; $params = array(); $params['ref_name'] = $branch; diff --git a/module/block/view/executionblock.html.php b/module/block/view/executionblock.html.php index 90872be781..b02dc4080e 100644 --- a/module/block/view/executionblock.html.php +++ b/module/block/view/executionblock.html.php @@ -57,8 +57,8 @@ hours->totalLeft . $lang->execution->workHourUnit;?> -
-
hours->progress;?>
+
+
hours->progress);?>
diff --git a/module/block/view/scrumlistblock.html.php b/module/block/view/scrumlistblock.html.php index aaa9cd6499..0a0e911379 100644 --- a/module/block/view/scrumlistblock.html.php +++ b/module/block/view/scrumlistblock.html.php @@ -57,8 +57,8 @@ hours->totalLeft . $lang->execution->workHourUnit;?> -
-
hours->progress;?>
+
+
hours->progress);?>
diff --git a/module/bug/lang/de.php b/module/bug/lang/de.php index 045b983582..d93bd7ddf6 100644 --- a/module/bug/lang/de.php +++ b/module/bug/lang/de.php @@ -79,7 +79,7 @@ $lang->bug->lastEditedDate = 'Bearbeitet am'; $lang->bug->fromCase = 'Von Fall'; $lang->bug->toCase = 'Zu Fall'; $lang->bug->colorTag = 'Farb Tag'; -$lang->bug->repairRate = 'Repair Rate'; +$lang->bug->fixedRate = 'Fixed Rate'; /* 方法列表。*/ $lang->bug->index = 'Home'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index 05d1def113..060cfb07c5 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -24,7 +24,6 @@ $lang->bug->storyVersion = 'Story Version'; $lang->bug->color = 'Color'; $lang->bug->task = 'Task'; $lang->bug->title = 'Title'; -$lang->bug->sync2gitlab = 'Sync gitlab'; $lang->bug->severity = 'Severity'; $lang->bug->severityAB = 'S'; $lang->bug->pri = 'Priority'; @@ -80,7 +79,7 @@ $lang->bug->lastEditedDate = 'EditedDate'; $lang->bug->fromCase = 'From Case'; $lang->bug->toCase = 'To Case'; $lang->bug->colorTag = 'Color'; -$lang->bug->repairRate = 'Repair Rate'; +$lang->bug->fixedRate = 'Fixed Rate'; /* Method list. */ $lang->bug->index = 'Bug Home'; diff --git a/module/bug/lang/fr.php b/module/bug/lang/fr.php index 413efae0a8..2eed200247 100644 --- a/module/bug/lang/fr.php +++ b/module/bug/lang/fr.php @@ -79,7 +79,7 @@ $lang->bug->lastEditedDate = 'Date Modif'; $lang->bug->fromCase = 'du CasTest'; $lang->bug->toCase = 'vers CasTest'; $lang->bug->colorTag = 'Couleur'; -$lang->bug->repairRate = 'Repair Rate'; +$lang->bug->fixedRate = 'Repair Rate'; /* 方法列表。*/ $lang->bug->index = 'Accueil Bug'; diff --git a/module/bug/lang/vi.php b/module/bug/lang/vi.php index 0ac08693a6..9572429a46 100644 --- a/module/bug/lang/vi.php +++ b/module/bug/lang/vi.php @@ -79,7 +79,7 @@ $lang->bug->lastEditedDate = 'Ngày sửa'; $lang->bug->fromCase = 'Từ tình huống'; $lang->bug->toCase = 'Tới tình huống'; $lang->bug->colorTag = 'Màu'; -$lang->bug->repairRate = 'Repair Rate'; +$lang->bug->fixedRate = 'Repair Rate'; /* Method list. */ $lang->bug->index = 'Trang Bug'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 6ac50fa6e2..9fc57d6499 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -24,7 +24,6 @@ $lang->bug->storyVersion = "{$lang->SRCommon}版本"; $lang->bug->color = '标题颜色'; $lang->bug->task = '相关任务'; $lang->bug->title = 'Bug标题'; -$lang->bug->sync2gitlab = '同步gitlab'; $lang->bug->severity = '严重程度'; $lang->bug->severityAB = '级别'; $lang->bug->pri = '优先级'; @@ -80,7 +79,7 @@ $lang->bug->lastEditedDate = '修改日期'; $lang->bug->fromCase = '来源用例'; $lang->bug->toCase = '生成用例'; $lang->bug->colorTag = '颜色标签'; -$lang->bug->repairRate = '修复率'; +$lang->bug->fixedRate = '修复率'; /* 方法列表。*/ $lang->bug->index = '首页'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 813293bb93..dd990ef9b6 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -24,7 +24,6 @@ $lang->bug->storyVersion = "{$lang->SRCommon}版本"; $lang->bug->color = '標題顏色'; $lang->bug->task = '相關任務'; $lang->bug->title = 'Bug標題'; -$lang->bug->sync2gitlab = '同步gitlab'; $lang->bug->severity = '嚴重程度'; $lang->bug->severityAB = '級別'; $lang->bug->pri = '優先順序'; diff --git a/module/ci/model.php b/module/ci/model.php index c822096ea7..2af08d66f9 100644 --- a/module/ci/model.php +++ b/module/ci/model.php @@ -140,7 +140,7 @@ class ciModel extends model if(empty($job->duration) or $job->duration == '') $job->duration = '-'; $data->logs = ">>> Job: $job->name, Stage: $job->stage, Status: $job->status, Duration: $job->duration Sec\r\n "; $data->logs .= "Job URL: web_url\" target='_blank'>$job->web_url \r\n"; - $data->logs .= $this->transformAnsiToHtml($this->loadModel('gitlab')->apiGetJobLog($compile->server, $compile->pipeline, $job->id)); + $data->logs .= $this->transformAnsiToHtml($this->gitlab->apiGetJobLog($compile->server, $compile->pipeline, $job->id)); } $this->dao->update(TABLE_COMPILE)->data($data)->where('id')->eq($compile->id)->exec(); diff --git a/module/common/view/markdown.html.php b/module/common/view/markdown.html.php index e1fa1cf7d3..0ce9b70198 100644 --- a/module/common/view/markdown.html.php +++ b/module/common/view/markdown.html.php @@ -10,8 +10,6 @@ $editor['id'] = explode(',', $editor['id']);