Make option group required for option and multi-option attribute types.

src/oscar/apps/dashboard/catalogue/forms.py

@@ -397,6 +397,12 @@ class ProductAttributesForm(forms.ModelForm):
 
         return code
 
+    def clean(self):
+        attr_type = self.cleaned_data.get('type')
+        option_group = self.cleaned_data.get('option_group')
+        if attr_type in [ProductAttribute.OPTION, ProductAttribute.MULTI_OPTION] and not option_group:
+            self.add_error('option_group', _('An option group is required'))
+
     class Meta:
         model = ProductAttribute
         fields = ["name", "code", "type", "option_group", "required"]

src/oscar/static_src/oscar/js/oscar/dashboard.js

@@ -354,7 +354,13 @@ var oscar = (function(o, $) {
             toggleOptionGroup: function(type_select){
                 var option_group_select = $('#' + type_select.attr('id').replace('type', 'option_group'));
                 var v = type_select.val();
-                option_group_select.parent().parent().toggle(v === 'option' || v === 'multi_option');
+                var showOptionGroup = v === 'option' || v === 'multi_option';
+                option_group_select.parent().parent().toggle(showOptionGroup);
+                if(showOptionGroup){
+                    option_group_select.attr('required', 'required');
+                }else{
+                    option_group_select.attr('required', null);
+                }
             }
         },
         ranges: {

tests/integration/dashboard/test_catalogue_form.py

@@ -39,3 +39,18 @@ class TestCreateProductAttributeForm(TestCase):
 
         # check that code is not None or empty string
         self.assertTrue(product_attribute.code)
+
+    def test_option_group_required_if_attribute_is_option_or_multi_option(self):
+        option_form = forms.ProductAttributesForm(data={
+            "name": "Attr",
+            "type": "option"
+        })
+        self.assertFalse(option_form.is_valid())
+        self.assertEqual(option_form.errors, {'option_group': ['An option group is required']})
+
+        multi_option_form = forms.ProductAttributesForm(data={
+            "name": "Attr",
+            "type": "option"
+        })
+        self.assertFalse(multi_option_form.is_valid())
+        self.assertEqual(multi_option_form.errors, {'option_group': ['An option group is required']})