From 1f6c2206c3278a6ffdeb30e7ec38ef920ace3864 Mon Sep 17 00:00:00 2001 From: chenfei Date: Wed, 20 Mar 2019 17:20:22 +0800 Subject: [PATCH] * Finish task #5335. --- module/build/js/view.js | 2 ++ module/build/view/linkbug.html.php | 4 +-- module/build/view/linkstory.html.php | 2 +- module/build/view/view.html.php | 5 ---- module/productplan/js/view.js | 2 ++ module/productplan/view/linkbug.html.php | 2 +- module/productplan/view/linkstory.html.php | 2 +- module/productplan/view/view.html.php | 31 +++++++++------------- module/release/js/view.js | 2 ++ module/release/view/linkbug.html.php | 2 +- module/release/view/linkstory.html.php | 2 +- module/release/view/view.html.php | 3 --- 12 files changed, 26 insertions(+), 33 deletions(-) diff --git a/module/build/js/view.js b/module/build/js/view.js index fd60304619..beb840e6ca 100644 --- a/module/build/js/view.js +++ b/module/build/js/view.js @@ -9,6 +9,8 @@ function showLink(buildID, type, param) $linkBox.find('[data-ride="table"]').table(); $.toggleQueryBox(true, $linkBox.find('#queryBox')); }); + + $('.actions').find("a[href*='" + type + "']").addClass('hidden'); } $(function() diff --git a/module/build/view/linkbug.html.php b/module/build/view/linkbug.html.php index a2ea3a6c98..7d1dfae16d 100644 --- a/module/build/view/linkbug.html.php +++ b/module/build/view/linkbug.html.php @@ -60,8 +60,8 @@
-
- build->linkBug, '', 'btn');?> +
+ build->linkBug, '', 'btn btn-secondary');?>
id}&type=bug"), $lang->goback, '', "class='btn'");?> diff --git a/module/build/view/linkstory.html.php b/module/build/view/linkstory.html.php index 3825c9e8bb..96e01d475d 100644 --- a/module/build/view/linkstory.html.php +++ b/module/build/view/linkstory.html.php @@ -64,7 +64,7 @@
-
+
build->linkStory, '', 'btn btn-secondary');?>
diff --git a/module/build/view/view.html.php b/module/build/view/view.html.php index 663d0c00f0..8776806523 100644 --- a/module/build/view/view.html.php +++ b/module/build/view/view.html.php @@ -39,11 +39,6 @@ tbody tr td:first-child input{display:none;} deleted) { - if($config->global->flow != 'onlyTest') - { - if(common::hasPriv('build', 'linkStory')) echo html::a(inlink('view', "buildID=$build->id&type=story&link=true"), ' ' . $lang->build->linkStory, '', "class='btn btn-link'"); - if(common::hasPriv('build', 'linkBug')) echo html::a(inlink('view', "buildID=$build->id&type=bug&link=true"), ' ' . $lang->build->linkBug, '', "class='btn btn-link'"); - } common::printIcon('build', 'edit', "buildID=$build->id", $build); common::printIcon('build', 'delete', "buildID=$build->id", $build, 'button', 'trash', 'hiddenwin'); } diff --git a/module/productplan/js/view.js b/module/productplan/js/view.js index 27a3defb47..08c0e88858 100644 --- a/module/productplan/js/view.js +++ b/module/productplan/js/view.js @@ -9,6 +9,8 @@ function showLink(planID, type, orderBy, param) $linkBox.find('[data-ride="table"]').table(); $.toggleQueryBox(true, $linkBox.find('#queryBox')); }); + + $('.actions').find("a[href*='" + type + "']").addClass('hidden'); } $(function() diff --git a/module/productplan/view/linkbug.html.php b/module/productplan/view/linkbug.html.php index 23d7edb751..8a48f77bae 100644 --- a/module/productplan/view/linkbug.html.php +++ b/module/productplan/view/linkbug.html.php @@ -60,7 +60,7 @@
- productplan->linkBug, '', 'btn');?> + productplan->linkBug, '', 'btn btn-secondary');?>
diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index fdf527916f..3795ad1962 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -68,7 +68,7 @@
- productplan->linkStory, '', 'btn');?> + productplan->linkStory, '', 'btn btn-secondary');?>
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index d91ddc669b..0428e7f782 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -37,22 +37,7 @@ deleted) { - echo "
"; - $batchMisc = common::hasPriv('story', 'batchCreate') ? 'btn btn-link' : "disabled"; - $batchLink = common::hasPriv('story', 'batchCreate') ? $this->createLink('story', 'batchCreate', "productID=$plan->product&branch=$plan->branch&moduleID=0&story=0&project=0&plan={$plan->id}") : '#'; - echo html::a($batchLink, "" . $lang->story->batchCreate . '', '', "class='$batchMisc'"); - common::printIcon('story', 'create', "productID=$plan->product&branch=$plan->branch&moduleID=0&storyID=0&projectID=0&bugID=0&planID=$plan->id", $plan, 'button', 'plus'); - echo "
"; - - if(common::hasPriv('productplan', 'linkStory')) - { - echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), ' ' . $lang->productplan->linkStory, '', "class='btn btn-link'"); - } - if(common::hasPriv('productplan', 'linkBug') and $config->global->flow != 'onlyStory') - { - echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), ' ' . $lang->productplan->linkBug, '', "class='btn btn-link'"); - } - if(common::hasPriv('productplan', 'create') and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), "", '', "class='btn btn-link' title='{$this->lang->productplan->children}'"); + if(common::hasPriv('productplan', 'create') and $plan->parent <= '0') echo html::a($this->createLink('productplan', 'create', "product={$plan->product}&branch={$plan->branch}&parent={$plan->id}"), "" . $this->lang->productplan->children , '', "class='btn btn-link' title='{$this->lang->productplan->children}'"); common::printIcon('productplan', 'edit', "planID=$plan->id", $plan); common::printIcon('productplan', 'delete', "planID=$plan->id", $plan, 'button', 'trash', 'hiddenwin'); } @@ -71,12 +56,22 @@
'> -
- id, \"story\")", ' ' . $lang->productplan->linkStory, '', "class='btn btn-primary'");?> + deleted) + { + $batchMisc = common::hasPriv('story', 'batchCreate') ? 'btn btn-link' : "disabled"; + $batchLink = common::hasPriv('story', 'batchCreate') ? $this->createLink('story', 'batchCreate', "productID=$plan->product&branch=$plan->branch&moduleID=0&story=0&project=0&plan={$plan->id}") : '#'; + echo html::a($batchLink, "" . $lang->story->batchCreate . '', '', "class='$batchMisc'"); + common::printIcon('story', 'create', "productID=$plan->product&branch=$plan->branch&moduleID=0&storyID=0&projectID=0&bugID=0&planID=$plan->id", $plan, 'button', 'plus'); + } + if(common::hasPriv('productplan', 'linkStory')) echo html::a("javascript:showLink($plan->id, \"story\")", ' ' . $lang->productplan->linkStory, '', "class='btn btn-primary'"); + ?>
+ +
id&orderBy=$orderBy");?>">
- release->linkBug, '', 'btn');?> + release->linkBug, '', 'btn btn-secondary');?>
diff --git a/module/release/view/linkstory.html.php b/module/release/view/linkstory.html.php index d8898af714..09c9b1ec4e 100644 --- a/module/release/view/linkstory.html.php +++ b/module/release/view/linkstory.html.php @@ -65,7 +65,7 @@
- release->linkStory, '', 'btn');?> + release->linkStory, '', 'btn btn-secondary');?>
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php index 253060f0ac..4778d230ed 100644 --- a/module/release/view/view.html.php +++ b/module/release/view/view.html.php @@ -33,9 +33,6 @@ deleted) { - if(common::hasPriv('release', 'linkStory')) echo html::a(inlink('view', "releaseID=$release->id&type=story&link=true"), ' ' . $lang->release->linkStory, '', "class='btn btn-link'"); - if(common::hasPriv('release', 'linkBug') and $config->global->flow != 'onlyStory') echo html::a(inlink('view', "releaseID=$release->id&type=bug&link=true"), ' ' . $lang->release->linkBug, '', "class='btn btn-link'"); - if(common::hasPriv('release', 'changeStatus', $release)) { $changedStatus = $release->status == 'normal' ? 'terminate' : 'normal';