Skip to content

Commit

Permalink
Merge pull request #2413 from spadgett/provision-call-failed-events
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Show ProvisionCallFailed in notification drawer

Also use `humanizeKind` filter when displaying kinds in the drawer.

<img width="537" alt="screen shot 2017-10-31 at 4 15 37 pm" src="https://user-images.githubusercontent.com/1167259/32246968-2afdf6aa-be57-11e7-9483-5137452904e7.png">

/kind bug
/assign @jwforres 

cc @ncameronbritt
  • Loading branch information
openshift-merge-robot authored Oct 31, 2017
2 parents 020f993 + 7c67972 commit 9392873
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions app/scripts/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
Deprovisioning: true,
ErrorCallingProvision: true,
ErrorInjectingBindResult: true,
ProvisionCallFailed: true,
Provisioning: true,
ReferencesNonexistentServiceClass: true,
ReferencesNonexistentServicePlan: true,
Expand Down
2 changes: 1 addition & 1 deletion app/views/directives/notifications/notification-body.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<div>

<span ng-if="notification.event.reason">
{{notification.event.reason | humanize}} &mdash; <span ng-if="notification.event.involvedObject">{{notification.event.involvedObject.kind | humanize}}</span>
{{notification.event.reason | humanize}} &mdash; <span ng-if="notification.event.involvedObject">{{notification.event.involvedObject.kind | humanizeKind : true}}</span>
</span>

<span
Expand Down
1 change: 1 addition & 0 deletions dist/scripts/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,7 @@ LoadBalancerUpdateFailed: !0,
Deprovisioning: !0,
ErrorCallingProvision: !0,
ErrorInjectingBindResult: !0,
ProvisionCallFailed: !0,
Provisioning: !0,
ReferencesNonexistentServiceClass: !0,
ReferencesNonexistentServicePlan: !0,
Expand Down
2 changes: 1 addition & 1 deletion dist/scripts/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -7913,7 +7913,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"drawer-pf-notification-message word-break\" ng-attr-title=\"{{notification.event.message}}\">\n" +
"<div>\n" +
"<span ng-if=\"notification.event.reason\">\n" +
"{{notification.event.reason | humanize}} &mdash; <span ng-if=\"notification.event.involvedObject\">{{notification.event.involvedObject.kind | humanize}}</span>\n" +
"{{notification.event.reason | humanize}} &mdash; <span ng-if=\"notification.event.involvedObject\">{{notification.event.involvedObject.kind | humanizeKind : true}}</span>\n" +
"</span>\n" +
"<span ng-if=\"notification.event.involvedObject\" ng-init=\"eventObjUrl = (notification.event | navigateEventInvolvedObjectURL)\">\n" +
"<a ng-if=\"eventObjUrl\" ng-attr-title=\"Navigate to {{notification.event.involvedObject.name}}\" href=\"{{eventObjUrl}}\" ng-click=\"$ctrl.customScope.close()\">\n" +
Expand Down

0 comments on commit 9392873

Please sign in to comment.