Skip to content

Commit

Permalink
Merge pull request #1506 from himdel/bz1653193-custom-nodisplay
Browse files Browse the repository at this point in the history
BZ#1653193 - Custom buttons - only show button name when the "Display on Button" option is set

(cherry picked from commit 71856b0)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1655772
  • Loading branch information
AllenBW authored and simaishi committed Dec 14, 2018
1 parent d5238a1 commit 16e3e13
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions client/app/services/custom-button/custom-button.html
Expand Up @@ -6,7 +6,9 @@
ng-disabled="!button.enabled"
ng-click="vm.invokeCustomAction(button)">
<i ng-class="button.options.button_icon" ng-style="{color: button.options.button_color }"></i>
{{ button.name }}
<span ng-if="button.options.display">
{{ button.name }}
</span>
</button>
</span>
</span>
Expand All @@ -32,7 +34,9 @@
uib-tooltip="{{ button.enabled ? button.description : button.disabled_text }}"
tooltip-placement="left">
<i ng-class="button.options.button_icon" ng-style="{color: button.options.button_color }"></i>
{{ button.name }}
<span ng-if="button.options.display">
{{ button.name }}
</span>
</a>
</li>
</ul>
Expand Down

0 comments on commit 16e3e13

Please sign in to comment.