From 0c65d1f66b1043f035cc42a58467065cbd9ab411 Mon Sep 17 00:00:00 2001
From: Thorge Petersen <petersen@rz.uni-kiel.de>
Date: Fri, 20 Oct 2023 14:29:56 +0200
Subject: [PATCH] Removed activities feature because it has been extracted into
a separate activity plugin
---
CHANGELOG.md | 1 +
ckanext/odsh/plugin.py | 2 --
ckanext/odsh/views/user.py | 9 ---------
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 236432bd..87b97cf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Completely removed data requests.
- Avoided the usage of the global context variable c where possible.
- Removed deprecated subject mappings JSON template.
+- Removed deprecated activities feature (CKAN activities have been extracted into a separate activity plugin).
### Changed
diff --git a/ckanext/odsh/plugin.py b/ckanext/odsh/plugin.py
index ef6c5b53..ee6126c9 100644
--- a/ckanext/odsh/plugin.py
+++ b/ckanext/odsh/plugin.py
@@ -74,8 +74,6 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
bp_user.add_url_rule(u'/user', endpoint='user_index',
view_func=user.index, strict_slashes=False)
# bp_user.add_url_rule(u'/user/register', view_func=user.register)
- bp_user.add_url_rule(u'/user/activity/<id>', view_func=user.activity)
- bp_user.add_url_rule(u'/user/activity/<id>/<int:offset>', view_func=user.activity)
# Dashboard
bp_dashboard = dashboard.blueprint
diff --git a/ckanext/odsh/views/user.py b/ckanext/odsh/views/user.py
index 4c3e0874..7963a52e 100644
--- a/ckanext/odsh/views/user.py
+++ b/ckanext/odsh/views/user.py
@@ -33,12 +33,3 @@ def read(id=None):
if not g.user:
return ckan_user_view.login()
return ckan_user_view.read(id)
-
-
-def activity(id, offset=0):
- log.debug("views.user::activity")
- is_sysadmin = authz.is_sysadmin(g.user)
-
- if not is_sysadmin:
- toolkit.abort(403)
- return ckan_user_view.activity(id, offset)
--
GitLab