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

rename and rearrange some portfolio route functions

Browse Source
This commit is contained in:
dandds
2019-04-22 06:43:01 -04:00
parent 782a532c32
commit 78ba6afba0
16 changed files with 485 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/fragments/admin/portfolio_members.html
View File

@@ -11,7 +11,7 @@
{% if g.matchesPath("portfolio-members") %}
{% include "fragments/flash.html" %}
{% endif %}
<form method='POST' id="member-perms" action='{{ url_for("portfolios.edit_portfolio_members", portfolio_id=portfolio.id) }}' autocomplete="off" enctype="multipart/form-data">
<form method='POST' id="member-perms" action='{{ url_for("portfolios.edit_members", portfolio_id=portfolio.id) }}' autocomplete="off" enctype="multipart/form-data">
{{ member_perms_form.csrf_token }}
<div class='application-list-item'>

4
templates/portfolios/admin.html
View File

@@ -17,7 +17,7 @@
{% if user_can(permissions.VIEW_PORTFOLIO_NAME) %}
<base-form inline-template>
<form method="POST" action="{{ url_for('portfolios.edit_portfolio', portfolio_id=portfolio.id) }}" autocomplete="false">
<form method="POST" action="{{ url_for('portfolios.edit', portfolio_id=portfolio.id) }}" autocomplete="false">
{{ portfolio_form.csrf_token }}
<div class='form-row'>
<div class='form-col form-col--half'>
@@ -54,7 +54,7 @@
{% if user_can(permissions.VIEW_PORTFOLIO_ACTIVITY_LOG) %}
{% include "fragments/audit_events_log.html" %}
{{ Pagination(audit_events, 'portfolios.portfolio_admin', portfolio_id=portfolio.id) }}
{{ Pagination(audit_events, 'portfolios.admin', portfolio_id=portfolio.id) }}
{% endif %}
</div>
{% endblock %}

8
templates/portfolios/header.html
View File

@@ -60,8 +60,8 @@
{{ Link(
icon='chart-pie',
text='navigation.portfolio_navigation.breadcrumbs.reports' | translate,
url=url_for("portfolios.portfolio_reports", portfolio_id=portfolio.id),
active=request.url_rule.endpoint == "portfolios.portfolio_reports",
url=url_for("portfolios.reports", portfolio_id=portfolio.id),
active=request.url_rule.endpoint == "portfolios.reports",
) }}
{% endif %}
{{ Link(
@@ -74,8 +74,8 @@
{{ Link(
icon='cog',
text='navigation.portfolio_navigation.breadcrumbs.admin' | translate,
url=url_for("portfolios.portfolio_admin", portfolio_id=portfolio.id),
active=request.url_rule.endpoint == "portfolios.portfolio_admin",
url=url_for("portfolios.admin", portfolio_id=portfolio.id),
active=request.url_rule.endpoint == "portfolios.admin",
) }}
{% endif %}
</div>

4
templates/portfolios/reports/index.html
View File

@@ -130,7 +130,7 @@
{% set current_month_index = current_month.strftime('%m/%Y') %}
{% set prev_month_index = prev_month.strftime('%m/%Y') %}
{% set two_months_ago_index = two_months_ago.strftime('%m/%Y') %}
{% set reports_url = url_for("portfolios.portfolio_reports", portfolio_id=portfolio.id) %}
{% set reports_url = url_for("portfolios.reports", portfolio_id=portfolio.id) %}
{% if not portfolio.applications %}
@@ -357,7 +357,7 @@
{% if month.month == current_month.month and month.year == current_month.year %}
selected='selected'
{% endif %}
value='{{ url_for("portfolios.portfolio_reports",
value='{{ url_for("portfolios.reports",
portfolio_id=portfolio.id,
month=month.month,
year=month.year) }}'