if user_group_name is None, user_group_role is also None
This commit is contained in:
1 parent
18d97c0609
commit
827ea1808a
2 files changed
+5
-2
No files matched your search
@@ -1 +1 @@
|
||||
Version 2.2.1 (2012-10-29 11:35:59) stable
|
||||
Version 2.2.1 (2012-10-29 14:00:21) stable
|
||||
+4
-1
@@ -2987,6 +2987,8 @@ 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:
|
||||
@@ -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':
|
||||
|
||||
Reference in new issue
Block a user