Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nopaque
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
Looking for advice? Join the
Matrix channel for GitLab users in Bielefeld
!
Show more breadcrumbs
SFB 1288 - INF
nopaque
Commits
fc560933
Commit
fc560933
authored
5 years ago
by
Patrick Jentsch
Browse files
Options
Downloads
Patches
Plain Diff
Change edit user form name
parent
5fd9711d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/admin/forms.py
+8
-15
8 additions, 15 deletions
app/admin/forms.py
app/admin/views.py
+9
-12
9 additions, 12 deletions
app/admin/views.py
app/templates/admin/edit_user.html.j2
+15
-15
15 additions, 15 deletions
app/templates/admin/edit_user.html.j2
with
32 additions
and
42 deletions
app/admin/forms.py
+
8
−
15
View file @
fc560933
...
@@ -5,29 +5,22 @@ from wtforms import (BooleanField, SelectField, StringField, SubmitField,
...
@@ -5,29 +5,22 @@ from wtforms import (BooleanField, SelectField, StringField, SubmitField,
from
wtforms.validators
import
DataRequired
,
Email
,
Length
,
Regexp
from
wtforms.validators
import
DataRequired
,
Email
,
Length
,
Regexp
class
Edit
ProfileAdmin
Form
(
FlaskForm
):
class
Edit
User
Form
(
FlaskForm
):
email
=
StringField
(
'
Email
'
,
email
=
StringField
(
'
Email
'
,
validators
=
[
DataRequired
(),
Length
(
1
,
64
),
Email
()])
validators
=
[
DataRequired
(),
Length
(
1
,
64
),
Email
()])
username
=
StringField
(
username
=
StringField
(
'
Username
'
,
'
Username
'
,
validators
=
[
DataRequired
(),
Length
(
1
,
64
),
validators
=
[
Regexp
(
'
^[A-Za-z][A-Za-z0-9_.]*$
'
,
0
,
DataRequired
(),
'
Usernames must have only
'
Length
(
1
,
64
),
'
letters, numbers, dots or
'
Regexp
(
'
underscores
'
)])
'
^[A-Za-z][A-Za-z0-9_.]*$
'
,
0
,
'
Usernames must have only letters, numbers, dots or
'
'
underscores
'
)
]
)
confirmed
=
BooleanField
(
'
Confirmed
'
)
confirmed
=
BooleanField
(
'
Confirmed
'
)
role
=
SelectField
(
'
Role
'
,
coerce
=
int
)
role
=
SelectField
(
'
Role
'
,
coerce
=
int
)
name
=
StringField
(
'
Real name
'
,
validators
=
[
Length
(
0
,
64
)])
name
=
StringField
(
'
Real name
'
,
validators
=
[
Length
(
0
,
64
)])
submit
=
SubmitField
(
'
Update Profile
'
)
submit
=
SubmitField
(
'
Update Profile
'
)
def
__init__
(
self
,
user
,
*
args
,
**
kwargs
):
def
__init__
(
self
,
user
,
*
args
,
**
kwargs
):
super
(
Edit
ProfileAdmin
Form
,
self
).
__init__
(
*
args
,
**
kwargs
)
super
(
Edit
User
Form
,
self
).
__init__
(
*
args
,
**
kwargs
)
self
.
role
.
choices
=
[(
role
.
id
,
role
.
name
)
self
.
role
.
choices
=
[(
role
.
id
,
role
.
name
)
for
role
in
Role
.
query
.
order_by
(
Role
.
name
).
all
()]
for
role
in
Role
.
query
.
order_by
(
Role
.
name
).
all
()]
self
.
user
=
user
self
.
user
=
user
...
...
This diff is collapsed.
Click to expand it.
app/admin/views.py
+
9
−
12
View file @
fc560933
...
@@ -6,7 +6,7 @@ from flask import current_app, flash, redirect, render_template, url_for
...
@@ -6,7 +6,7 @@ from flask import current_app, flash, redirect, render_template, url_for
from
flask_login
import
login_required
from
flask_login
import
login_required
from
threading
import
Thread
from
threading
import
Thread
from
.
import
admin
from
.
import
admin
from
.forms
import
Edit
ProfileAdmin
Form
from
.forms
import
Edit
User
Form
from
.tables
import
AdminUserItem
,
AdminUserTable
from
.tables
import
AdminUserItem
,
AdminUserTable
...
@@ -51,19 +51,16 @@ def delete_user(user_id):
...
@@ -51,19 +51,16 @@ def delete_user(user_id):
@admin_required
@admin_required
def
edit_user
(
user_id
):
def
edit_user
(
user_id
):
user
=
User
.
query
.
get_or_404
(
user_id
)
user
=
User
.
query
.
get_or_404
(
user_id
)
form
=
Edit
ProfileAdmin
Form
(
user
=
user
)
edit_user_
form
=
Edit
User
Form
(
user
=
user
)
if
form
.
validate_on_submit
():
if
edit_user_
form
.
validate_on_submit
():
user
.
email
=
form
.
email
.
data
user
.
email
=
edit_user_
form
.
email
.
data
user
.
username
=
form
.
username
.
data
user
.
username
=
edit_user_
form
.
username
.
data
user
.
confirmed
=
form
.
confirmed
.
data
user
.
confirmed
=
edit_user_
form
.
confirmed
.
data
user
.
role
=
Role
.
query
.
get
(
form
.
role
.
data
)
user
.
role
=
Role
.
query
.
get
(
edit_user_
form
.
role
.
data
)
db
.
session
.
add
(
user
)
db
.
session
.
add
(
user
)
db
.
session
.
commit
()
db
.
session
.
commit
()
flash
(
'
The profile has been updated.
'
)
flash
(
'
The profile has been updated.
'
)
return
redirect
(
url_for
(
'
admin.edit_user
'
,
user_id
=
user
.
id
))
return
redirect
(
url_for
(
'
admin.edit_user
'
,
user_id
=
user
.
id
))
form
.
email
.
data
=
user
.
email
return
render_template
(
'
admin/edit_user.html.j2
'
,
form
.
username
.
data
=
user
.
username
edit_user_form
=
edit_user_form
,
form
.
confirmed
.
data
=
user
.
confirmed
form
.
role
.
data
=
user
.
role_id
return
render_template
(
'
admin/edit_user.html.j2
'
,
form
=
form
,
title
=
'
Administration: Edit user
'
,
user
=
user
)
title
=
'
Administration: Edit user
'
,
user
=
user
)
This diff is collapsed.
Click to expand it.
app/templates/admin/edit_user.html.j2
+
15
−
15
View file @
fc560933
...
@@ -11,45 +11,45 @@
...
@@ -11,45 +11,45 @@
<div class="card">
<div class="card">
<form method="POST">
<form method="POST">
<div class="card-content">
<div class="card-content">
{{ form.hidden_tag() }}
{{
edit_user_
form.hidden_tag() }}
<div class="input-field ">
<div class="input-field ">
<i class="material-icons prefix">account_circle</i>
<i class="material-icons prefix">account_circle</i>
{{ form.username() }}
{{
edit_user_
form.username() }}
{{ form.username.label }}
{{
edit_user_
form.username.label }}
{% for error in form.username.errors %}
{% for error in
edit_user_
form.username.errors %}
<span class="helper-text red-text">{{ error }}</span>
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endfor %}
</div>
</div>
<div class="input-field">
<div class="input-field">
<i class="material-icons prefix">mail</i>
<i class="material-icons prefix">mail</i>
{{ form.email() }}
{{
edit_user_
form.email() }}
{{ form.email.label }}
{{
edit_user_
form.email.label }}
{% for error in form.email.errors %}
{% for error in
edit_user_
form.email.errors %}
<span class="helper-text red-text">{{ error }}</span>
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endfor %}
</div>
</div>
<div class="input-field">
<div class="input-field">
<i class="material-icons prefix">swap_vert</i>
<i class="material-icons prefix">swap_vert</i>
{{ form.role() }}
{{
edit_user_
form.role() }}
{{ form.role.label }}
{{
edit_user_
form.role.label }}
{% for error in form.role.errors %}
{% for error in
edit_user_
form.role.errors %}
<span class="helper-text red-text">{{ error }}</span>
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endfor %}
</div>
</div>
<div class="switch">
<div class="switch">
<i class="material-icons prefix">check</i>
<i class="material-icons prefix">check</i>
<label class="active" for="{{form.confirmed.name}}">
<label class="active" for="{{
edit_user_
form.confirmed.name
}}">
Confirmed status:
Confirmed status:
Off
Off
{% if form.confirmed.data == True %}
{% if
edit_user_
form.confirmed.data == True %}
<input type="checkbox" id="{{ form.confirmed.name }}" name="{{ form.confirmed.name }}" checked="checked">
<input type="checkbox" id="{{
edit_user_
form.confirmed.name }}" name="{{
edit_user_
form.confirmed.name }}" checked="checked">
{% else %}
{% else %}
<input type="checkbox" id="{{ form.confirmed.name }}" name="{{ form.confirmed.name }}">
<input type="checkbox" id="{{
edit_user_
form.confirmed.name }}" name="{{
edit_user_
form.confirmed.name }}">
{% endif %}
{% endif %}
<span class="lever"></span>
<span class="lever"></span>
On
On
</label>
</label>
{% for error in form.confirmed.errors %}
{% for error in
edit_user_
form.confirmed.errors %}
<span class="helper-text red-text">{{ error }}</span>
<span class="helper-text red-text">{{ error }}</span>
{% endfor %}
{% endfor %}
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment