[#1178] Add auth_user_obj back to context in

User controller methods.

ckan/controllers/user.py

@@ -38,7 +38,8 @@ class UserController(base.BaseController):
     def __before__(self, action, **env):
         base.BaseController.__before__(self, action, **env)
         try:
-            context = {'model': model, 'user': c.user or c.author}
+            context = {'model': model, 'user': c.user or c.author,
+                       'auth_user_obj': c.userobj}
             check_access('site_read', context)
         except NotAuthorized:
             if c.action not in ('login', 'request_reset', 'perform_reset',):
@@ -89,7 +90,8 @@ def index(self):
         c.q = request.params.get('q', '')
         c.order_by = request.params.get('order_by', 'name')
 
-        context = {'return_query': True}
+        context = {'return_query': True, 'user': c.user or c.author,
+                   'auth_user_obj': c.userobj}
 
         data_dict = {'q': c.q,
                      'order_by': c.order_by}
@@ -111,7 +113,8 @@ def index(self):
 
     def read(self, id=None):
         context = {'model': model, 'session': model.Session,
-                   'user': c.user or c.author, 'for_view': True}
+                   'user': c.user or c.author, 'auth_user_obj': c.userobj,
+                   'for_view': True}
         data_dict = {'id': id,
                      'user_obj': c.userobj}
         try:
@@ -140,7 +143,8 @@ def me(self, locale=None):
                       id=user_ref)
 
     def register(self, data=None, errors=None, error_summary=None):
-        context = {'model': model, 'session': model.Session, 'user': c.user}
+        context = {'model': model, 'session': model.Session, 'user': c.user,
+                   'auth_user_obj': c.userobj}
         try:
             check_access('user_create', context)
         except NotAuthorized:
@@ -154,6 +158,7 @@ def new(self, data=None, errors=None, error_summary=None):
         '''
         context = {'model': model, 'session': model.Session,
                    'user': c.user or c.author,
+                   'auth_user_obj': c.userobj,
                    'schema': self._new_form_to_db_schema(),
                    'save': 'save' in request.params}
 
@@ -182,7 +187,8 @@ def delete(self, id):
         '''Delete user with id passed as parameter'''
         context = {'model': model,
                    'session': model.Session,
-                   'user': c.user}
+                   'user': c.user,
+                   'auth_user_obj': c.userobj}
         data_dict = {'id': id}
 
         try:
@@ -234,7 +240,7 @@ def edit(self, id=None, data=None, errors=None, error_summary=None):
         context = {'save': 'save' in request.params,
                    'schema': self._edit_form_to_db_schema(),
                    'model': model, 'session': model.Session,
-                   'user': c.user,
+                   'user': c.user, 'auth_user_obj': c.userobj
                    }
         if id is None:
             if c.userobj:
@@ -391,7 +397,8 @@ def logged_out_page(self):
         return render('user/logout.html')
 
     def request_reset(self):
-        context = {'model': model, 'session': model.Session, 'user': c.user}
+        context = {'model': model, 'session': model.Session, 'user': c.user,
+                   'auth_user_obj': c.userobj}
         data_dict = {'id': request.params.get('user')}
         try:
             check_access('request_reset', context)
@@ -511,7 +518,8 @@ def _get_form_password(self):
         raise ValueError(_('You must provide a password'))
 
     def followers(self, id=None):
-        context = {'for_view': True}
+        context = {'for_view': True, 'user': c.user or c.author,
+                   'auth_user_obj': c.userobj}
         data_dict = {'id': id, 'user_obj': c.userobj}
         self._setup_template_variables(context, data_dict)
         f = get_action('user_follower_list')
@@ -525,7 +533,8 @@ def activity(self, id, offset=0):
         '''Render this user's public activity stream page.'''
 
         context = {'model': model, 'session': model.Session,
-                   'user': c.user or c.author, 'for_view': True}
+                   'user': c.user or c.author, 'auth_user_obj': c.userobj,
+                   'for_view': True}
         data_dict = {'id': id, 'user_obj': c.userobj}
         try:
             check_access('user_show', context, data_dict)
@@ -553,7 +562,8 @@ def display_name(followee):
         if (filter_type and filter_id):
             context = {
                 'model': model, 'session': model.Session,
-                'user': c.user or c.author, 'for_view': True
+                'user': c.user or c.author, 'auth_user_obj': c.userobj,
+                'for_view': True
             }
             data_dict = {'id': filter_id}
             followee = None
@@ -595,7 +605,8 @@ def display_name(followee):
 
     def dashboard(self, id=None, offset=0):
         context = {'model': model, 'session': model.Session,
-                   'user': c.user or c.author, 'for_view': True}
+                   'user': c.user or c.author, 'auth_user_obj': c.userobj,
+                   'for_view': True}
         data_dict = {'id': id, 'user_obj': c.userobj, 'offset': offset}
         self._setup_template_variables(context, data_dict)
 
@@ -618,19 +629,22 @@ def dashboard(self, id=None, offset=0):
         return render('user/dashboard.html')
 
     def dashboard_datasets(self):
-        context = {'for_view': True}
+        context = {'for_view': True, 'user': c.user or c.author,
+                   'auth_user_obj': c.userobj}
         data_dict = {'user_obj': c.userobj}
         self._setup_template_variables(context, data_dict)
         return render('user/dashboard_datasets.html')
 
     def dashboard_organizations(self):
-        context = {'for_view': True}
+        context = {'for_view': True, 'user': c.user or c.author,
+                   'auth_user_obj': c.userobj}
         data_dict = {'user_obj': c.userobj}
         self._setup_template_variables(context, data_dict)
         return render('user/dashboard_organizations.html')
 
     def dashboard_groups(self):
-        context = {'for_view': True}
+        context = {'for_view': True, 'user': c.user or c.author,
+                   'auth_user_obj': c.userobj}
         data_dict = {'user_obj': c.userobj}
         self._setup_template_variables(context, data_dict)
         return render('user/dashboard_groups.html')
@@ -639,7 +653,8 @@ def follow(self, id):
         '''Start following this user.'''
         context = {'model': model,
                    'session': model.Session,
-                   'user': c.user or c.author}
+                   'user': c.user or c.author,
+                   'auth_user_obj': c.userobj}
         data_dict = {'id': id}
         try:
             get_action('follow_user')(context, data_dict)
@@ -658,7 +673,8 @@ def unfollow(self, id):
         '''Stop following this user.'''
         context = {'model': model,
                    'session': model.Session,
-                   'user': c.user or c.author}
+                   'user': c.user or c.author,
+                   'auth_user_obj': c.userobj}
         data_dict = {'id': id}
         try:
             get_action('unfollow_user')(context, data_dict)