diff --git a/VERSION b/VERSION index a7995b31..fde42951 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.05.11.22.10.09 +Version 2.4.6-stable+timestamp.2013.05.12.10.26.52 diff --git a/gluon/tools.py b/gluon/tools.py index 5fe547a1..c716dd44 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -891,6 +891,7 @@ class Auth(object): on_failed_authentication=lambda x: redirect(x), formstyle="table3cols", label_separator=": ", + allow_delete_accounts=False, password_field='password', table_user_name='auth_user', table_group_name='auth_group', @@ -2862,11 +2863,13 @@ class Auth(object): delete_label=self.messages.delete_label, upload=self.settings.download_url, formstyle=self.settings.formstyle, - separator=self.settings.label_separator + separator=self.settings.label_separator, + deletable=self.settings.allow_delete_accounts, ) if form.accepts(request, session, formname='profile', - onvalidation=onvalidation, hideerror=self.settings.hideerror): + onvalidation=onvalidation, + hideerror=self.settings.hideerror): self.user.update(table_user._filter_fields(form.vars)) session.flash = self.messages.profile_updated self.log_event(log, self.user)