firewall_gui: merge validation messages

firewall_gui/views.py

@@ -431,12 +431,10 @@ def set_field(object, attr, errors, **kwargs):
         model = getattr(object.__class__, attr).field.rel.to
         model = getattr(object.__class__, attr).field.rel.to
         setattr(object, attr, model.objects.get(**kwargs))
         setattr(object, attr, model.objects.get(**kwargs))
     except Exception as e:
     except Exception as e:
-        errors.append({
-            attr: ('%(model)s with the name "%(name)s" does not exists!') % {
+        errors[attr] = ('%(model)s with the name "%(name)s" does not exists!') % {
                 'model': model.__name__,
                 'model': model.__name__,
                 'name': kwargs.values()[0]
                 'name': kwargs.values()[0]
             }
             }
-        })
 
 
 def save_rule(request):
 def save_rule(request):
     data = json.loads(request.body)
     data = json.loads(request.body)
@@ -444,7 +442,7 @@ def save_rule(request):
         rule = get_object_or_404(Rule, id=data['id'])
         rule = get_object_or_404(Rule, id=data['id'])
     else:
     else:
         rule = Rule.objects.create()
         rule = Rule.objects.create()
-    errors = []
+    errors = {}
     rule.direction = data['direction']['value']
     rule.direction = data['direction']['value']
     rule.description = data['description']
     rule.description = data['description']
     rule.dport = data['dport']
     rule.dport = data['dport']
@@ -462,11 +460,11 @@ def save_rule(request):
         else:
         else:
             setattr(rule, attr, None)
             setattr(rule, attr, None)
     set_field(rule, 'foreign_network', errors, name=data['foreignNetwork']['name'])
     set_field(rule, 'foreign_network', errors, name=data['foreignNetwork']['name'])
-    if len(errors) > 0:
-        return HttpResponse(json.dumps(errors), content_type='application/json', status=404)
     try:
     try:
         rule.full_clean()
         rule.full_clean()
     except Exception as e:
     except Exception as e:
-        return HttpResponse(json.dumps(e.message_dict), content_type='application/json', status=409)
+        errors = dict(errors.items() + e.message_dict.items())
+    if len(errors) > 0:
+        return HttpResponse(json.dumps(errors), content_type='application/json', status=400)
     rule.save()
     rule.save()
     return HttpResponse('KTHXBYE')
     return HttpResponse('KTHXBYE')