Merge pull request #1735 from cdcabrera/issue-deprovision

Merged by openshift-bot
openshift · Jun 19, 2017 · 11dc8ce · 11dc8ce
2 parents 59e53bf + f1aeaf1
commit 11dc8ce
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/app/scripts/directives/overview/serviceInstanceRow.js b/app/scripts/directives/overview/serviceInstanceRow.js
@@ -66,8 +66,8 @@
             message: 'Service \'' + row.apiObject.spec.serviceClassName + '\' will be deleted and no longer available.'
           }
         },
-        detailsMarkup: 'Deprovision Service?',
-        okButtonText: 'Deprovision',
+        detailsMarkup: 'Delete Service?',
+        okButtonText: 'Delete',
         okButtonClass: 'btn-danger',
         cancelButtonText: 'Cancel'
       };
@@ -96,13 +96,13 @@
         .then(function() {
           NotificationsService.addNotification({
             type: "success",
-            message: "Successfully deprovisioned " + row.apiObject.metadata.name + "."
+            message: "Successfully deleted " + row.apiObject.metadata.name + "."
           });
         }, function(err) {
           NotificationsService.addNotification({
             id: "deprovision-service-error",
             type: "error",
-            message: "An error occurred while deprovisioning " + row.apiObject.metadata.name + ".",
+            message: "An error occurred while deleting " + row.apiObject.metadata.name + ".",
             details: getErrorDetails(err)
           });
         });

diff --git a/app/views/overview/_service-instance-row.html b/app/views/overview/_service-instance-row.html
@@ -59,7 +59,7 @@ <h3>
             <a href="" ng-click="row.showOverlayPanel('unbindService', {target: row.apiObject})">Delete Binding</a>
           </li>
           <li role="menuitem">
-            <a href="" ng-click="row.deprovision()" role="button">Deprovision</a>
+            <a href="" ng-click="row.deprovision()" role="button">Delete</a>
           </li>
         </ul>
       </div>

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -13093,8 +13093,8 @@ type:"error",
 message:"Service '" + g.apiObject.spec.serviceClassName + "' will be deleted and no longer available."
 }
 },
-detailsMarkup:"Deprovision Service?",
-okButtonText:"Deprovision",
+detailsMarkup:"Delete Service?",
+okButtonText:"Delete",
 okButtonClass:"btn-danger",
 cancelButtonText:"Cancel"
 };
@@ -13116,13 +13116,13 @@ namespace:g.apiObject.metadata.namespace
 }).then(function() {
 f.addNotification({
 type:"success",
-message:"Successfully deprovisioned " + g.apiObject.metadata.name + "."
+message:"Successfully deleted " + g.apiObject.metadata.name + "."
 });
 }, function(a) {
 f.addNotification({
 id:"deprovision-service-error",
 type:"error",
-message:"An error occurred while deprovisioning " + g.apiObject.metadata.name + ".",
+message:"An error occurred while deleting " + g.apiObject.metadata.name + ".",
 details:h(a)
 });
 });

diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
@@ -12242,7 +12242,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<a href=\"\" ng-click=\"row.showOverlayPanel('unbindService', {target: row.apiObject})\">Delete Binding</a>\n" +
     "</li>\n" +
     "<li role=\"menuitem\">\n" +
-    "<a href=\"\" ng-click=\"row.deprovision()\" role=\"button\">Deprovision</a>\n" +
+    "<a href=\"\" ng-click=\"row.deprovision()\" role=\"button\">Delete</a>\n" +
     "</li>\n" +
     "</ul>\n" +
     "</div>\n" +