Fix errors and unwanted behavior caused by universal fields (#359)

resources/models/resource.py

@@ -1315,9 +1315,6 @@ class Meta:
     def options(self):
         return ResourceUniversalFormOption.objects.filter(resource_universal_field=self)
 
-    def save(self, *args, **kwargs):
-        return super(ResourceUniversalField, self).save(*args, **kwargs)
-
     def __str__(self):
         return "%s / %s / %s" % (self.name, self.field_type, self.resource)
 

respa_admin/templates/respa_admin/resources/form/_options.html

@@ -4,7 +4,7 @@
         margin-top: 20px;
     }
 </style>
-<div id="equipment3">
+<div id="universal-field-options">
     <div class="form-section-header">
         <h2>{% trans "Universal form options" %}</h2>
         <span class="pull-right">{% trans "*Mandatory fields" %}</span>

respa_admin/templates/respa_admin/resources/form/_universal.html

@@ -4,7 +4,7 @@
         margin-top: 20px;
     }
 </style>
-<div id="equipment2">
+<div id="universal-field">
     <div class="form-section-header">
         <h2>{% trans "Universal form field" %}</h2>
         <span class="pull-right">{% trans "*Mandatory fields" %}</span>

respa_admin/views/resources.py

@@ -650,7 +650,13 @@ def _save_resource_images(self, resource_image_formset):
             resource_image.save()
 
     def _save_resource_universal(self, resource_universal_formset):
-        resource_universal_formset.save()
+        if not any([bool(value) for value in resource_universal_formset.cleaned_data or []]):
+            return
+
+        for idx in range(len(resource_universal_formset)):
+            universal_field = resource_universal_formset.forms[idx].save(commit=False)
+            universal_field.resource = self.object
+            universal_field.save()
 
     def _save_universal_options(self, resource_options_formset):
         resource_options_formset.save()