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

Import environments macro with context so you don't need to pass perms

Browse Source
This commit is contained in:
leigh-mil
2019-10-22 14:30:09 -04:00
parent f76fd0b567
commit 6ca08502ed
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/applications/fragments/environments.html
View File

@@ -6,9 +6,7 @@
{% macro EnvironmentManagementTemplate( {% macro EnvironmentManagementTemplate(
application, application,
environments_obj, environments_obj,
new_env_form, new_env_form) %}
user_can_create_environment
) %}
<h3>{{ "portfolios.applications.settings.environments" | translate }}</h3> <h3>{{ "portfolios.applications.settings.environments" | translate }}</h3>
<section class="panel" id="application-environments"> <section class="panel" id="application-environments">
@@ -94,7 +92,7 @@
</div> </div>
</div> </div>
{%- endif %} {%- endif %}
{% if user_can_create_environment -%} {% if user_can(permissions.CREATE_ENVIRONMENT) -%}
{% include "applications/fragments/add_new_environment.html" %} {% include "applications/fragments/add_new_environment.html" %}
{%- endif %} {%- endif %}
</section> </section>

4
templates/applications/settings.html
View File

@@ -57,9 +57,7 @@
{{ EnvironmentManagementTemplate( {{ EnvironmentManagementTemplate(
application, application,
environments_obj, environments_obj,
new_env_form, new_env_form) }}
user_can_create_environment=user_can(permissions.CREATE_ENVIRONMENT)
) }}
{% if user_can(permissions.DELETE_APPLICATION) %} {% if user_can(permissions.DELETE_APPLICATION) %}
{% set env_count = application.environments | length %} {% set env_count = application.environments | length %}