bug 1411965: Fix a few issues with the scheduled-changes-in-rules UI. (…

…#441). r=jlorenzo
mozilla-releng · Oct 26, 2017 · 0b0e7e5 · 0b0e7e5
1 parent 967808a
commit 0b0e7e5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/ui/app/js/controllers/rule_scheduled_change_new_controller.js b/ui/app/js/controllers/rule_scheduled_change_new_controller.js
@@ -72,17 +72,19 @@ function($scope, $http, $modalInstance, CSRF, Releases, Rules, scheduled_changes
     asap.setMinutes(asap.getMinutes() + 5);
     $scope.sc.when = ($scope.auto_time) ? asap : $scope.sc.when;
 
-    // Evaluate the values entered for priority and background rate.
-    $scope.integer_validation_errors = Helpers.integerValidator({'priority': $scope.sc.priority, 'backgroundRate': $scope.sc.backgroundRate});
-    // Stop sending the request if any number validation errors.
-    if($scope.integer_validation_errors.priority || $scope.integer_validation_errors.backgroundRate) {
-      $scope.saving = false;
-      sweetAlert(
-        "Form submission error",
-        "See fields highlighted in red.",
-        "error"
-      );
-      return;
+    if ($scope.sc.change_type !== "delete") {
+      // Evaluate the values entered for priority and background rate.
+      $scope.integer_validation_errors = Helpers.integerValidator({'priority': $scope.sc.priority, 'backgroundRate': $scope.sc.backgroundRate});
+      // Stop sending the request if any number validation errors.
+      if($scope.integer_validation_errors.priority || $scope.integer_validation_errors.backgroundRate) {
+        $scope.saving = false;
+        sweetAlert(
+          "Form submission error",
+          "See fields highlighted in red.",
+          "error"
+        );
+        return;
+      }
     }
 
     CSRF.getToken()

diff --git a/ui/app/js/controllers/rules_controller.js b/ui/app/js/controllers/rules_controller.js
@@ -294,7 +294,6 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
         sc: function() {
           // blank new default rule
           return {
-            base_row: undefined,
             product: product,
             channel: channel,
             backgroundRate: 0,
@@ -305,7 +304,7 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
           };
         },
         original_row: function() {
-          return {};
+          return null;
         },
         signoffRequirements: function() {
           return $scope.signoffRequirements;
@@ -359,12 +358,14 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
         },
         sc: function() {
           return {
-            "base_row": rule,
             "rule_id": rule.rule_id,
             "data_version": rule.data_version,
             "change_type": "delete"
           };
         },
+        original_row: function() {
+          return rule;
+        },
         signoffRequirements: function() {
           return $scope.signoffRequirements;
         },
@@ -387,14 +388,16 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
           return sc;
         },
         original_row: function() {
-          return rule;
+          if (rule.scheduled_change.change_type === "insert") {
+            return null;
+          }
+          else {
+            return rule;
+          }
         },
         signoffRequirements: function() {
           return $scope.signoffRequirements;
         },
-        rule: function() {
-          return rule;
-        },
       }
     });
     modalInstance.result.then(function(action) {

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.44
+2.43.2