Merge tag '20231026_1320_issue3719' into develop

Fixes to form widgets
DOAJ · Oct 26, 2023 · 23a5444 · 23a5444
2 parents 3da3cf3 + e3db96e
commit 23a5444
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/portality/forms/application_forms.py b/portality/forms/application_forms.py
@@ -558,28 +558,37 @@ class FieldDefinitions:
                           "a society or other type of institution, enter that here."],
             "placeholder": "Type or select the society or institution’s name"
         },
-        "contexts" : {
+        "widgets": [
+            "trim_whitespace",  # ~~^-> TrimWhitespace:FormWidget~~
+            {"autocomplete": {"type" : "journal", "field": "bibjson.institution.name.exact"}}, # ~~^-> Autocomplete:FormWidget~~
+            "full_contents" # ~~^->FullContents:FormWidget~~
+        ],
+        "contexts": {
             "admin": {
                 "widgets": [
+                    "trim_whitespace",  # ~~^-> TrimWhitespace:FormWidget~~
+                    {"autocomplete": {"type": "journal", "field": "bibjson.institution.name.exact"}},
+                    # ~~^-> Autocomplete:FormWidget~~
                     "click_to_copy",  # ~~^-> ClickToCopy:FormWidget~~
                 ]
             },
             "associate_editor": {
                 "widgets": [
+                    "trim_whitespace",  # ~~^-> TrimWhitespace:FormWidget~~
+                    {"autocomplete": {"type": "journal", "field": "bibjson.institution.name.exact"}},
+                    # ~~^-> Autocomplete:FormWidget~~
                     "click_to_copy",  # ~~^-> ClickToCopy:FormWidget~~
                 ]
             },
             "editor": {
                 "widgets": [
+                    "trim_whitespace",  # ~~^-> TrimWhitespace:FormWidget~~
+                    {"autocomplete": {"type": "journal", "field": "bibjson.institution.name.exact"}},
+                    # ~~^-> Autocomplete:FormWidget~~
                     "click_to_copy",  # ~~^-> ClickToCopy:FormWidget~~
                 ]
             }
-        },
-        "widgets": [
-            "trim_whitespace",  # ~~^-> TrimWhitespace:FormWidget~~
-            {"autocomplete": {"type" : "journal", "field": "bibjson.institution.name.exact"}}, # ~~^-> Autocomplete:FormWidget~~
-            "full_contents" # ~~^->FullContents:FormWidget~~
-        ]
+        }
     }
 
     # ~~->$ InstitutionCountry:FormField~~