Fix minor issues

indico · Nov 3, 2023 · a6dd31c · a6dd31c
1 parent 279da0c
commit a6dd31c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/cern_access/indico_cern_access/plugin.py b/cern_access/indico_cern_access/plugin.py
@@ -308,8 +308,8 @@ def _registration_form_field_deleted(self, field, **kwargs):
                  .join(CERNAccessRequest)
                  .filter(RegistrationData.data != [], RegistrationData.field_data.has(field=field),
                          ~CERNAccessRequest.is_withdrawn))
-        if query.count():
-            raise UserValueError(_('This field can not be deleted due to an active CERN access request.'))
+        if query.has_rows():
+            raise UserValueError(_('This field cannot be deleted due to an active CERN access request.'))
 
     def _event_deleted(self, event, **kwargs):
         """

diff --git a/cern_access/tests/conftest.py b/cern_access/tests/conftest.py
@@ -14,12 +14,11 @@
 from indico.modules.events.registration.models.form_fields import RegistrationFormField
 from indico.modules.events.registration.models.forms import RegistrationForm
 from indico.modules.events.registration.models.items import RegistrationFormSection
-from indico.modules.events.registration.util import create_personal_data_fields
+from indico.modules.events.registration.util import create_personal_data_fields, create_registration
 from indico.modules.events.requests.models.requests import Request
-from indico.modules.events.registration.util import create_registration
 
-from indico_cern_access.models.access_requests import CERNAccessRequest, CERNAccessRequestState
 from indico_cern_access.definition import CERNAccessRequestDefinition
+from indico_cern_access.models.access_requests import CERNAccessRequest, CERNAccessRequestState
 from indico_cern_access.plugin import CERNAccessPlugin
 from indico_cern_access.util import get_last_request
 

diff --git a/cern_access/tests/operations_test.py b/cern_access/tests/operations_test.py
@@ -13,7 +13,7 @@
 
 from indico_cern_access.models.access_requests import CERNAccessRequestState
 from indico_cern_access.models.archived_requests import ArchivedCERNAccessRequest
-from indico_cern_access.util import get_accompanying_persons, get_last_request, generate_access_id, grant_access
+from indico_cern_access.util import generate_access_id, get_accompanying_persons, get_last_request, grant_access
 
 
 @pytest.fixture