From 827ea1808a0af703f5d069b2e5bddec36e531681 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 29 Oct 2012 14:00:29 -0500 Subject: [PATCH] if user_group_name is None, user_group_role is also None --- VERSION | 2 +- gluon/tools.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 42184285..679bb7fc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.2.1 (2012-10-29 11:35:59) stable +Version 2.2.1 (2012-10-29 14:00:21) stable diff --git a/gluon/tools.py b/gluon/tools.py index 0e31f494..4c1e118d 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -2987,10 +2987,12 @@ class Auth(object): return self.id_group(self.user_group_role(user_id)) def user_group_role(self, user_id=None): + if not self.settings.create_user_groups: + return None if user_id: user = self.table_user()[user_id] else: - user = self.user + user = self.user return self.settings.create_user_groups % user def has_membership(self, group_id=None, user_id=None, role=None): @@ -4896,7 +4898,8 @@ class Wiki(object): % self.force_prefix redirect(URL(args=('_edit', self.force_prefix + slug))) db.wiki_page.can_read.default = [Wiki.everybody] - db.wiki_page.can_edit.default = [auth.user_group_role()] + user_group_role = auth.user_group_role() + db.wiki_page.can_edit.default = [user_group_role] db.wiki_page.title.default = title_guess db.wiki_page.slug.default = slug if slug == 'wiki-menu':