From 5e8bf5f6f625dd7cf7d799bbfcde3e5d87783536 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Fri, 16 Jul 2021 13:36:07 +0800 Subject: [PATCH] * Adjust code. --- module/bug/config.php | 6 +++--- module/bug/model.php | 18 +++++++++--------- module/custom/view/header.html.php | 3 +-- module/install/lang/de.php | 4 ++-- module/install/lang/en.php | 4 ++-- module/install/lang/fr.php | 4 ++-- module/install/lang/vi.php | 4 ++-- module/install/lang/zh-cn.php | 12 ++++++------ module/install/lang/zh-tw.php | 12 ++++++------ module/story/lang/en.php | 2 ++ 10 files changed, 35 insertions(+), 34 deletions(-) diff --git a/module/bug/config.php b/module/bug/config.php index 434a2e1f85..82b51996f6 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -4,9 +4,9 @@ $config->bug->batchCreate = 10; $config->bug->longlife = 7; $config->bug->removeFields = 'objectTypeList,productList,executionList,gitlabID,gitlabProjectID'; -$config->bug->create = new stdclass(); -$config->bug->edit = new stdclass(); -$config->bug->resolve = new stdclass(); +$config->bug->create = new stdclass(); +$config->bug->edit = new stdclass(); +$config->bug->resolve = new stdclass(); $config->bug->create->requiredFields = 'title,openedBuild'; $config->bug->edit->requiredFields = $config->bug->create->requiredFields; $config->bug->resolve->requiredFields = 'resolution'; diff --git a/module/bug/model.php b/module/bug/model.php index 04176bfd6b..e5a77fda2b 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -88,7 +88,7 @@ class bugModel extends model if(!dao::isError()) { $bugID = $this->dao->lastInsertID(); - + $this->loadModel('gitlab')->apiCreateIssue($this->post->gitlab, $this->post->gitlabProject, 'bug', $bugID, $bug); $this->file->updateObjectID($this->post->uid, $bugID, 'bug'); @@ -278,9 +278,9 @@ class bugModel extends model /** * Create bug from gitlab issue. - * - * @param object $bug - * @param int $executionID + * + * @param object $bug + * @param int $executionID * @access public * @return int|bool */ @@ -675,7 +675,7 @@ class bugModel extends model if(!empty($bug->resolvedBy)) $this->loadModel('score')->create('bug', 'resolve', $bugID); $this->file->updateObjectID($this->post->uid, $bugID, 'bug'); - if(!empty($bug)) + if(!empty($bug)) { $this->loadModel('gitlab'); $relation = $this->gitlab->getRelationByObject('bug', $bugID); @@ -862,7 +862,7 @@ class bugModel extends model $this->loadModel('gitlab'); foreach($activateBugs as $bugID => $bug) { - if(!empty($bug)) + if(!empty($bug)) { $relation = $this->gitlab->getRelationByObject('bug', $bugID); if($relation) $this->gitlab->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'bug', (Object)$bug, $bugID); @@ -904,7 +904,7 @@ class bugModel extends model $this->loadModel('gitlab'); $relation = $this->gitlab->getRelationByObject('bug', $bugID); - $bug = $this->getById($bugID); // get full bug object to update issue. + $bug = $this->getById($bugID); // Get full bug object to update issue. $bug->assignee_id = $this->gitlab->getGitlabUserID($relation->gitlabID, $bug->assignedTo); if($bug->assignee_id != '') { @@ -967,7 +967,7 @@ class bugModel extends model $bug->lastEditedDate = $now; $bug->confirmed = 1; - if(!empty($bug)) + if(!empty($bug)) { $relation = $this->gitlab->getRelationByObject('bug', $bugID); if($relation) $this->gitlab->apiUpdateIssue($relation->gitlabID, $relation->projectID, $relation->issueID, 'bug', $bug, $bugID); @@ -1259,7 +1259,7 @@ class bugModel extends model } } - if(!empty($bug)) + if(!empty($bug)) { $this->loadModel('gitlab'); $relation = $this->gitlab->getRelationByObject('bug', $bugID); diff --git a/module/custom/view/header.html.php b/module/custom/view/header.html.php index 70f9f5cd1a..7236d5db5b 100644 --- a/module/custom/view/header.html.php +++ b/module/custom/view/header.html.php @@ -15,9 +15,8 @@ if($sysObject == 'required') continue; common::printLink('custom', $sysObject, "", "{$lang->custom->$sysObject}", '', "class='btn btn-link' id='{$sysObject}Tab'"); } - - common::printLink('custom', 'mode', "", "{$lang->custom->mode}", '', "class='btn btn-link' id='modeTab'"); + common::printLink('custom', 'mode', "", "{$lang->custom->mode}", '', "class='btn btn-link' id='modeTab'"); ?> diff --git a/module/install/lang/de.php b/module/install/lang/de.php index 661701158c..d63b412ba7 100644 --- a/module/install/lang/de.php +++ b/module/install/lang/de.php @@ -129,8 +129,8 @@ $lang->install->account = 'Admin Konto'; $lang->install->password = 'Admin Passwort'; $lang->install->errorEmptyPassword = 'Passwort sollte nicht leer sein.'; -$lang->install->selectedMode = 'Selection mode'; -$lang->install->selectedModeTips = 'You can go to the Admin - Custom - Mode to set it later.'; +$lang->install->selectedMode = 'Selection mode'; +$lang->install->selectedModeTips = 'You can go to the Admin - Custom - Mode to set it later.'; $lang->install->groupList['ADMIN']['name'] = 'Admin'; $lang->install->groupList['ADMIN']['desc'] = 'System Administrator'; diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 7847465d33..f67e56ee8d 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -129,8 +129,8 @@ $lang->install->account = 'Admin Account'; $lang->install->password = 'Admin Password'; $lang->install->errorEmptyPassword = 'Password should not be blank.'; -$lang->install->selectedMode = 'Selection mode'; -$lang->install->selectedModeTips = 'You can go to the Admin - Custom - Mode to set it later.'; +$lang->install->selectedMode = 'Selection mode'; +$lang->install->selectedModeTips = 'You can go to the Admin - Custom - Mode to set it later.'; $lang->install->groupList['ADMIN']['name'] = 'Admin'; $lang->install->groupList['ADMIN']['desc'] = 'System Admin'; diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php index 99343022ba..a34a55fd4b 100644 --- a/module/install/lang/fr.php +++ b/module/install/lang/fr.php @@ -129,8 +129,8 @@ $lang->install->account = 'Compte Admin'; $lang->install->password = 'Mot de Passe Admin'; $lang->install->errorEmptyPassword = 'Password ne doit pas être vide.'; -$lang->install->selectedMode = 'Selection mode'; -$lang->install->selectedModeTips = 'You can go to the Admin - Custom - Mode to set it later.'; +$lang->install->selectedMode = 'Selection mode'; +$lang->install->selectedModeTips = 'You can go to the Admin - Custom - Mode to set it later.'; $lang->install->groupList['ADMIN']['name'] = 'Admin'; $lang->install->groupList['ADMIN']['desc'] = 'Administrateur'; diff --git a/module/install/lang/vi.php b/module/install/lang/vi.php index 2c97b3f9f0..09f0dfbad9 100644 --- a/module/install/lang/vi.php +++ b/module/install/lang/vi.php @@ -129,8 +129,8 @@ $lang->install->account = 'Tài khoản quản trị'; $lang->install->password = 'Mật khẩu quản trị'; $lang->install->errorEmptyPassword = 'Mật khẩu không nên là blank.'; -$lang->install->selectedMode = 'Selection mode'; -$lang->install->selectedModeTips = 'You can go to the Admin - Custom - Mode to set it later.'; +$lang->install->selectedMode = 'Selection mode'; +$lang->install->selectedModeTips = 'You can go to the Admin - Custom - Mode to set it later.'; $lang->install->groupList['ADMIN']['name'] = 'Quản trị'; $lang->install->groupList['ADMIN']['desc'] = 'Quản trị hệ thống'; diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 565826e857..279acc65ad 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -123,14 +123,14 @@ $lang->install->save2File = '
拷贝上 $lang->install->saved2File = '配置信息已经成功保存到" %s "中。您后面还可继续修改此文件。'; $lang->install->errorNotSaveConfig = '还没有保存配置文件'; -$lang->install->getPriv = '设置帐号'; -$lang->install->company = '公司名称'; -$lang->install->account = '管理员帐号'; -$lang->install->password = '管理员密码'; +$lang->install->getPriv = '设置帐号'; +$lang->install->company = '公司名称'; +$lang->install->account = '管理员帐号'; +$lang->install->password = '管理员密码'; $lang->install->errorEmptyPassword = '密码不能为空'; -$lang->install->selectedMode = '选择模式'; -$lang->install->selectedModeTips = '后续您还可以去后台-自定义-模式中进行调整'; +$lang->install->selectedMode = '选择模式'; +$lang->install->selectedModeTips = '后续您还可以去后台-自定义-模式中进行调整'; $lang->install->groupList['ADMIN']['name'] = '管理员'; $lang->install->groupList['ADMIN']['desc'] = '系统管理员'; diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php index 0cae501a06..8557b9922f 100644 --- a/module/install/lang/zh-tw.php +++ b/module/install/lang/zh-tw.php @@ -123,14 +123,14 @@ $lang->install->save2File = '
拷貝上 $lang->install->saved2File = '配置信息已經成功保存到" %s "中。您後面還可繼續修改此檔案。'; $lang->install->errorNotSaveConfig = '還沒有保存配置檔案'; -$lang->install->getPriv = '設置帳號'; -$lang->install->company = '公司名稱'; -$lang->install->account = '管理員帳號'; -$lang->install->password = '管理員密碼'; +$lang->install->getPriv = '設置帳號'; +$lang->install->company = '公司名稱'; +$lang->install->account = '管理員帳號'; +$lang->install->password = '管理員密碼'; $lang->install->errorEmptyPassword = '密碼不能為空'; -$lang->install->selectedMode = '選擇模式'; -$lang->install->selectedModeTips = '後續您還可以去後臺-自定義-模式中進行調整'; +$lang->install->selectedMode = '選擇模式'; +$lang->install->selectedModeTips = '後續您還可以去後臺-自定義-模式中進行調整'; $lang->install->groupList['ADMIN']['name'] = '管理員'; $lang->install->groupList['ADMIN']['desc'] = '系統管理員'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 032cda7943..f61795c60d 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -406,3 +406,5 @@ $lang->story->categoryList['safe'] = 'Safe'; $lang->story->categoryList['experience'] = 'Experience'; $lang->story->categoryList['improve'] = 'Improve'; $lang->story->categoryList['other'] = 'Other'; + +$lang->story->sync2Gitlab = 'Mit Gitlab synchronisieren';