Mercurial > kallithea
changeset 4941:c04c2734e32f
controllers: consistently use formfill.render with force_defaults=False
The inconsistency could cause confusion for developers. It seems to me like
force_defaults=False should be the default ... and apparently it was that in
older versions of formfill.
It could perhaps make sense for us to have a wrapper that added the defualt
values once, instead of repeating it all over ;-)
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 25 Mar 2015 20:38:09 +0100 |
| parents | 75f4d8e84b81 |
| children | 65c5e70a1d0c |
| files | kallithea/controllers/admin/auth_settings.py kallithea/controllers/admin/defaults.py kallithea/controllers/admin/gists.py kallithea/controllers/admin/my_account.py kallithea/controllers/admin/permissions.py kallithea/controllers/admin/repo_groups.py kallithea/controllers/admin/repos.py kallithea/controllers/admin/settings.py kallithea/controllers/admin/user_groups.py kallithea/controllers/admin/users.py kallithea/controllers/forks.py kallithea/controllers/login.py |
| diffstat | 12 files changed, 44 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/auth_settings.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/auth_settings.py Wed Mar 25 20:38:09 2015 +0100 @@ -104,8 +104,7 @@ errors=errors, prefix_error=prefix_error, encoding="UTF-8", - force_defaults=True, - ) + force_defaults=False) def auth_settings(self): """POST create and store auth settings"""
--- a/kallithea/controllers/admin/defaults.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/defaults.py Wed Mar 25 20:38:09 2015 +0100 @@ -105,7 +105,8 @@ defaults=defaults, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during update of defaults'),
--- a/kallithea/controllers/admin/gists.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/gists.py Wed Mar 25 20:38:09 2015 +0100 @@ -138,8 +138,8 @@ defaults=defaults, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8" - ) + encoding="UTF-8", + force_defaults=False) except Exception, e: log.error(traceback.format_exc())
--- a/kallithea/controllers/admin/my_account.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/my_account.py Wed Mar 25 20:38:09 2015 +0100 @@ -136,7 +136,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during update of user %s') \ @@ -147,8 +148,7 @@ render('admin/my_account/my_account.html'), defaults=defaults, encoding="UTF-8", - force_defaults=False - ) + force_defaults=False) def my_account_password(self): c.active = 'password' @@ -166,7 +166,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during update of user password'),
--- a/kallithea/controllers/admin/permissions.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/permissions.py Wed Mar 25 20:38:09 2015 +0100 @@ -133,7 +133,8 @@ defaults=defaults, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during update of permissions'),
--- a/kallithea/controllers/admin/repo_groups.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/repo_groups.py Wed Mar 25 20:38:09 2015 +0100 @@ -190,7 +190,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during creation of repository group %s') \ @@ -263,7 +264,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during update of repository group %s') \
--- a/kallithea/controllers/admin/repos.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/repos.py Wed Mar 25 20:38:09 2015 +0100 @@ -155,6 +155,7 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, + force_defaults=False, encoding="UTF-8") except Exception: @@ -203,8 +204,8 @@ defaults=defaults, errors={}, prefix_error=False, - encoding="UTF-8" - ) + encoding="UTF-8", + force_defaults=False) @LoginRequired() @NotAnonymous() @@ -300,7 +301,8 @@ defaults=defaults, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc())
--- a/kallithea/controllers/admin/settings.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/settings.py Wed Mar 25 20:38:09 2015 +0100 @@ -100,8 +100,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8" - ) + encoding="UTF-8", + force_defaults=False) try: sett = Ui.get_by_key('push_ssl') @@ -241,7 +241,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) try: sett1 = Setting.create_or_update('title', @@ -300,8 +301,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8" - ) + encoding="UTF-8", + force_defaults=False) try: settings = [
--- a/kallithea/controllers/admin/user_groups.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/user_groups.py Wed Mar 25 20:38:09 2015 +0100 @@ -156,7 +156,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during creation of user group %s') \ @@ -216,7 +217,8 @@ defaults=defaults, errors=e, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during update of user group %s') \
--- a/kallithea/controllers/admin/users.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/admin/users.py Wed Mar 25 20:38:09 2015 +0100 @@ -138,7 +138,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except UserCreationError, e: h.flash(e, 'error') except Exception: @@ -198,7 +199,8 @@ defaults=defaults, errors=e, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('Error occurred during update of user %s') \
--- a/kallithea/controllers/forks.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/forks.py Wed Mar 25 20:38:09 2015 +0100 @@ -145,8 +145,7 @@ render('forks/fork.html'), defaults=defaults, encoding="UTF-8", - force_defaults=False - ) + force_defaults=False) @LoginRequired() @NotAnonymous() @@ -181,7 +180,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except Exception: log.error(traceback.format_exc()) h.flash(_('An error occurred during repository forking %s') %
--- a/kallithea/controllers/login.py Wed Mar 25 20:38:09 2015 +0100 +++ b/kallithea/controllers/login.py Wed Mar 25 20:38:09 2015 +0100 @@ -134,7 +134,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except UserCreationError, e: # container auth or other auth functions that create users on # the fly can throw this exception signaling that there's issue @@ -201,7 +202,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) except UserCreationError, e: # container auth or other auth functions that create users on # the fly can throw this exception signaling that there's issue @@ -244,7 +246,8 @@ defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8") + encoding="UTF-8", + force_defaults=False) return render('/password_reset.html')