Skip to content

Commit

Permalink
Improve logic/auth/__init__.py bad logic (data_dict={})
Browse files Browse the repository at this point in the history
  • Loading branch information
tobes committed Apr 13, 2013
1 parent c6f5cc6 commit 2df17ab
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions ckan/logic/auth/__init__.py
Expand Up @@ -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')

0 comments on commit 2df17ab

Please sign in to comment.