# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1427312289 -3600
# Node ID c04c2734e32f7533cf4dc364a5171b355d93a2d5
# Parent  75f4d8e84b81b414b6be52ded189a79eab19fe4c
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 ;-)

diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/auth_settings.py
--- 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"""
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/defaults.py
--- 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'),
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/gists.py
--- 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())
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/my_account.py
--- 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'),
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/permissions.py
--- 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'),
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/repo_groups.py
--- 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') \
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/repos.py
--- 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())
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/settings.py
--- 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 = [
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/user_groups.py
--- 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') \
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/admin/users.py
--- 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') \
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/forks.py
--- 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') %
diff -r 75f4d8e84b81 -r c04c2734e32f kallithea/controllers/login.py
--- 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')