# HG changeset patch
# User Johannes Bornhold <johannes@rhodecode.com>
# Date 2016-06-20 15:27:04
# Node ID 840f51fa5f2bf6e124e5bcde332d66ae10970f41
# Parent  2440a1e7fc362a21b3823989d99e77b36d4c8494

authn: Fix priority of default values if some values are missing during POST

Normally this affects only the test suite but doesn't hurt to be correct :)

diff --git a/rhodecode/authentication/views.py b/rhodecode/authentication/views.py
--- a/rhodecode/authentication/views.py
+++ b/rhodecode/authentication/views.py
@@ -56,10 +56,13 @@ class AuthnPluginViewBase(object):
         errors = errors or {}
         schema = self.plugin.get_settings_schema()
 
-        # Get default values for the form.
+        # Compute default values for the form. Priority is:
+        # 1. Passed to this method 2. DB value 3. Schema default
         for node in schema:
-            db_value = self.plugin.get_setting_by_name(node.name)
+            db_value = self.plugin.get_setting_by_name(
+                node.name, colander.null)
             defaults.setdefault(node.name, db_value)
+        defaults = schema.serialize(defaults)
 
         template_context = {
             'defaults': defaults,