From b957645133496248d618985af6578f570c096fd4 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 10 Apr 2013 09:10:11 +0100
Subject: [PATCH] Ckan test helper - minor core fixes needed

---
 ckan/logic/action/create.py                |  2 +-
 ckan/logic/auth/create.py                  | 10 +++++-----
 ckan/logic/auth/update.py                  |  2 +-
 ckan/new_authz.py                          | 10 ----------
 ckanext/example_itemplatehelpers/plugin.py |  3 ++-
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py
index df259500790..b73c1962a90 100644
--- a/ckan/logic/action/create.py
+++ b/ckan/logic/action/create.py
@@ -773,7 +773,7 @@ def user_create(context, data_dict):
 
     activity_create_context = {
         'model': model,
-        'user': context['user'],
+        'user': context.get('user'),
         'defer_commit': True,
         'session': session
     }
diff --git a/ckan/logic/auth/create.py b/ckan/logic/auth/create.py
index 64d5cc3e150..d565a04c17c 100644
--- a/ckan/logic/auth/create.py
+++ b/ckan/logic/auth/create.py
@@ -5,8 +5,8 @@
 
 
 def package_create(context, data_dict=None):
-    user = context['user']
-    if not new_authz.auth_is_registered_user():
+    user = context.get('user')
+    if not user:
         check1 = new_authz.check_config_permission('anon_create_dataset')
     else:
         check1 = new_authz.check_config_permission('create_dataset_if_not_in_organization') \
@@ -23,8 +23,8 @@ def package_create(context, data_dict=None):
     return {'success': True}
 
 def file_upload(context, data_dict=None):
-    user = context['user']
-    if not new_authz.auth_is_registered_user():
+    user = context.get('user')
+    if not user:
         return {'success': False, 'msg': _('User %s not authorized to create packages') % user}
     return {'success': True}
 
@@ -96,10 +96,10 @@ def rating_create(context, data_dict):
     return {'success': True}
 
 def user_create(context, data_dict=None):
-    user = context['user']
 
     if ('api_version' in context
             and not new_authz.check_config_permission('create_user_via_api')):
+        user = context['user']
         return {'success': False, 'msg': _('User %s not authorized to create users') % user}
     else:
         return {'success': True}
diff --git a/ckan/logic/auth/update.py b/ckan/logic/auth/update.py
index 0a17ad43822..c3dee2974ad 100644
--- a/ckan/logic/auth/update.py
+++ b/ckan/logic/auth/update.py
@@ -23,7 +23,7 @@ def package_update(context, data_dict):
         )
     else:
         # If dataset is not owned then we can edit if config permissions allow
-        if new_authz.auth_is_registered_user():
+        if user:
             check1 = new_authz.check_config_permission(
                 'create_dataset_if_not_in_organization')
         else:
diff --git a/ckan/new_authz.py b/ckan/new_authz.py
index 94166741e5d..bc2389441dd 100644
--- a/ckan/new_authz.py
+++ b/ckan/new_authz.py
@@ -292,13 +292,3 @@ def check_config_permission(permission):
     if permission in CONFIG_PERMISSIONS:
         return CONFIG_PERMISSIONS[permission]
     return False
-
-
-
-def auth_is_registered_user():
-    ''' Do we have a logged in user '''
-    try:
-        context_user = c.user
-    except TypeError:
-        context_user = None
-    return bool(context_user)
diff --git a/ckanext/example_itemplatehelpers/plugin.py b/ckanext/example_itemplatehelpers/plugin.py
index 5c7d6bcbf12..d940e292c2f 100644
--- a/ckanext/example_itemplatehelpers/plugin.py
+++ b/ckanext/example_itemplatehelpers/plugin.py
@@ -5,7 +5,8 @@ def example_helper():
     '''An example template helper function.'''
 
     # Just return some example text.
-    return 'This is some example text.'
+    html = '<span class="example_itemplate">This is some example text.</span>'
+    return plugins.toolkit.literal(html)
 
 class ExampleITemplateHelpersPlugin(plugins.SingletonPlugin):
     '''An example that shows how to use the ITemplateHelpers plugin interface.