*** Wartungsfenster jeden ersten Mittwoch vormittag im Monat ***

Skip to content
Snippets Groups Projects
Commit f9b1f9f9 authored by Moser, Maximilian's avatar Moser, Maximilian
Browse files

Move the search_drafts options override to startup from ext

parent 8b409a2f
Branches
No related tags found
1 merge request!66Move the search_drafts options override to startup from ext
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
from flask.config import Config from flask.config import Config
from flask_minify import Minify from flask_minify import Minify
from flask_security.signals import user_registered from flask_security.signals import user_registered
from invenio_rdm_records.services.search_params import MyDraftsParam
from . import config from . import config
from .auth.utils import auto_trust_user from .auth.utils import auto_trust_user
...@@ -48,18 +47,6 @@ def auto_trust_new_user(sender, user, **kwargs): ...@@ -48,18 +47,6 @@ def auto_trust_new_user(sender, user, **kwargs):
auto_trust_user(user) auto_trust_user(user)
def override_search_drafts_options(app):
"""Override the "search drafts" options to show all accessible drafts."""
# doing this via config is (currently) not possible, as the `search_drafts`
# property can't be overridden with a config item (unlike `search`, above it)
# cf. https://github.com/inveniosoftware/invenio-rdm-records/blob/maint-10.x/invenio_rdm_records/services/config.py#L327-L332
try:
service = app.extensions["invenio-rdm-records"].records_service
service.config.search_drafts.params_interpreters_cls.remove(MyDraftsParam)
except ValueError:
pass
class InvenioConfigTUW(object): class InvenioConfigTUW(object):
"""Invenio-Config-TUW extension.""" """Invenio-Config-TUW extension."""
......
...@@ -20,6 +20,7 @@ from flask import Blueprint, current_app, flash, render_template, request ...@@ -20,6 +20,7 @@ from flask import Blueprint, current_app, flash, render_template, request
from flask_login import current_user, login_required from flask_login import current_user, login_required
from flask_menu import register_menu from flask_menu import register_menu
from invenio_db import db from invenio_db import db
from invenio_rdm_records.services.search_params import MyDraftsParam
from .curation import CurationForm from .curation import CurationForm
from .formatters import CustomFormatter from .formatters import CustomFormatter
...@@ -83,6 +84,18 @@ def register_smtp_error_handler(app): ...@@ -83,6 +84,18 @@ def register_smtp_error_handler(app):
) )
def override_search_drafts_options(app):
"""Override the "search drafts" options to show all accessible drafts."""
# doing this via config is (currently) not possible, as the `search_drafts`
# property can't be overridden with a config item (unlike `search`, above it)
# cf. https://github.com/inveniosoftware/invenio-rdm-records/blob/maint-10.x/invenio_rdm_records/services/config.py#L327-L332
try:
service = app.extensions["invenio-rdm-records"].records_service
service.config.search_drafts.params_interpreters_cls.remove(MyDraftsParam)
except ValueError:
pass
def create_curation_settings_blueprint(app): def create_curation_settings_blueprint(app):
"""Register the curation settings view after the app has been initialized. """Register the curation settings view after the app has been initialized.
......
...@@ -72,11 +72,11 @@ invenio_config_tuw_settings = "invenio_config_tuw.startup:create_curation_settin ...@@ -72,11 +72,11 @@ invenio_config_tuw_settings = "invenio_config_tuw.startup:create_curation_settin
[project.entry-points."invenio_base.finalize_app"] [project.entry-points."invenio_base.finalize_app"]
invenio_config_tuw_mail_handler = "invenio_config_tuw.startup:register_smtp_error_handler" invenio_config_tuw_mail_handler = "invenio_config_tuw.startup:register_smtp_error_handler"
invenio_config_tuw_search_drafts = "invenio_config_tuw.ext:override_search_drafts_options" invenio_config_tuw_search_drafts = "invenio_config_tuw.startup:override_search_drafts_options"
[project.entry-points."invenio_base.api_finalize_app"] [project.entry-points."invenio_base.api_finalize_app"]
invenio_config_tuw_mail_handler = "invenio_config_tuw.startup:register_smtp_error_handler" invenio_config_tuw_mail_handler = "invenio_config_tuw.startup:register_smtp_error_handler"
invenio_config_tuw_search_drafts = "invenio_config_tuw.ext:override_search_drafts_options" invenio_config_tuw_search_drafts = "invenio_config_tuw.startup:override_search_drafts_options"
[project.entry-points."invenio_celery.tasks"] [project.entry-points."invenio_celery.tasks"]
invenio_config_tuw = "invenio_config_tuw.tasks" invenio_config_tuw = "invenio_config_tuw.tasks"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment