Merge branch 'master' into recordlandingpage_funding-display

Author: karkraeg

invenio_app_rdm/__init__.py

@@ -17,6 +17,6 @@
 #
 # See PEP 0440 for details - https://www.python.org/dev/peps/pep-0440
 
-__version__ = "13.0.0b1.dev17"
+__version__ = "13.0.0b1.dev18"
 
 __all__ = ("__version__",)

invenio_app_rdm/config.py

@@ -429,6 +429,10 @@ def files_rest_permission_factory(obj, action):
         "task": "invenio_accounts.tasks.delete_ips",
         "schedule": timedelta(hours=6),
     },
+    "update_domain_status": {
+        "task": "invenio_accounts.tasks.update_domain_status",
+        "schedule": timedelta(hours=4),
+    },
     "draft_resources": {
         "task": ("invenio_drafts_resources.services.records.tasks.cleanup_drafts"),
         "schedule": timedelta(minutes=60),

invenio_app_rdm/records_ui/views/deposits.py

@@ -291,6 +291,9 @@ def load_custom_fields():
             if field_error_label:
                 error_labels[f"custom_fields.{field['field']}"] = field_error_label
             if getattr(field_instance, "relation_cls", None):
+                sort_by = field.get("props", {}).get("sort_by")
+                if sort_by:
+                    field_instance.sort_by = sort_by
                 # add vocabulary options to field's properties
                 field["props"]["options"] = field_instance.options(g.identity)
                 # mark field as vocabulary