diff --git a/VERSION b/VERSION index abf6ec6a..1f2f31f5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-08-19 15:11:01) dev +Version 2.00.0 (2012-08-19 18:20:11) dev diff --git a/gluon/fileutils.py b/gluon/fileutils.py index b8878019..28ef4a8f 100644 --- a/gluon/fileutils.py +++ b/gluon/fileutils.py @@ -338,7 +338,6 @@ def check_credentials(request, other_application='admin', expiration = 60*60): s = get_session(request, other_application) return (s.authorized and s.last_time and s.last_time > dt) - def fix_newlines(path): regex = re.compile(r'''(\r |\r| diff --git a/gluon/tools.py b/gluon/tools.py index 7bce45da..476da1e8 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -28,7 +28,7 @@ from email import MIMEBase, MIMEMultipart, MIMEText, Encoders, Header, message_f from contenttype import contenttype from storage import Storage, StorageList, Settings, Messages from utils import web2py_uuid -from fileutils import read_file +from fileutils import read_file, check_credentials from gluon import * from gluon.contrib.autolinks import expand_one @@ -4519,6 +4519,11 @@ class Wiki(object): if tag: db.wiki_tag.insert(name=tag,wiki_page=page.id) db.wiki_page._after_insert.append(update_tags_insert) db.wiki_page._after_update.append(update_tags_update) + if check_credentials(current.request) and \ + not 'wiki_editor' in auth.user_groups.values(): + group = db.auth_group(role='wiki_editor') + gid = group.id if group else db.auth_group.insert(role='wiki_editor') + auth.add_membership(gid) # WIKI ACCESS POLICY def not_authorized(self,page=None): raise HTTP(401)