pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct perms to show edit env form and remove unnecessary perms check to show links for app settings and team

Browse Source
This commit is contained in:
leigh-mil 2019-08-01 10:37:24 -04:00
parent 6ad3e41b70
commit 6dc5c14964
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
templates/portfolios/applications/index.html
View File

@ -45,20 +45,16 @@
<h3 class='icon-link accordion__title' v-on:click="toggleSection('{{ section_name }}')">{{ application.name }}</h3> <h3 class='icon-link accordion__title' v-on:click="toggleSection('{{ section_name }}')">{{ application.name }}</h3>
<span class='accordion__description'>{{ application.description }}</span> <span class='accordion__description'>{{ application.description }}</span>
<div class='accordion__actions'> <div class='accordion__actions'>
{% if user_can(permissions.VIEW_APPLICATION) %} <a class='icon-link' href='{{ url_for("applications.settings", application_id=application.id) }}'>
<a class='icon-link' href='{{ url_for("applications.settings", application_id=application.id) }}'> <span>{{ "portfolios.applications.app_settings_text" | translate }}</span>
<span>{{ "portfolios.applications.app_settings_text" | translate }}</span> </a>
</a> <div class='separator'></div>
<div class='separator'></div>
{% endif %}
{% if user_can(permissions.VIEW_PORTFOLIO_USERS) %}
<a <a
href="{{ url_for('applications.team', application_id=application.id) }}" href="{{ url_for('applications.team', application_id=application.id) }}"
class='icon-link'> class='icon-link'>
<span>{{ "portfolios.applications.team_text" | translate }} ({{ application.members | length }})</span> <span>{{ "portfolios.applications.team_text" | translate }} ({{ application.members | length }})</span>
</a> </a>
<div class='separator'></div> <div class='separator'></div>
{% endif %}
<a class='icon-link triangle-box' v-on:click="toggleSection('{{ section_name }}')"> <a class='icon-link triangle-box' v-on:click="toggleSection('{{ section_name }}')">
<span>Environments ({{ application.environments|length }})</span> <span>Environments ({{ application.environments|length }})</span>
<span v-if="selectedSection === '{{ section_name }}'"> <span v-if="selectedSection === '{{ section_name }}'">

2
templates/portfolios/applications/settings.html
View File

@ -80,7 +80,7 @@
{% include "fragments/flash.html" %} {% include "fragments/flash.html" %}
{% endif %} {% endif %}
{% if user_can(permissions.EDIT_APPLICATION) %} {% if user_can(permissions.EDIT_ENVIRONMENT) %}
{% include "fragments/applications/edit_environments.html" %} {% include "fragments/applications/edit_environments.html" %}
{% if user_can(permissions.CREATE_ENVIRONMENT) %} {% if user_can(permissions.CREATE_ENVIRONMENT) %}