From b7dd13e54a3a9d10802cc2963fbbca3fb315d240 Mon Sep 17 00:00:00 2001 From: Alex Green Date: Wed, 19 Jun 2024 02:14:34 +0000 Subject: [PATCH] Add hx-target to pagination buttons --- ckan/common.py | 4 ++-- ckan/lib/captcha.py | 5 ++--- ckan/views/admin.py | 2 +- ckanext/activity/templates/group/activity_stream.html | 10 +++++++++- .../templates/organization/activity_stream.html | 10 +++++++++- .../activity/templates/package/activity_stream.html | 10 +++++++++- ckanext/activity/templates/snippets/pagination.html | 2 +- 7 files changed, 33 insertions(+), 10 deletions(-) diff --git a/ckan/common.py b/ckan/common.py index 32aaf51f2d7..0f04eccadb1 100644 --- a/ckan/common.py +++ b/ckan/common.py @@ -212,7 +212,7 @@ def params(self): request.args ''' - return cast(flask.Request, self).args + return self.args def _get_c(): @@ -327,7 +327,7 @@ def repr_untrusted(danger: Any): config_declaration = local.config_declaration = Declaration() # Proxies to already thread-local safe objects -request = cast(flask.Request, CKANRequest(_get_request)) +request = CKANRequest(_get_request) # Provide a `c` alias for `g` for backwards compatibility g: Any = LocalProxy(_get_c) c = g diff --git a/ckan/lib/captcha.py b/ckan/lib/captcha.py index d4f0227c9dc..eecc852d531 100644 --- a/ckan/lib/captcha.py +++ b/ckan/lib/captcha.py @@ -2,11 +2,10 @@ import requests -from ckan.common import config -from ckan.types import Request +from ckan.common import config, CKANRequest -def check_recaptcha(request: Request) -> None: +def check_recaptcha(request: CKANRequest) -> None: '''Check a user's recaptcha submission is valid, and raise CaptchaError on failure.''' recaptcha_private_key = config.get('ckan.recaptcha.privatekey') diff --git a/ckan/views/admin.py b/ckan/views/admin.py index 3a6a963223d..248a41a6824 100644 --- a/ckan/views/admin.py +++ b/ckan/views/admin.py @@ -86,7 +86,7 @@ def get(self) -> str: def post(self) -> Union[str, Response]: try: - req: dict[str, Any] = request.form.copy() + req = request.form.copy() req.update(request.files.to_dict()) data_dict = logic.clean_dict( dict_fns.unflatten( diff --git a/ckanext/activity/templates/group/activity_stream.html b/ckanext/activity/templates/group/activity_stream.html index 66b10f0740f..f6e4dc08ed1 100644 --- a/ckanext/activity/templates/group/activity_stream.html +++ b/ckanext/activity/templates/group/activity_stream.html @@ -3,5 +3,13 @@ {% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %} {% block primary_content_inner %} - {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='group', group_type=group_type, activity_types=activity_types, blueprint='activity.group_activity' %} + {% snippet 'snippets/activity_stream.html', + activity_stream=activity_stream, + id=id, + object_type='group', + group_type=group_type, + activity_types=activity_types, + blueprint='activity.group_activity', + newer_activities_url=newer_activities_url, + older_activities_url=older_activities_url %} {% endblock primary_content_inner %} \ No newline at end of file diff --git a/ckanext/activity/templates/organization/activity_stream.html b/ckanext/activity/templates/organization/activity_stream.html index 09330c4b1c4..a2685b37ef8 100644 --- a/ckanext/activity/templates/organization/activity_stream.html +++ b/ckanext/activity/templates/organization/activity_stream.html @@ -3,5 +3,13 @@ {% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %} {% block primary_content_inner %} - {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='organization', group_type=group_type, activity_types=activity_types, blueprint='activity.organization_activity' %} + {% snippet 'snippets/activity_stream.html', + activity_stream=activity_stream, + id=id, + object_type='organization', + group_type=group_type, + activity_types=activity_types, + blueprint='activity.organization_activity', + newer_activities_url=newer_activities_url, + older_activities_url=older_activities_url %} {% endblock primary_content_inner %} \ No newline at end of file diff --git a/ckanext/activity/templates/package/activity_stream.html b/ckanext/activity/templates/package/activity_stream.html index 570974f7296..115208fc2e4 100644 --- a/ckanext/activity/templates/package/activity_stream.html +++ b/ckanext/activity/templates/package/activity_stream.html @@ -3,5 +3,13 @@ {% block subtitle %}{{ _('Activity Stream') }} {{ g.template_title_delimiter }} {{ super() }}{% endblock %} {% block primary_content_inner %} - {% snippet 'snippets/activity_stream.html', activity_stream=activity_stream, id=id, object_type='package', group_type=group_type, activity_types=activity_types, blueprint='activity.package_activity' %} + {% snippet 'snippets/activity_stream.html', + activity_stream=activity_stream, + id=id, + object_type='package', + group_type=group_type, + activity_types=activity_types, + blueprint='activity.package_activity', + newer_activities_url=newer_activities_url, + older_activities_url=older_activities_url %} {% endblock primary_content_inner %} \ No newline at end of file diff --git a/ckanext/activity/templates/snippets/pagination.html b/ckanext/activity/templates/snippets/pagination.html index 4b54cc6aa6c..855fbfab66a 100644 --- a/ckanext/activity/templates/snippets/pagination.html +++ b/ckanext/activity/templates/snippets/pagination.html @@ -2,7 +2,7 @@ {% set class_next = "btn btn-default" if older_activities_url else "btn disabled" %} {% if newer_activities_url or older_activities_url %} -
+
{{ _('Newer activities') }}