dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed order of confirm-password field

Browse Source
This commit is contained in:
mdipierro
2015-07-26 10:18:45 -05:00
parent 42c69b6343
commit e95115deb4
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/packages/dal
+1 -1
Submodule gluon/packages/dal updated: 50f8dafdff...62eb7767db
gluon/sqlhtml.py
+2 -1
View File
@@ -1146,7 +1146,8 @@ class SQLFORM(FORM):
extra_fields = extra_fields or [] extra_fields = extra_fields or []
self.extra_fields = {} self.extra_fields = {}
for extra_field in extra_fields: for extra_field in extra_fields:
self.fields.append(extra_field.name) if not extra_field.name in self.fields:
self.fields.append(extra_field.name)
self.extra_fields[extra_field.name] = extra_field self.extra_fields[extra_field.name] = extra_field
extra_field.db = table._db extra_field.db = table._db
extra_field.table = table extra_field.table = table
gluon/tools.py
+6 -2
View File
@@ -2894,14 +2894,18 @@ class Auth(object):
passfield = self.settings.password_field passfield = self.settings.password_field
formstyle = self.settings.formstyle formstyle = self.settings.formstyle
if self.settings.register_verify_password: if self.settings.register_verify_password:
if self.settings.register_fields == None:
self.settings.register_fields = [f.name for f in table_user if f.writable]
k = self.settings.register_fields.index("password")
self.settings.register_fields.insert(k+1, "password_two")
extra_fields = [ extra_fields = [
Field("password_two", "password", requires=IS_EQUAL_TO( Field("password_two", "password", requires=IS_EQUAL_TO(
request.post_vars.get(passfield, None), request.post_vars.get(passfield, None),
error_message=self.messages.mismatched_password), error_message=self.messages.mismatched_password),
label=current.T("Confirm Password"))] label=current.T("Confirm Password"))]
else: else:
extra_fields = [] extra_fields = []
form = SQLFORM(table_user, form = SQLFORM(table_user,
fields=self.settings.register_fields, fields=self.settings.register_fields,
hidden=dict(_next=next), hidden=dict(_next=next),