Skip to content

Commit

Permalink
Merge pull request #2261 from spadgett/fix-show-annotations-label
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Bug 1501849 - Fix show/hide annotations label

"Hide Annotations" was displayed when the annotations were not expanded.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1501849
  • Loading branch information
openshift-merge-robot committed Oct 13, 2017
2 parents e679211 + b0cb5fe commit 253057a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/views/directives/annotations.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p ng-if="annotations" ng-class="{'mar-bottom-xl': !expandAnnotations}">
<a href="" ng-click="toggleAnnotations()">{{!expandAnnotations ? 'Hide Annotations' : 'Show Annotations'}}</a>
<a href="" ng-click="toggleAnnotations()">{{expandAnnotations ? 'Hide Annotations' : 'Show Annotations'}}</a>
</p>
<div ng-if="expandAnnotations && annotations" class="table-responsive scroll-shadows-horizontal">
<table class="table table-bordered table-bordered-columns key-value-table">
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -5768,7 +5768,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(

$templateCache.put('views/directives/annotations.html',
"<p ng-if=\"annotations\" ng-class=\"{'mar-bottom-xl': !expandAnnotations}\">\n" +
"<a href=\"\" ng-click=\"toggleAnnotations()\">{{!expandAnnotations ? 'Hide Annotations' : 'Show Annotations'}}</a>\n" +
"<a href=\"\" ng-click=\"toggleAnnotations()\">{{expandAnnotations ? 'Hide Annotations' : 'Show Annotations'}}</a>\n" +
"</p>\n" +
"<div ng-if=\"expandAnnotations && annotations\" class=\"table-responsive scroll-shadows-horizontal\">\n" +
"<table class=\"table table-bordered table-bordered-columns key-value-table\">\n" +
Expand Down

0 comments on commit 253057a

Please sign in to comment.