diff --git a/module/api/js/common.js b/module/api/js/common.js index aeadb561a4..42576d9c0c 100644 --- a/module/api/js/common.js +++ b/module/api/js/common.js @@ -8,6 +8,7 @@ function loadDocModule(libID) $('#module').chosen(); }); } + /** * Toggle acl. * @@ -18,7 +19,6 @@ function loadDocModule(libID) */ function toggleAcl(acl, type) { - console.log(noticeAcl, acl); if(acl == 'custom') { $('#whiteListBox').removeClass('hidden'); @@ -141,12 +141,7 @@ $(document).ready(function() }; /* default options. */ - SplitRow.DEFAULTS = - { - spliter: '
', - smallSize: 700, - middleSize: 850 - }; + SplitRow.DEFAULTS = { spliter: '
', smallSize: 700, middleSize: 850 }; /* Extense jquery element. */ $.fn.splitRow = function(option) @@ -218,7 +213,7 @@ try { }, methods: { add() { - this.$emit('add', this.value.sub) + this.$emit('add', this.value) }, del() { this.$emit('del') @@ -401,7 +396,8 @@ try { }, add(data, sub) { const field = this.getInitField(); - field.sub = sub; + field.sub = sub.sub; + field.parentKey = sub.parentKey; data.push({...field}); }, del(data, index) { diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index 12dc4b85fb..fbcbf7aa1a 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -183,6 +183,7 @@ $lang->bug->legendComment = '备注'; $lang->bug->legendLife = 'Bug的一生'; $lang->bug->legendMisc = '其他相关'; $lang->bug->legendRelated = '其他信息'; +$lang->bug->legendThisWeekCreated = '本周新增'; /* 功能按钮。*/ $lang->bug->buttonConfirm = '确认'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 608bfe8a11..1584f48ac4 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -104,6 +104,7 @@ $lang->customMenu = '自定义导航'; $lang->customField = '自定义表单项'; $lang->lineNumber = '行号'; $lang->tutorialConfirm = '检测到你尚未退出新手教程模式,是否现在退出?'; +$lang->levelExceeded = '层级已超过显示范围,更多信息请前往网页端查看或者是通过搜索方式查看。'; $lang->preShortcutKey = '[快捷键:←]'; $lang->nextShortcutKey = '[快捷键:→]'; diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php index 3e609f0569..4c4b5436eb 100644 --- a/module/execution/lang/zh-cn.php +++ b/module/execution/lang/zh-cn.php @@ -101,6 +101,7 @@ $lang->execution->copyNoExecution = '没有可用的' . $lang->executionCommon . $lang->execution->noTeam = '暂时没有团队成员'; $lang->execution->or = '或'; $lang->execution->selectProject = '请选择项目'; +$lang->execution->unfoldClosed = '展开已结束'; /* Fields of zt_team. */ $lang->execution->root = '源ID'; diff --git a/module/mr/model.php b/module/mr/model.php index e4e0e2931c..e7e185cd8b 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -207,9 +207,9 @@ class mrModel extends model if($optionType == 'userPairs') { $gitlabUserID = ''; - if(isset($rawMR->{$field}[0])) + if(isset(($rawMR->$field)[0])) { - $gitlabUserID = $rawMR->{$field}[0]->$options; + $gitlabUserID = ($rawMR->$field)[0]->$options; } $value = zget($gitlabUsers, $gitlabUserID, ''); } @@ -258,9 +258,9 @@ class mrModel extends model if($optionType == 'userPairs') { $gitlabUserID = ''; - if(isset($rawMR->{$field}[0])) + if(isset(($rawMR->$field)[0])) { - $gitlabUserID = $rawMR->{$field}[0]->$options; + $gitlabUserID = ($rawMR->$field)[0]->$options; } $value = zget($gitlabUsers, $gitlabUserID, ''); } diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 88868671a0..d693e6f335 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -55,6 +55,7 @@ $lang->product->project = $lang->executionCommon . '列表'; $lang->product->build = '版本列表'; $lang->product->moreProduct = "更多产品"; $lang->product->projectInfo = "所有与此产品关联的项目"; +$lang->product->progress = "产品完成度"; $lang->product->currentExecution = "当前执行"; $lang->product->activeStories = "激活{$lang->SRCommon}"; @@ -77,6 +78,7 @@ $lang->product->assignToNullBugs = '未指派Bug'; $lang->product->assignToNullBugsTitle = '未指派Bug'; $lang->product->closedBugs = '关闭Bug'; $lang->product->bugFixedRate = 'Bug修复率'; +$lang->product->unfoldClosed = '展开已关闭'; $lang->product->confirmDelete = " 您确定删除该{$lang->productCommon}吗?"; $lang->product->errorNoProduct = "还没有创建{$lang->productCommon}!"; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 055299fde0..566d2b28f3 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -37,9 +37,11 @@ $lang->testtask->next = '下一个'; $lang->testtask->start = "开始"; $lang->testtask->close = "关闭"; $lang->testtask->wait = "待测测试单"; +$lang->testtask->waitAB = "待测试"; $lang->testtask->block = "阻塞"; $lang->testtask->activate = "激活"; $lang->testtask->testing = "测试中测试单"; +$lang->testtask->testingAB = "测试中"; $lang->testtask->blocked = "被阻塞测试单"; $lang->testtask->done = "已测测试单"; $lang->testtask->totalStatus = "全部";