Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
ec32762f
Commit
ec32762f
authored
May 07, 2018
by
Mikaël Salson
Committed by
Mathieu Giraud
Oct 11, 2018
Browse files
controllers/user.py: edit_form: errors as a list
This is more flexible to add new errors.
parent
b3971b3b
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/web2py/applications/vidjil/controllers/user.py
View file @
ec32762f
...
...
@@ -64,23 +64,23 @@ def edit():
def
edit_form
():
if
auth
.
can_modify_user
(
int
(
request
.
vars
[
'id'
])):
error
=
""
error
=
[]
if
request
.
vars
[
"first_name"
]
==
""
:
error
+=
"first name needed
,
"
error
.
append
(
"first name needed"
)
if
request
.
vars
[
"last_name"
]
==
""
:
error
+=
"last name needed
,
"
error
.
append
(
"last name needed"
)
if
request
.
vars
[
"email"
]
==
""
:
error
+=
"email cannot be empty"
error
.
append
(
"email cannot be empty"
)
elif
not
re
.
match
(
r
"[^@]+@[^@]+\.[^@]+"
,
request
.
vars
[
"email"
]):
error
+=
"incorrect email format"
error
.
append
(
"incorrect email format"
)
if
request
.
vars
[
"password"
]
!=
""
:
if
request
.
vars
[
"confirm_password"
]
!=
request
.
vars
[
"password"
]:
error
+=
"password fields must match"
error
.
append
(
"password fields must match"
)
else
:
password
=
db
.
auth_user
.
password
.
validate
(
request
.
vars
[
"password"
])[
0
]
if
error
==
""
:
if
len
(
error
)
==
0
:
data
=
dict
(
first_name
=
request
.
vars
[
"first_name"
],
last_name
=
request
.
vars
[
"last_name"
],
email
=
request
.
vars
[
"email"
])
...
...
@@ -95,7 +95,7 @@ def edit_form():
return
gluon
.
contrib
.
simplejson
.
dumps
(
res
,
separators
=
(
','
,
':'
))
else
:
res
=
{
"success"
:
"false"
,
"message"
:
error
}
res
=
{
"success"
:
"false"
,
"message"
:
', '
.
join
(
error
)
}
log
.
error
(
res
)
return
gluon
.
contrib
.
simplejson
.
dumps
(
res
,
separators
=
(
','
,
':'
))
else
:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment