Skip to content

Commit ff33b78

Browse files
author
OpenShift Bot
authored
Merge pull request #2138 from spadgett/binding-not-ready-secret
Merged by openshift-bot
2 parents 4be2b16 + 6c04b3c commit ff33b78

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

app/views/directives/_service-binding.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ <h3 ng-if="$ctrl.serviceClass">
3535
project-name="{{$ctrl.binding.metadata.namespace}}"
3636
stay-on-current-page="true">
3737
</delete-link>
38-
<a ng-if="('secrets' | canI : 'get')" ng-href="{{$ctrl.binding.spec.secretName | navigateResourceURL : 'Secret' : $ctrl.namespace}}">
38+
<a ng-if="('secrets' | canI : 'get') && ($ctrl.binding | isBindingReady)" ng-href="{{$ctrl.binding.spec.secretName | navigateResourceURL : 'Secret' : $ctrl.namespace}}">
3939
View Secret
4040
</a>
4141
</div>

app/views/overview/_service-instance-row.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,11 @@ <h3>
142142
<div class="component-label">
143143
Secret
144144
</div>
145-
<a ng-if="('secrets' | canI : 'get')"
145+
<a ng-if="('secrets' | canI : 'get') && (binding | isBindingReady)"
146146
ng-href="{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}">
147147
{{binding.spec.secretName}}
148148
</a>
149-
<span ng-if="!('secrets' | canI : 'get')">
149+
<span ng-if="!('secrets' | canI : 'get') || !(binding | isBindingReady)">
150150
{{binding.spec.secretName}}
151151
</span>
152152
</h3>

dist/scripts/templates.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -5625,7 +5625,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
56255625
"<div class=\"service-binding-actions\" ng-if=\"!ctrl.binding.metadata.deletionTimestamp\">\n" +
56265626
"<delete-link ng-if=\"({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" label=\"Delete Binding\" kind=\"binding\" group=\"servicecatalog.k8s.io\" resource-name=\"{{$ctrl.binding.metadata.name}}\" project-name=\"{{$ctrl.binding.metadata.namespace}}\" stay-on-current-page=\"true\">\n" +
56275627
"</delete-link>\n" +
5628-
"<a ng-if=\"('secrets' | canI : 'get')\" ng-href=\"{{$ctrl.binding.spec.secretName | navigateResourceURL : 'Secret' : $ctrl.namespace}}\">\n" +
5628+
"<a ng-if=\"('secrets' | canI : 'get') && ($ctrl.binding | isBindingReady)\" ng-href=\"{{$ctrl.binding.spec.secretName | navigateResourceURL : 'Secret' : $ctrl.namespace}}\">\n" +
56295629
"View Secret\n" +
56305630
"</a>\n" +
56315631
"</div>\n" +
@@ -12409,10 +12409,10 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
1240912409
"<div class=\"component-label\">\n" +
1241012410
"Secret\n" +
1241112411
"</div>\n" +
12412-
"<a ng-if=\"('secrets' | canI : 'get')\" ng-href=\"{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}\">\n" +
12412+
"<a ng-if=\"('secrets' | canI : 'get') && (binding | isBindingReady)\" ng-href=\"{{binding.spec.secretName | navigateResourceURL : 'Secret' : row.apiObject.metadata.namespace}}\">\n" +
1241312413
"{{binding.spec.secretName}}\n" +
1241412414
"</a>\n" +
12415-
"<span ng-if=\"!('secrets' | canI : 'get')\">\n" +
12415+
"<span ng-if=\"!('secrets' | canI : 'get') || !(binding | isBindingReady)\">\n" +
1241612416
"{{binding.spec.secretName}}\n" +
1241712417
"</span>\n" +
1241812418
"</h3>\n" +

0 commit comments

Comments
 (0)