From 2df17aba554986cfd4415a8e07a78dbc4973fc32 Mon Sep 17 00:00:00 2001 From: tobes Date: Sat, 13 Apr 2013 12:34:39 +0100 Subject: [PATCH] Improve logic/auth/__init__.py bad logic (data_dict={}) --- ckan/logic/auth/__init__.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/ckan/logic/auth/__init__.py b/ckan/logic/auth/__init__.py index 66062ead609..500be7fef3f 100644 --- a/ckan/logic/auth/__init__.py +++ b/ckan/logic/auth/__init__.py @@ -2,33 +2,41 @@ Helper functions to be used in the auth check functions ''' -from ckan.logic import NotFound +import ckan.logic as logic + def _get_object(context, data_dict, name, class_name): # return the named item if in the data_dict, or get it from # model.class_name + if not data_dict: + data_dict = {} + if not name in context: model = context['model'] id = data_dict.get('id', None) obj = getattr(model, class_name).get(id) if not obj: - raise NotFound + raise logic.NotFound else: obj = context[name] return obj -def get_related_object(context, data_dict = {}): + +def get_related_object(context, data_dict=None): return _get_object(context, data_dict, 'related', 'Related') -def get_package_object(context, data_dict = {}): + +def get_package_object(context, data_dict=None): return _get_object(context, data_dict, 'package', 'Package') -def get_resource_object(context, data_dict={}): + +def get_resource_object(context, data_dict=None): return _get_object(context, data_dict, 'resource', 'Resource') -def get_group_object(context, data_dict={}): + +def get_group_object(context, data_dict=None): return _get_object(context, data_dict, 'group', 'Group') -def get_user_object(context, data_dict={}): - return _get_object(context, data_dict, 'user_obj', 'User') +def get_user_object(context, data_dict=None): + return _get_object(context, data_dict, 'user_obj', 'User')