From 293534b408be6eaf800551ee4e42794f8aaaf65c Mon Sep 17 00:00:00 2001 From: tobes Date: Mon, 19 Nov 2012 13:45:54 +0000 Subject: [PATCH] [#2939] Fix group controller for auth changesw --- ckan/controllers/group.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ckan/controllers/group.py b/ckan/controllers/group.py index 536c5f2fd1d..63b630be23d 100644 --- a/ckan/controllers/group.py +++ b/ckan/controllers/group.py @@ -167,12 +167,11 @@ def read(self, id): _("Cannot render description") c.description_formatted = genshi.HTML(error_msg) - c.group_admins = ckan.new_authz.get_group_or_org_admin_ids(c.group.id) context['return_query'] = True # c.group_admins is used by CKAN's legacy (Genshi) templates only, # if we drop support for those then we can delete this line. - c.group_admins = self.authorizer.get_admins(c.group) + c.group_admins = ckan.new_authz.get_group_or_org_admin_ids(c.group.id) limit = 20 try: @@ -667,7 +666,7 @@ def followers(self, id): def admins(self, id): context = self._get_group_dict(id) - c.admins = self.authorizer.get_admins(context['group']) + c.admins = ckan.new_authz.get_group_or_org_admin_ids(context['group']['id']) return render('group/admins.html') def about(self, id): @@ -681,7 +680,7 @@ def _get_group_dict(self, id): data_dict = {'id': id} try: c.group_dict = get_action('group_show')(context, data_dict) - c.admins = self.authorizer.get_admins(context['group']) + c.admins = ckan.new_authz.get_group_or_org_admin_ids(context['group']['id']) except NotFound: abort(404, _('Group not found')) except NotAuthorized: