Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
uffd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Luca (strifel)
uffd
Commits
c381e3fc
Verified
Commit
c381e3fc
authored
4 years ago
by
nd
Browse files
Options
Downloads
Patches
Plain Diff
reworked user admin view
parent
03562691
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
uffd/role/__init__.py
+1
-0
1 addition, 0 deletions
uffd/role/__init__.py
uffd/role/templates/role.html
+1
-3
1 addition, 3 deletions
uffd/role/templates/role.html
uffd/user/templates/user.html
+83
-82
83 additions, 82 deletions
uffd/user/templates/user.html
with
85 additions
and
85 deletions
uffd/role/__init__.py
+
1
−
0
View file @
c381e3fc
from
.views
import
bp
as
bp_ui
from
.models
import
Role
,
RoleGroup
,
RoleUser
bp
=
[
bp_ui
]
This diff is collapsed.
Click to expand it.
uffd/role/templates/role.html
+
1
−
3
View file @
c381e3fc
...
...
@@ -16,9 +16,7 @@
</small>
</div>
<div
class=
"form-group col"
>
<p>
Included groups
</p>
<span>
Included groups
</span>
<table
class=
"table table-striped table-sm"
>
<thead>
<tr>
...
...
This diff is collapsed.
Click to expand it.
uffd/user/templates/user.html
+
83
−
82
View file @
c381e3fc
...
...
@@ -3,97 +3,98 @@
{% block body %}
<form
action=
"{{ url_for("
user.update
",
uid=
user.uid)
}}"
method=
"POST"
>
<div
class=
"align-self-center"
>
<div
class=
"form-group col"
>
<label
for=
"user-uid"
>
uid
</label>
{% if user.uid %}
<input
type=
"number"
class=
"form-control"
id=
"user-uid"
name=
"uid"
value=
"{{ user.uid }}"
readonly
>
{% else %}
<input
type=
"string"
class=
"form-control"
id=
"user-uid"
name=
"uid"
placeholder=
"will be choosen"
readonly
>
{% endif %}
</div>
<div
class=
"form-group col"
>
<label
for=
"user-loginname"
>
Login Name
</label>
<input
type=
"text"
class=
"form-control"
id=
"user-loginname"
name=
"loginname"
value=
"{{ user.loginname }}"
{%
if
user.uid
%}
readonly
{%
endif
%}
>
<small
class=
"form-text text-muted"
>
Only letters, numbers and underscore ("_") are allowed. At most 32, at least 2 characters. There is a word blacklist. Musst be unique.
</small>
</div>
<div
class=
"form-group col"
>
<label
for=
"user-loginname"
>
Display Name
</label>
<input
type=
"text"
class=
"form-control"
id=
"user-displayname"
name=
"displayname"
value=
"{{ user.displayname }}"
>
<small
class=
"form-text text-muted"
>
If you leave this empty it will be set to the login name. At most 128, at least 2 characters. No character restrictions.
</small>
</div>
<div
class=
"form-group col"
>
<label
for=
"user-mail"
>
Mail
</label>
<input
type=
"email"
class=
"form-control"
id=
"user-mail"
name=
"mail"
value=
"{{ user.mail }}"
>
<small
class=
"form-text text-muted"
>
Do a sanity check here. A user can take over another account if both have the same mail address set.
</small>
</div>
<div
class=
"form-group col"
>
<label
for=
"user-loginname"
>
Password
</label>
{% if user.uid %}
<input
type=
"password"
class=
"form-control"
id=
"user-password"
name=
"password"
placeholder=
"●●●●●●●●"
>
{% else %}
<input
type=
"password"
class=
"form-control"
id=
"user-password"
name=
"password"
placeholder=
"mail to set it will be sent"
readonly
>
{% endif %}
<small
class=
"form-text text-muted"
>
At least 8 characters, no other special requirements. But please don't be stupid and use a password manager.
</small>
</div>
{% if user.uid %}
<div
class=
"form-group col "
id=
"accordion"
>
<div
class=
"card"
>
<div
class=
"card-header"
id=
"user-ldif"
>
<h5
class=
"mb-0"
>
<a
class=
"btn btn-link collapsed"
data-toggle=
"collapse"
data-target=
"#user-ldif-body"
aria-expanded=
"false"
aria-controls=
"user-ldif"
>
ldif
</a>
</h5>
<ul
class=
"nav nav-tabs "
id=
"tablist"
role=
"tablist"
>
<li
class=
"nav-item"
>
<a
class=
"nav-link active"
id=
"profile-tab"
data-toggle=
"tab"
href=
"#profile"
role=
"tab"
aria-controls=
"profile"
aria-selected=
"true"
>
Profile
</a>
</li>
<li
class=
"nav-item"
>
<a
class=
"nav-link"
id=
"roles-tab"
data-toggle=
"tab"
href=
"#roles"
role=
"tab"
aria-controls=
"roles"
aria-selected=
"false"
>
Roles
</a>
</li>
<li
class=
"nav-item"
>
<a
class=
"nav-link"
id=
"ldif-tab"
data-toggle=
"tab"
href=
"#ldif"
role=
"tab"
aria-controls=
"ldif"
aria-selected=
"false"
>
LDIF
</a>
</li>
</ul>
<div
class=
"tab-content border border-top-0 mb-2 pt-2"
id=
"tabcontent"
>
<div
class=
"tab-pane fade show active"
id=
"profile"
role=
"tabpanel"
aria-labelledby=
"roles-tab"
>
<div
class=
"form-group col"
>
<label
for=
"user-uid"
>
uid
</label>
{% if user.uid %}
<input
type=
"number"
class=
"form-control"
id=
"user-uid"
name=
"uid"
value=
"{{ user.uid }}"
readonly
>
{% else %}
<input
type=
"string"
class=
"form-control"
id=
"user-uid"
name=
"uid"
placeholder=
"will be choosen"
readonly
>
{% endif %}
</div>
<div
id=
"user-ldif-body"
class=
"collapse"
aria-labelledby=
"user-ldif"
data-parent=
"#accordion"
>
<div
class=
"card-body"
>
<pre>
{{ user_ldif }}
</pre>
</div>
<div
class=
"form-group col"
>
<label
for=
"user-loginname"
>
Login Name
</label>
<input
type=
"text"
class=
"form-control"
id=
"user-loginname"
name=
"loginname"
value=
"{{ user.loginname }}"
{%
if
user.uid
%}
readonly
{%
endif
%}
>
<small
class=
"form-text text-muted"
>
Only letters, numbers and underscore ("_") are allowed. At most 32, at least 2 characters. There is a word blacklist. Musst be unique.
</small>
</div>
</div>
<div
class=
"card"
>
<div
class=
"card-header"
id=
"user-group"
>
<h5
class=
"mb-0"
>
<a
class=
"btn btn-link collapsed"
data-toggle=
"collapse"
data-target=
"#user-group-body"
aria-expanded=
"false"
aria-controls=
"user-group"
>
groups
</a>
</h5>
<div
class=
"form-group col"
>
<label
for=
"user-loginname"
>
Display Name
</label>
<input
type=
"text"
class=
"form-control"
id=
"user-displayname"
name=
"displayname"
value=
"{{ user.displayname }}"
>
<small
class=
"form-text text-muted"
>
If you leave this empty it will be set to the login name. At most 128, at least 2 characters. No character restrictions.
</small>
</div>
<div
id=
"user-group-body"
class=
"collapse"
aria-labelledby=
"user-group"
data-parent=
"#accordion"
>
<div
class=
"card-body"
>
<ul
class=
"list-group"
>
{% for group in user.get_groups() %}
<li
class=
"list-group-item"
><a
href=
"{{ url_for("
group.show
",
gid=
group.gid)
}}"
>
{{ group.name }}
</a></li>
{% endfor %}
</ul>
</div>
<div
class=
"form-group col"
>
<label
for=
"user-mail"
>
Mail
</label>
<input
type=
"email"
class=
"form-control"
id=
"user-mail"
name=
"mail"
value=
"{{ user.mail }}"
>
<small
class=
"form-text text-muted"
>
Do a sanity check here. A user can take over another account if both have the same mail address set.
</small>
</div>
<div
class=
"form-group col"
>
<label
for=
"user-loginname"
>
Password
</label>
{% if user.uid %}
<input
type=
"password"
class=
"form-control"
id=
"user-password"
name=
"password"
placeholder=
"●●●●●●●●"
>
{% else %}
<input
type=
"password"
class=
"form-control"
id=
"user-password"
name=
"password"
placeholder=
"mail to set it will be sent"
readonly
>
{% endif %}
<small
class=
"form-text text-muted"
>
At least 8 characters, no other special requirements. But please don't be stupid and use a password manager.
</small>
</div>
</div>
<div
class=
"card"
>
<div
class=
"card-header"
id=
"user-role"
>
<h5
class=
"mb-0"
>
<a
class=
"btn btn-link"
data-toggle=
"collapse"
data-target=
"#user-role-body"
aria-expanded=
"true"
aria-controls=
"user-role"
>
roles
</a>
</h5>
<div
class=
"tab-pane fade"
id=
"roles"
role=
"tabpanel"
aria-labelledby=
"roles-tab"
>
<div
class=
"form-group col"
>
<span>
Roles:
</span>
</div>
<div
class=
"form-group col"
>
<span>
Resulting groups (only updated after save):
</span>
<table
class=
"table table-striped table-sm"
>
<thead>
<tr>
<th
scope=
"col"
>
name
</th>
<th
scope=
"col"
>
description
</th>
</tr>
</thead>
<tbody>
{% for group in user.get_groups()|sort(attribute="name") %}
<tr
id=
"group-{{ group.gid }}"
>
<td>
<a
href=
"{{ url_for("
group.show
",
gid=
group.gid)
}}"
>
{{ group.name }}
</a>
</td>
<td>
{{ group.description }}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div
id=
"user-role-body"
class=
"collapse show"
aria-labelledby=
"user-role"
data-parent=
"#accordion"
>
<div
class=
"
card-body
"
>
roles.
<
/div
>
<
/
div>
<div
class=
"
tab-pane fade"
id=
"ldif"
role=
"tabpanel"
aria-labelledby=
"ldif-tab
"
>
<div
class=
"form-group col"
>
<
pre>
{{ user_ldif }}
</pre
>
</div>
</div>
</div>
{% endif %}
<div
class=
"form-group col"
>
<div
class=
"form-group col
pl-0
"
>
<button
type=
"submit"
class=
"btn btn-primary"
><i
class=
"fa fa-save"
aria-hidden=
"true"
></i>
Save
</button>
<a
href=
"{{ url_for("
user.index
")
}}"
class=
"btn btn-secondary"
>
Cancel
</a>
{% if user.uid %}
...
...
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