Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update UI for user and group management #1630

Merged
merged 1 commit into from
May 29, 2024
Merged

Update UI for user and group management #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions deploy-board/deploy_board/templates/users/users_config.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@ <h4 class="panel-title pull-left">Manage Users & Tokens</h4>
<i class="glyphicon glyphicon-user"></i> Users
</a>
</div>
{% if pinterest %}
<div class="row">
<a type="button" class="deployToolTip btn btn-default btn-block"
href="/env/{{ env_name }}/get_users_config/?user_types=group_roles"
data-toggle="tooltip" title="Manage LDAP group permissions">
<i class="glyphicon glyphicon-tag"></i> LDAP Groups
</a>
</div>
{% endif %}
<div class="row">
<a type="button" class="deployToolTip btn btn-default btn-block"
href="/env/{{ env_name }}/get_users_config/?user_types=token_roles"
Expand All @@ -48,6 +39,10 @@ <h4 class="panel-title pull-left">Manage Users & Tokens</h4>

{% block main %}
<div id="usersConfigId" class="panel panel-default">
{% include "users/users_config.tmpl" %}
{% if pinterest and user_types != 'token_roles' %}
{% include "users/users_moved_message.html" %}
{% else %}
{% include "users/users_config.tmpl" %}
{% endif %}
</div>
{% endblock %}
14 changes: 14 additions & 0 deletions deploy-board/deploy_board/templates/users/users_moved_message.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="panel-heading clearfix">
<h4 class="panel-title pull-left">
User and group management have moved
</h4>
</div>

<div class="panel-body">
<p>
User and group management have moved to Pastis based ACLs. Please follow the <a href="https://pinch/teletraan-pastis-acl">instructions</a> to manage users and groups.
</p>
<p>
Please update your bookmarks.
</p>
</div>
Loading