diff --git a/app/scripts/controllers/addConfigVolume.js b/app/scripts/controllers/addConfigVolume.js index c385172be1..f4ec77e91e 100644 --- a/app/scripts/controllers/addConfigVolume.js +++ b/app/scripts/controllers/addConfigVolume.js @@ -96,7 +96,6 @@ angular.module('openshiftConsole') var generateName = $filter('generateName'); var displayError = function(errorMessage, errorDetails) { - $scope.disableInputs = true; $scope.alerts['attach-persistent-volume-claim'] = { type: "error", message: errorMessage, @@ -225,7 +224,11 @@ angular.module('openshiftConsole') $window.history.back(); }, function(result) { - displayError("An error occurred attaching the persistent volume claim to the " + $filter('humanizeKind')($routeParams.kind) + ".", getErrorDetails(result)); + $scope.disableInputs = false; + var humanizeKind = $filter('humanizeKind'); + var sourceKind = humanizeKind(source.kind); + var targetKind = humanizeKind($routeParams.kind); + displayError("An error occurred attaching the " + sourceKind + " to the " + targetKind + ".", getErrorDetails(result)); } ); }; diff --git a/app/scripts/controllers/attachPVC.js b/app/scripts/controllers/attachPVC.js index 9352e2bf44..41fa3cdc97 100644 --- a/app/scripts/controllers/attachPVC.js +++ b/app/scripts/controllers/attachPVC.js @@ -168,6 +168,7 @@ angular.module('openshiftConsole') }, function(result) { displayError("An error occurred attaching the persistent volume claim to the " + $filter('humanizeKind')($routeParams.kind) + ".", getErrorDetails(result)); + $scope.disableInputs = false; } ); } diff --git a/app/views/add-config-volume.html b/app/views/add-config-volume.html index caeea99252..38347b29cc 100644 --- a/app/views/add-config-volume.html +++ b/app/views/add-config-volume.html @@ -136,6 +136,14 @@
/
or
+ contain ..
path elements.
+
+ /
or contain ..
path elements.\n" +
+ "\n" +
+ "