-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix ui tests and role templates (#1102)
- Loading branch information
Showing
5 changed files
with
119 additions
and
125 deletions.
There are no files selected for viewing
5 changes: 2 additions & 3 deletions
5
projectroles/templates/projectroles/_project_invite_dropdown.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 3 additions & 4 deletions
7
projectroles/templates/projectroles/_project_role_dropdown_owner.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 41 additions & 48 deletions
89
projectroles/templates/projectroles/_project_role_ops.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,42 @@ | ||
| <div class="btn-group ml-auto"> | ||
| <button class="btn btn-primary dropdown-toggle" | ||
| id="sodar-pr-role-ops-dropdown" type="button" | ||
| data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" | ||
| {% if project.is_remote %}disabled="disabled"{% endif %}> | ||
| Member Operations | ||
| </button> | ||
| <div class="dropdown-menu dropdown-menu-right"> | ||
| {# Add Role #} | ||
| {% if role_perms.can_update_members %} | ||
| <a class="dropdown-item" | ||
| href="{% url 'projectroles:role_create' project=project.sodar_uuid %}" | ||
| title="Add Member" | ||
| id="sodar-pr-role-ops-create"> | ||
| <i class="iconify" data-icon="mdi:account-plus"></i> Add Member | ||
| </a> | ||
| {% endif %} | ||
|
|
||
| {# Send Invite #} | ||
| {% if role_perms.can_invite %} | ||
| <a class="dropdown-item" | ||
| href="{% url 'projectroles:invite_create' project=project.sodar_uuid %}" | ||
| title="Send Invite" | ||
| id="sodar-pr-role-ops-invite"> | ||
| <i class="iconify" data-icon="mdi:send"></i> Send Invite | ||
| </a> | ||
| {% endif %} | ||
|
|
||
| {# View Roles #} | ||
| {% if role_perms.can_update_members and request.resolver_match.url_name != 'project_roles' %} | ||
| <a class="dropdown-item" | ||
| href="{% url 'projectroles:roles' project=project.sodar_uuid %}" | ||
| title="View Members" | ||
| id="sodar-pr-role-ops-roles"> | ||
| <i class="iconify" data-icon="mdi:account-multiple"></i> View Members | ||
| </a> | ||
| {% endif %} | ||
|
|
||
| {# View Invites #} | ||
| {% if role_perms.can_invite and request.resolver_match.url_name != 'role_invites' %} | ||
| <a class="dropdown-item" | ||
| href="{% url 'projectroles:invites' project=project.sodar_uuid %}" | ||
| title="View Invites" | ||
| id="sodar-pr-role-ops-invites"> | ||
| <i class="iconify" data-icon="mdi:email"></i> View Invites | ||
| </a> | ||
| {% endif %} | ||
| </div> | ||
| <button class="btn btn-primary dropdown-toggle" | ||
| id="sodar-pr-role-ops-btn" | ||
| type="button" data-toggle="dropdown" | ||
| aria-haspopup="true" aria-expanded="false" | ||
| {% if project.is_remote %}disabled="disabled"{% endif %}> | ||
| Member Operations | ||
| </button> | ||
| <div class="dropdown-menu dropdown-menu-right" | ||
| id="sodar-pr-role-ops-dropdown"> | ||
| {% if role_perms.can_update_members %} | ||
| <a class="dropdown-item" | ||
| href="{% url 'projectroles:role_create' project=project.sodar_uuid %}" | ||
| title="Add Member" | ||
| id="sodar-pr-role-ops-create"> | ||
| <i class="iconify" data-icon="mdi:account-plus"></i> Add Member | ||
| </a> | ||
| {% endif %} | ||
| {% if role_perms.can_invite %} | ||
| <a class="dropdown-item" | ||
| href="{% url 'projectroles:invite_create' project=project.sodar_uuid %}" | ||
| title="Send Invite" | ||
| id="sodar-pr-role-ops-invite"> | ||
| <i class="iconify" data-icon="mdi:send"></i> Send Invite | ||
| </a> | ||
| {% endif %} | ||
| {% if role_perms.can_update_members and request.resolver_match.url_name != 'project_roles' %} | ||
| <a class="dropdown-item" | ||
| href="{% url 'projectroles:roles' project=project.sodar_uuid %}" | ||
| title="View Members" | ||
| id="sodar-pr-role-ops-roles"> | ||
| <i class="iconify" data-icon="mdi:account-multiple"></i> View Members | ||
| </a> | ||
| {% endif %} | ||
| {% if role_perms.can_invite and request.resolver_match.url_name != 'role_invites' %} | ||
| <a class="dropdown-item" | ||
| href="{% url 'projectroles:invites' project=project.sodar_uuid %}" | ||
| title="View Invites" | ||
| id="sodar-pr-role-ops-invites"> | ||
| <i class="iconify" data-icon="mdi:email"></i> View Invites | ||
| </a> | ||
| {% endif %} | ||
| </div> |
Oops, something went wrong.