bug 1170797: "unhang" release upload screen if no file provided (#186)…

…. r=bhearsum
mozilla-releng · Dec 5, 2016 · 0d2341b · 0d2341b
1 parent e9a7d5f
commit 0d2341b
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 23 deletions.
diff --git a/ui/app/js/controllers/release_edit_controller.js b/ui/app/js/controllers/release_edit_controller.js
@@ -47,6 +47,31 @@ function ($scope, $modalInstance, CSRF, Releases, release) {
   };
 
   $scope.saveChanges = function () {
+    if (!$scope.release.product.trim()) {
+      sweetAlert(
+        "Form Error",
+        "Product is required.",
+        "error"
+      );
+      return;
+    }
+    if (!$scope.dataFile) {
+      sweetAlert(
+        "Form Error",
+        "No file has been selected.",
+        "error"
+      );
+      return;
+    }
+    if (!$scope.release.name.trim()) {
+      sweetAlert(
+        "Form Error",
+        "Name is required",
+        "error"
+      );
+      return;
+    }
+
     $scope.saving = true;
 
     var file = $scope.dataFile;
@@ -89,18 +114,8 @@ function ($scope, $modalInstance, CSRF, Releases, release) {
         });
       });
     };
-    if (typeof file === 'undefined') {
-      sweetAlert(
-        "Form Error",
-        "No file has been selected.",
-        "error"
-      );
-      $scope.saving = false;
-      return;
-    } else {
-      // should work
-      reader.readAsText(file);
-    }
+    // should work
+    reader.readAsText(file);
 
   }; // /saveChanges
 

diff --git a/ui/app/js/controllers/release_new_controller.js b/ui/app/js/controllers/release_new_controller.js
@@ -61,6 +61,24 @@ function($scope, $http, $modalInstance, CSRF, Releases, releases) {
       );
       return;
     }
+    if (!$scope.dataFile) {
+      sweetAlert(
+        "Form Error",
+        "No file has been selected.",
+        "error"
+      );
+      return;
+    }
+
+    if (!$scope.release.name.trim()) {
+      sweetAlert(
+        "Form Error",
+        "Name is required",
+        "error"
+      );
+      return;
+    }
+
     $scope.saving = true;
     $scope.errors = {};
 
@@ -102,18 +120,8 @@ function($scope, $http, $modalInstance, CSRF, Releases, releases) {
         });
       });
     };
-    if (typeof file === 'undefined') {
-      sweetAlert(
-        "Form Error",
-        "No file has been selected.",
-        "error"
-      );
-      $scope.saving = false;
-      return;
-    } else {
       // should work
-      reader.readAsText(file);
-    }
+    reader.readAsText(file);
 
   };