From 1364c7923b1b5cf8d91b2ef0f478e1afb0880420 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 8 Mar 2023 16:41:51 +0800 Subject: [PATCH 1/5] * Fix bug #28114. --- module/product/control.php | 2 +- module/product/js/create.js | 4 ++-- module/product/js/edit.js | 4 ++-- module/product/view/edit.html.php | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/product/control.php b/module/product/control.php index ad41bc1d3e..f112722ee9 100755 --- a/module/product/control.php +++ b/module/product/control.php @@ -1096,7 +1096,7 @@ class product extends control if(empty($productID) or $programID) $lines = $this->product->getLinePairs($programID); if($productID) return print(html::select("lines[$productID]", array('' => '') + $lines, '', "class='form-control picker-select'")); - if(!$productID) return print(html::select('line', array('' => '') + $lines, '', "class='form-control chosen'")); + if(!$productID) return print(html::select('line', array('' => '') + $lines, '', "class='form-control picker-select'")); } /** diff --git a/module/product/js/create.js b/module/product/js/create.js index f44249c54f..548053f0ae 100644 --- a/module/product/js/create.js +++ b/module/product/js/create.js @@ -40,9 +40,9 @@ $('#program').change(function() $.get(createLink('product', 'ajaxGetLine', 'programID=' + programID), function(data) { - $('#line_chosen').remove(); $('#line').replaceWith(data); - $('#line').chosen(); + $('#line').siblings('.picker').remove(); + $('#line').picker(); }) }) diff --git a/module/product/js/edit.js b/module/product/js/edit.js index a62f015281..78c8f46ed5 100644 --- a/module/product/js/edit.js +++ b/module/product/js/edit.js @@ -10,8 +10,8 @@ $('#program').change(function() $.get(createLink('product', 'ajaxGetLine', 'programID=' + programID), function(data) { - $('#line_chosen').remove(); $('#line').replaceWith(data); - $('#line').chosen(); + $('#line').siblings('.picker').remove(); + $('#line').picker(); }) }); diff --git a/module/product/view/edit.html.php b/module/product/view/edit.html.php index 69ae505779..ac976603a5 100644 --- a/module/product/view/edit.html.php +++ b/module/product/view/edit.html.php @@ -40,7 +40,7 @@ product->line;?> - line, "class='form-control chosen'");?> + line, "class='form-control picker-select'");?> From beaa4768b1dd7d59d05affaddb1f36f8070f3d90 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 8 Mar 2023 17:06:31 +0800 Subject: [PATCH 2/5] * Fix bug #28726. --- module/productplan/view/view.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index 7f5f527c0b..f5d67eff0b 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -102,7 +102,7 @@ -
id&orderBy=$orderBy");?>"> + ' data-ride="" method='post' target='hiddenwin' action="id&orderBy=$orderBy");?>"> - id&orderBy=$orderBy");?>"> + ' data-ride='table' method='post' target='hiddenwin' action="id&orderBy=$orderBy");?>">
Date: Wed, 8 Mar 2023 17:09:27 +0800 Subject: [PATCH 3/5] * Code for bug #28726. --- module/build/view/view.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 7c8103e77c..8ae0e72f7e 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -74,7 +74,7 @@ tbody tr td:first-child input {display: none;}
id, \"story\")", ' ' . $lang->build->linkStory, '', "class='btn btn-primary'");?>
- id}")?>' id='linkedStoriesForm'> + ' data-ride='table' method='post' target='hiddenwin' action='createLink($module, 'batchUnlinkStory', "buildID={$build->id}")?>' id='linkedStoriesForm'>
id}&type=story&link=$link¶m=$param&orderBy=%s";?> @@ -192,7 +192,7 @@ tbody tr td:first-child input {display: none;}
id, \"bug\")", ' ' . $lang->build->linkBug, '', "class='btn btn-primary'");?>
- id");?>" id='linkedBugsForm'> + ' data-ride='table' method='post' target='hiddenwin' action="createLink($module, 'batchUnlinkBug', "build=$build->id");?>" id='linkedBugsForm'>
id}&type=bug&link=$link¶m=$param&orderBy=%s";?> From 7e5fc5ade442b361cbd0af2938a41a10abc06406 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 8 Mar 2023 17:11:44 +0800 Subject: [PATCH 4/5] * Code for bug #28726. --- module/release/view/view.html.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index cf7abb2bc2..e0e24011da 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -54,7 +54,7 @@
id}, \"story\")", ' ' . $lang->release->linkStory, '', "class='btn btn-primary'");?>
- + ' method='post' id='linkedStoriesForm' data-ride="table">
id}, \"bug\")", ' ' . $lang->release->linkBug, '', "class='btn btn-primary'");?> - + ' method='post' target='hiddenwin' id='linkedBugsForm' data-ride="table">
@@ -247,7 +247,7 @@
id}, \"leftBug\")", ' ' . $lang->release->linkBug, '', "class='btn btn-primary'");?>
- id&type=leftBug");?>" id='linkedBugsForm' data-ride="table"> + ' method='post' target='hiddenwin' action="id&type=leftBug");?>" id='linkedBugsForm' data-ride="table">
id}&type=leftBug&link=$link¶m=$param&orderBy=%s";?> From eeafdf767102543e410241f3963b2e9a38bf2b49 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Wed, 8 Mar 2023 17:18:26 +0800 Subject: [PATCH 5/5] * Revmoe console code. --- module/api/js/create.js | 1 - module/api/js/edit.js | 1 - module/story/js/common.js | 1 - module/zanode/js/common.js | 1 - 4 files changed, 4 deletions(-) diff --git a/module/api/js/create.js b/module/api/js/create.js index e073d9d82e..8d0e441826 100644 --- a/module/api/js/create.js +++ b/module/api/js/create.js @@ -41,7 +41,6 @@ var app = new Vue({ }, methods: { changeAttr(val) { - // console.log('更新之前', JSON.stringify(val)) this.body = val; }, changeType(val) { diff --git a/module/api/js/edit.js b/module/api/js/edit.js index 1dc4d3074b..50ca3eb7f8 100644 --- a/module/api/js/edit.js +++ b/module/api/js/edit.js @@ -58,7 +58,6 @@ var app = new Vue({ }, methods: { changeAttr(val) { - // console.log('新的值', JSON.stringify(val)) this.body = val }, changeType(val) { diff --git a/module/story/js/common.js b/module/story/js/common.js index 2c417172c9..e1238fc965 100644 --- a/module/story/js/common.js +++ b/module/story/js/common.js @@ -38,7 +38,6 @@ $(function() { setTimeout(function() { - console.log(11); $saveButton.attr('type', 'button').removeAttr('disabled'); $saveDraftButton.removeAttr('disabled'); }, 10000); diff --git a/module/zanode/js/common.js b/module/zanode/js/common.js index 80f22268ea..982fe25595 100644 --- a/module/zanode/js/common.js +++ b/module/zanode/js/common.js @@ -26,7 +26,6 @@ $(function() $.get(link, function(data) { data = JSON.parse(data); - console.log(data); $('#osName').val(data.osName); if(data.memory != 0) {