Mercurial > kallithea
changeset 5262:b41bdfdb3b16
AuthSettingsController: refactor rendering
Instead of having one controller method ('auth_settings', which handles
POST) call another controller method ('index', which handles GET), have
both methods call a third, common '__render' method.
This makes it clear which arguments 'index' really takes (none). It's
also seen that the 'prefix_error' argument is always False, so it can
be removed. Finally, '__load_defaults' is no longer called twice when
POSTing invalid form values.
author | Søren Løvborg <kwi@kwi.dk> |
---|---|
date | Tue, 14 Jul 2015 13:59:59 +0200 |
parents | 46011fe63e75 |
children | 64eba8fcde2b |
files | kallithea/controllers/admin/auth_settings.py |
diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/auth_settings.py Tue Jul 14 13:59:59 2015 +0200 +++ b/kallithea/controllers/admin/auth_settings.py Tue Jul 14 13:59:59 2015 +0200 @@ -60,9 +60,7 @@ ] c.enabled_plugins = Setting.get_auth_plugins() - def index(self, defaults=None, errors=None, prefix_error=False): - self.__load_defaults() - + def __render(self, defaults, errors): c.defaults = {} c.plugin_settings = {} c.plugin_shortnames = {} @@ -91,10 +89,14 @@ render('admin/auth/auth_settings.html'), defaults=c.defaults, errors=errors, - prefix_error=prefix_error, + prefix_error=False, encoding="UTF-8", force_defaults=False) + def index(self): + self.__load_defaults() + return self.__render(defaults=None, errors=None) + def auth_settings(self): """POST create and store auth settings""" self.__load_defaults() @@ -116,10 +118,10 @@ except formencode.Invalid, errors: log.error(traceback.format_exc()) e = errors.error_dict or {} - return self.index( + return self.__render( defaults=errors.value, errors=e, - prefix_error=False) + ) except Exception: log.error(traceback.format_exc()) h.flash(_('error occurred during update of auth settings'),