patron: use of checkboxes for roles

* Changing the json schema to use the multicheckbox type for the role field. * Fix the Alembic role migration script. Co-Authored-by: Bertrand Zuchuat <bertrand.zuchuat@rero.ch> Co-Authored-by: Renaud Michotte <renaud.michotte@gmail.com>
rero · Feb 7, 2023 · 6d7bdc7 · 6d7bdc7
1 parent 2880407
commit 6d7bdc7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/rero_ils/alembic/5f0b086e4b82_patron_role_migration.py b/rero_ils/alembic/5f0b086e4b82_patron_role_migration.py
@@ -38,15 +38,18 @@ def upgrade():
 
     def get_new_roles(roles):
         if 'system_librarian' in roles:
-            return [UserRole.FULL_PERMISSIONS]
-        elif 'librarian' in roles:
-            return [
+            roles.remove('system_librarian')
+            roles.append(UserRole.FULL_PERMISSIONS)
+        if 'librarian' in roles:
+            roles.remove('librarian')
+            roles.extend([
                 UserRole.PROFESSIONAL_READ_ONLY,
                 UserRole.ACQUISITION_MANAGER,
                 UserRole.CATALOG_MANAGER,
                 UserRole.CIRCULATION_MANAGER,
                 UserRole.USER_MANAGER
-            ]
+            ])
+        return roles
 
     query = PatronsSearch()\
         .filter('terms', roles=['librarian', 'system_librarian'])\

diff --git a/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json b/rero_ils/modules/patrons/jsonschemas/patrons/patron-v0.0.1.json
@@ -439,9 +439,11 @@
           "pro_user_manager",
           "pro_acquisition_manager",
           "pro_library_administrator"
-        ],
-        "form": {
-          "type": "selectWithSort",
+        ]
+      },
+      "form": {
+        "type": "multicheckbox",
+        "templateOptions": {
           "options": [
             {
               "label": "patron",
@@ -475,17 +477,7 @@
               "label": "pro_library_administrator",
               "value": "pro_library_administrator"
             }
-          ]
-        }
-      },
-      "form": {
-        "validation": {
-          "messages": {
-            "roleMessage": "This user has already a professional role in another organisation. A user can be professional only in one organisation."
-          }
-        },
-        "fieldMap": "roles",
-        "templateOptions": {
+          ],
           "wrappers": [
             "card"
           ]