Skip to content

Commit

Permalink
Merge pull request #1663 from mzazrivec/honor_display_parameter_for_d…
Browse files Browse the repository at this point in the history
…isplay_group

Honor 'display' parameter for button groups
  • Loading branch information
himdel committed Aug 26, 2020
2 parents 5b43b35 + f9e99e1 commit 9127abd
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion client/app/services/custom-button/custom-button.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
uib-tooltip="{{buttonGroup.description}}"
tooltip-placement="top">
<i ng-class="buttonGroup.set_data.button_icon" ng-style="{color: buttonGroup.set_data.button_color }"></i>
{{ buttonGroup.name.split('|')[0] }}
<span ng-if="buttonGroup.set_data.display">
{{ buttonGroup.name.split('|')[0] }}
</span>
<span class="caret"></span>
</button>
<ul uib-dropdown-menu role="menu" aria-labelledby="{{buttonGroup.id}}">
Expand Down

0 comments on commit 9127abd

Please sign in to comment.