fix bug in validation actions

ereuse_devicehub/inventory/forms.py

@@ -497,7 +497,7 @@ class TagDeviceForm(FlaskForm):
         db.session.commit()
 
 
-class NewActionForm(FlaskForm):
+class ActionFormMix(FlaskForm):
     name = StringField(
         'Name',
         [validators.length(max=50)],
@@ -529,17 +529,23 @@ class NewActionForm(FlaskForm):
         if not is_valid:
             return False
 
-        self._devices = OrderedSet()
+        if self.type.data in [None, '']:
-        if self.devices.data:
+            return False
-            devices = set(self.devices.data.split(","))
-            self._devices = OrderedSet(
-                Device.query.filter(Device.id.in_(devices))
-                .filter(Device.owner_id == g.user.id)
-                .all()
-            )
 
-            if not self._devices:
+        if not self.devices.data:
-                return False
+            return False
+
+        self._devices = OrderedSet()
+
+        devices = set(self.devices.data.split(","))
+        self._devices = OrderedSet(
+            Device.query.filter(Device.id.in_(devices))
+            .filter(Device.owner_id == g.user.id)
+            .all()
+        )
+
+        if not self._devices:
+            return False
 
         return True
 
@@ -572,7 +578,20 @@ class NewActionForm(FlaskForm):
             return self.type.data
 
 
-class AllocateForm(NewActionForm):
+class NewActionForm(ActionFormMix):
+    def validate(self, extra_validators=None):
+        is_valid = super().validate(extra_validators)
+
+        if not is_valid:
+            return False
+
+        if self.type.data in ['Allocate', 'Deallocate', 'Trade', 'DataWipe']:
+            return False
+
+        return True
+
+
+class AllocateForm(ActionFormMix):
     start_time = DateField('Start time')
     end_time = DateField('End time')
     final_user_code = StringField('Final user code', [validators.length(max=50)])
@@ -582,6 +601,9 @@ class AllocateForm(NewActionForm):
     def validate(self, extra_validators=None):
         is_valid = super().validate(extra_validators)
 
+        if self.type.data not in ['Allocate', 'Deallocate']:
+            return False
+
         start_time = self.start_time.data
         end_time = self.end_time.data
         if start_time and end_time and end_time < start_time:
@@ -650,7 +672,7 @@ class DataWipeDocumentForm(Form):
         return self._obj
 
 
-class DataWipeForm(NewActionForm):
+class DataWipeForm(ActionFormMix):
     document = FormField(DataWipeDocumentForm)
 
     def save(self):
@@ -677,7 +699,7 @@ class DataWipeForm(NewActionForm):
         return self.instance
 
 
-class TradeForm(NewActionForm):
+class TradeForm(ActionFormMix):
     user_from = StringField(
         'Supplier',
         [validators.Optional()],
@@ -724,6 +746,9 @@ class TradeForm(NewActionForm):
         email_from = self.user_from.data
         email_to = self.user_to.data
 
+        if self.type.data != "Trade":
+            return False
+
         if not self.confirm.data and not self.code.data:
             self.code.errors = ["If you don't want to confirm, you need a code"]
             is_valid = False