From b13b635102a3d5a52d14b3419b72a81c14580d01 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 21 Apr 2021 09:35:48 +0800 Subject: [PATCH 1/7] * Fix error. --- module/custom/lang/de.php | 2 +- module/custom/lang/en.php | 2 +- module/custom/lang/fr.php | 2 +- module/custom/lang/vi.php | 2 +- module/custom/lang/zh-cn.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 408511bd8b..1cdf6d058a 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "One {$lang->hourCommon}"; $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first"; if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index c503045d1c..55ed40f1fd 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "One {$lang->hourCommon}"; $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first"; if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 6f7ef9f418..8e44c229c8 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "One {$lang->hourCommon}"; $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first"; if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index cf9b0cbf18..58232273fe 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "One {$lang->hourCommon}"; $lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first"; if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index ef5ab02d70..b6a783ee18 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -48,7 +48,7 @@ $lang->custom->oneUnit = "一个{$lang->hourCommon}"; $lang->custom->convertRelationTitle = "请先设置{$lang->hourCommon}转换为%s的换算系数"; if($config->systemMode == 'new') $lang->custom->execution = '执行'; -if($config->systemMode == 'classic') $lang->custom->execution = $lang->executionCommon; +if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; $lang->custom->unitList['efficiency'] = '工时/'; $lang->custom->unitList['manhour'] = '人时/'; From 8f5359eba4990e955d5c76c8bd95bf9a7c6c71ea Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 21 Apr 2021 10:27:33 +0800 Subject: [PATCH 2/7] * Fix bug #12096. --- module/tree/control.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/tree/control.php b/module/tree/control.php index ea7e48d692..214b4c6bdd 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -395,7 +395,9 @@ class tree extends control if($confirm == 'no') { $module = $this->tree->getByID($moduleID); - $confirmLang = $module->type == 'line' ? $this->lang->tree->confirmDeleteLine : $this->lang->tree->confirmDelete; + $confirmLang = $this->lang->tree->confirmDelete; + if($module->type == 'line') $confirmLang = $this->lang->tree->confirmDeleteLine; + if($module->type == 'host') $confirmLang = $this->lang->tree->confirmDeleteHost; die(js::confirm($confirmLang, $this->createLink('tree', 'delete', "rootID=$rootID&moduleID=$moduleID&confirm=yes"))); } else From ae9fc5a1e8b86e838b42b7d4163c05797706b4f4 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 21 Apr 2021 10:56:54 +0800 Subject: [PATCH 3/7] * Fix bug #12228. --- module/task/css/create.css | 2 +- module/task/js/create.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/css/create.css b/module/task/css/create.css index b9fc9218b2..8df0054d67 100644 --- a/module/task/css/create.css +++ b/module/task/css/create.css @@ -2,7 +2,7 @@ .title-group.required:after {display: none;} .title-group.required > .required:after {display: block; right: 29px; top: 5px;} -#copyStory-input:after {display: block; right: 85px; top: 5px;} +#copyStory-input:after {display: block; right: 110px; top: 5px;} #pri + .chosen-container > .chosen-single {border-top-left-radius: 0 !important; border-bottom-left-radius: 0 !important;} .pri-selector > .btn {padding: 5px 8px !important; width: 100%;} diff --git a/module/task/js/create.js b/module/task/js/create.js index e8f48c8011..e955040ec2 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -191,7 +191,7 @@ function setPreview() $('#preview a').attr('href', storyLink); $('#copyButton').removeClass('hidden'); $('.title-group.required > div').attr('id', 'copyStory-input').removeClass('.required'); - $('div.colorpicker').css('right', '90px');//Adjust for task #4151; + $('div.colorpicker').css('right', '80px');//Adjust for task #4151; $('#copyButton').css('width', '80px'); } From 23ebc8f532e4103b86d43e9145fb28720e63494c Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 21 Apr 2021 11:00:42 +0800 Subject: [PATCH 4/7] * Fix bug #12125. --- module/task/js/create.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/task/js/create.js b/module/task/js/create.js index e8f48c8011..8a5a6282f9 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -186,7 +186,9 @@ function setPreview() { storyLink = createLink('story', 'view', "storyID=" + $('#story').val()); var concat = config.requestType != 'GET' ? '?' : '&'; - storyLink = storyLink + concat + 'onlybody=yes'; + + if(storyLink.indexOf("onlybody=yes") < 0) storyLink = storyLink + concat + 'onlybody=yes'; + $('#preview').removeClass('hidden'); $('#preview a').attr('href', storyLink); $('#copyButton').removeClass('hidden'); From 03b63387a2b96e4107cac0988a5373252c019ecb Mon Sep 17 00:00:00 2001 From: hufangzhou <746775970@qq.com> Date: Wed, 21 Apr 2021 13:42:17 +0800 Subject: [PATCH 5/7] * Adjust the code. --- module/doc/view/editlib.html.php | 2 +- module/testcase/view/view.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index f4ccade44e..49361eb4b7 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -43,7 +43,7 @@ doclib->control;?> - type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom' )):?> + type == 'product' or $lib->type == 'execution' or ($config->systemMode == 'classic' and $lib->type != 'custom')):?> doclib->aclListA, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'")?> doc->noticeAcl['lib'][$lib->type][$lib->acl];?> diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index a1a52b671d..b41eddcb55 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -177,7 +177,7 @@ foreach($modulePath as $key => $module) { - if($this->app->openApp == 'qa') + if($this->app->openApp == 'qa' || $this->app->openApp == 'ops') { if($isLibCase) { From e692b32d552bee6d64b5008199f7b7b5e7821cfe Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Wed, 21 Apr 2021 14:10:21 +0800 Subject: [PATCH 6/7] * Fix bug #12234. --- module/product/view/all.html.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 0806072497..82868a70a3 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -80,7 +80,7 @@ $line):?> config->systemMode == 'new') + if($this->config->systemMode == 'new' and $programID) { $trAttrs = "data-id='line.$lineID' data-parent='program.$programID'"; $trClass .= ' is-nest-child table-nest'; @@ -110,9 +110,11 @@ $trClass = ''; if($product->line) { + $path = "$product->line,$product->id"; + if($this->config->systemMode == 'new' and $product->program) $path = "$product->program,$path"; $trAttrs = "data-id='$product->id' data-parent='line.$product->line'"; $trClass .= ' is-nest-child table-nest'; - $trAttrs .= " data-nest-parent='line.$product->line' data-nest-path='line.$product->program,$product->line,$product->id'"; + $trAttrs .= " data-nest-parent='line.$product->line' data-nest-path='line.{$path}'"; } elseif($product->program) { From c2e986dfac5011858408ef3a13a3f3a5a685be08 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 21 Apr 2021 14:13:49 +0800 Subject: [PATCH 7/7] * Fix bug #12121. --- module/testcase/view/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php index a1a52b671d..1ea15ba7a7 100644 --- a/module/testcase/view/view.html.php +++ b/module/testcase/view/view.html.php @@ -128,7 +128,7 @@ buildOperateMenu($case, 'view');?> id", $case, 'button', '', '', 'showinonlybody'); + if(!isonlybody()) common::printIcon('testcase', 'edit',"caseID=$case->id", $case, 'button', '', '', 'showinonlybody'); if(!$isLibCase and $case->auto != 'unit') common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$case->id", $case, 'button', 'copy'); if($isLibCase and common::hasPriv('caselib', 'createCase')) echo html::a($this->createLink('caselib', 'createCase', "libID=$case->lib&moduleID=$case->module¶m=$case->id", $case), "", '', "class='btn' title='{$lang->testcase->copy}'"); common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin', '');