diff --git a/kallithea/controllers/admin/auth_settings.py b/kallithea/controllers/admin/auth_settings.py --- a/kallithea/controllers/admin/auth_settings.py +++ b/kallithea/controllers/admin/auth_settings.py @@ -104,8 +104,7 @@ class AuthSettingsController(BaseControl 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""" diff --git a/kallithea/controllers/admin/defaults.py b/kallithea/controllers/admin/defaults.py --- a/kallithea/controllers/admin/defaults.py +++ b/kallithea/controllers/admin/defaults.py @@ -105,7 +105,8 @@ class DefaultsController(BaseController) 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'), diff --git a/kallithea/controllers/admin/gists.py b/kallithea/controllers/admin/gists.py --- a/kallithea/controllers/admin/gists.py +++ b/kallithea/controllers/admin/gists.py @@ -138,8 +138,8 @@ class GistsController(BaseController): 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()) diff --git a/kallithea/controllers/admin/my_account.py b/kallithea/controllers/admin/my_account.py --- a/kallithea/controllers/admin/my_account.py +++ b/kallithea/controllers/admin/my_account.py @@ -136,7 +136,8 @@ class MyAccountController(BaseController 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 @@ class MyAccountController(BaseController 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 @@ class MyAccountController(BaseController 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'), diff --git a/kallithea/controllers/admin/permissions.py b/kallithea/controllers/admin/permissions.py --- a/kallithea/controllers/admin/permissions.py +++ b/kallithea/controllers/admin/permissions.py @@ -133,7 +133,8 @@ class PermissionsController(BaseControll 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'), diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py --- a/kallithea/controllers/admin/repo_groups.py +++ b/kallithea/controllers/admin/repo_groups.py @@ -190,7 +190,8 @@ class RepoGroupsController(BaseControlle 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 @@ class RepoGroupsController(BaseControlle 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') \ diff --git a/kallithea/controllers/admin/repos.py b/kallithea/controllers/admin/repos.py --- a/kallithea/controllers/admin/repos.py +++ b/kallithea/controllers/admin/repos.py @@ -155,6 +155,7 @@ class ReposController(BaseRepoController defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, + force_defaults=False, encoding="UTF-8") except Exception: @@ -203,8 +204,8 @@ class ReposController(BaseRepoController defaults=defaults, errors={}, prefix_error=False, - encoding="UTF-8" - ) + encoding="UTF-8", + force_defaults=False) @LoginRequired() @NotAnonymous() @@ -300,7 +301,8 @@ class ReposController(BaseRepoController 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()) diff --git a/kallithea/controllers/admin/settings.py b/kallithea/controllers/admin/settings.py --- a/kallithea/controllers/admin/settings.py +++ b/kallithea/controllers/admin/settings.py @@ -100,8 +100,8 @@ class SettingsController(BaseController) 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 @@ class SettingsController(BaseController) 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 @@ class SettingsController(BaseController) defaults=errors.value, errors=errors.error_dict or {}, prefix_error=False, - encoding="UTF-8" - ) + encoding="UTF-8", + force_defaults=False) try: settings = [ diff --git a/kallithea/controllers/admin/user_groups.py b/kallithea/controllers/admin/user_groups.py --- a/kallithea/controllers/admin/user_groups.py +++ b/kallithea/controllers/admin/user_groups.py @@ -156,7 +156,8 @@ class UserGroupsController(BaseControlle 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 @@ class UserGroupsController(BaseControlle 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') \ diff --git a/kallithea/controllers/admin/users.py b/kallithea/controllers/admin/users.py --- a/kallithea/controllers/admin/users.py +++ b/kallithea/controllers/admin/users.py @@ -138,7 +138,8 @@ class UsersController(BaseController): 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 @@ class UsersController(BaseController): 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') \ diff --git a/kallithea/controllers/forks.py b/kallithea/controllers/forks.py --- a/kallithea/controllers/forks.py +++ b/kallithea/controllers/forks.py @@ -145,8 +145,7 @@ class ForksController(BaseRepoController render('forks/fork.html'), defaults=defaults, encoding="UTF-8", - force_defaults=False - ) + force_defaults=False) @LoginRequired() @NotAnonymous() @@ -181,7 +180,8 @@ class ForksController(BaseRepoController 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') % diff --git a/kallithea/controllers/login.py b/kallithea/controllers/login.py --- a/kallithea/controllers/login.py +++ b/kallithea/controllers/login.py @@ -134,7 +134,8 @@ class LoginController(BaseController): 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 @@ class LoginController(BaseController): 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 @@ class LoginController(BaseController): 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')