CRM-14798 - Allow editing case-type names even if malformed

[civicrm-core.git] / js / angular-crmCaseType.js

diff --git a/js/angular-crmCaseType.js b/js/angular-crmCaseType.js
index 131dd62f8767c75354c09ab88bf5c01988a0df1f..fa68c64bf63003dc45ed5b4f9d4807718e765b58 100644 (file)
--- a/js/angular-crmCaseType.js
+++ b/js/angular-crmCaseType.js
@@ -228,6 +228,10 @@
       }
     };
 
+    $scope.isValidName = function(name) {
+      return !name || name.match(/^[a-zA-Z0-9_]+$/);
+    };
+
     $scope.getWorkflowName = function(activitySet) {
       var result = 'Unknown';
       _.each($scope.workflows, function(value, key) {
@@ -295,7 +299,11 @@
         });
     };
     $scope.deleteCaseType = function (caseType) {
-      crmApi('CaseType', 'delete', {id: caseType.id}, true)
+      crmApi('CaseType', 'delete', {id: caseType.id}, {
+        error: function (data) {
+          CRM.alert(data.error_message, ts('Error'));
+        }
+      })
         .then(function (data) {
           if (!data.is_error) {
             delete caseTypes.values[caseType.id];