commit 6c540c270ec10f9ebd314b1ebf8b4073b2e34dfa
author Dave Brondsema <dbrondsema@slashdotmedia.com> Fri Jun 06 17:16:22 2014 +0000
committer Dave Brondsema <dbrondsema@slashdotmedia.com> Fri Jun 06 17:16:22 2014 +0000
tree 577886a258ec854e23087cba91b862b6b7c59697
parent 753a496670a8cbbb687c1acb41471288f85fa91a

[#7409] put max/min pwd defaults into code, so .ini changes not required

Allura/allura/lib/widgets/forms.py

diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 4007a84..c181d75 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -142,8 +142,8 @@
                 label='New Password',
                 validator=fev.UnicodeString(
                     not_empty=True,
-                    min=asint(tg.config['auth.min_password_len']),
-                    max=asint(tg.config['auth.max_password_len']))),
+                    min=asint(tg.config.get('auth.min_password_len', 6)),
+                    max=asint(tg.config.get('auth.max_password_len', 30)))),
             ew.PasswordField(
                 name='pw2',
                 label='New Password (again)',
@@ -172,8 +172,8 @@
                 label='New Password',
                 validator=fev.UnicodeString(
                     not_empty=True,
-                    min=asint(tg.config['auth.min_password_len']),
-                    max=asint(tg.config['auth.max_password_len']))),
+                    min=asint(tg.config.get('auth.min_password_len', 6)),
+                    max=asint(tg.config.get('auth.max_password_len', 30)))),
             ew.PasswordField(
                 name='pw2',
                 label='New Password (again)',
@@ -723,8 +723,8 @@
                 label='New Password',
                 validator=fev.UnicodeString(
                     not_empty=True,
-                    min=asint(tg.config['auth.min_password_len']),
-                    max=asint(tg.config['auth.max_password_len']))),
+                    min=asint(tg.config.get('auth.min_password_len', 6)),
+                    max=asint(tg.config.get('auth.max_password_len', 30)))),
              ew.PasswordField(
                 name='pw2',
                 label='New Password (again)',