[ENG-10879] Improve error message for SSO availability error message

admin/institutions/forms.py

@@ -16,11 +16,11 @@ def clean(self):
         if hasattr(self, 'cleaned_data') and self.changed_data:
             if not self.cleaned_data['delegation_protocol']:
                 if self.cleaned_data['sso_availability'] != SSOAvailability.UNAVAILABLE.value:
-                    self.add_error('sso_availability', 'Must be UNAVAILABLE when no protocol')
+                    self.add_error(None, 'SSO availability must be set to "Unavailable" when no delegation protocol is configured.')
 
             elif self.cleaned_data['deactivated']:
                 if self.cleaned_data['sso_availability'] != SSOAvailability.HIDDEN.value:
-                    self.add_error('sso_availability', 'Inactive must be HIDDEN')
+                    self.add_error(None, 'SSO availability must be set to "Hidden" when the institution is deactivated.')
 
 
 class InstitutionalMetricsAdminRegisterForm(forms.Form):

admin/institutions/views.py

@@ -125,7 +125,8 @@ def post(self, request, *args, **kwargs):
         if form.is_valid():
             return self.form_valid(form)
         else:
-            messages.error(request, form.errors)
+            for error in form.non_field_errors():
+                messages.error(request, error)
             return redirect('institutions:detail', institution_id=self.kwargs.get('institution_id'))
 
 

admin_tests/institutions/test_views.py

@@ -155,7 +155,7 @@ def test_institution_form_invalid(self):
         }
         form = InstitutionForm(data=new_data)
         assert not form.is_valid()
-        assert 'sso_availability' in form.errors
+        assert {'__all__': ['SSO availability must be set to "Unavailable" when no delegation protocol is configured.']} == form.errors
 
 
 class TestInstitutionExport(AdminTestCase):