From f678a708427559a5d2e054b24cc97c2c7beb84fa Mon Sep 17 00:00:00 2001 From: pdelboca Date: Mon, 30 May 2022 10:12:52 +0200 Subject: [PATCH] Use toolkit to access action --- ckanext/googleanalytics/controller.py | 3 +-- ckanext/googleanalytics/views.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ckanext/googleanalytics/controller.py b/ckanext/googleanalytics/controller.py index 3104c49..0777fd7 100644 --- a/ckanext/googleanalytics/controller.py +++ b/ckanext/googleanalytics/controller.py @@ -4,7 +4,6 @@ import logging from ckan.lib.base import BaseController, c, render, request from . import dbutil -import ckan.logic as logic import hashlib from . import plugin @@ -56,7 +55,7 @@ class GAApiController(ApiController): def action(self, logic_function, ver=None): try: - function = logic.get_action(logic_function) + function = tk.get_action(logic_function) side_effect_free = getattr(function, "side_effect_free", False) request_data = self._get_request_data( try_url_params=side_effect_free diff --git a/ckanext/googleanalytics/views.py b/ckanext/googleanalytics/views.py index 392e613..904d76e 100644 --- a/ckanext/googleanalytics/views.py +++ b/ckanext/googleanalytics/views.py @@ -7,7 +7,6 @@ import six from flask import Blueprint from werkzeug.utils import import_string -import ckan.logic as logic import ckan.plugins.toolkit as tk import ckan.views.api as api import ckan.views.resource as resource @@ -22,7 +21,7 @@ ga = Blueprint("google_analytics", "google_analytics") def action(logic_function, ver=api.API_MAX_VERSION): try: - function = logic.get_action(logic_function) + function = tk.get_action(logic_function) side_effect_free = getattr(function, "side_effect_free", False) request_data = api._get_request_data(try_url_params=side_effect_free) if isinstance(request_data, dict):