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

Check against current url_rule instead of matching a path with a regex

Browse Source
This commit is contained in:
Patrick Smith 2018-08-21 14:54:56 -04:00
parent 0631b69503
commit 92e1036e8a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/navigation/workspace_navigation.html
View File

@ -4,8 +4,8 @@
<ul>
{{ SidenavItem(
"Projects",
href=url_for("workspaces.workspace_projects", workspace_id=123456),
active=g.matchesPath('\/workspaces\/[A-Za-z0-9]*\/projects'),
href=url_for("workspaces.workspace_projects", workspace_id=workspace.id),
active=request.url_rule.rule.startswith('/workspaces/<workspace_id>/projects'),
subnav=[
{
"label": "Add New Project",
@ -18,8 +18,8 @@
{{ SidenavItem(
"Members",
href=url_for("workspaces.workspace_members", workspace_id=123456),
active=g.matchesPath('\/workspaces\/[A-Za-z0-9]*\/members'),
href=url_for("workspaces.workspace_members", workspace_id=workspace.id),
active=request.url_rule.rule.startswith('/workspaces/<workspace_id>/members'),
subnav=[
{
"label": "Add New Member",
@ -32,8 +32,8 @@
{{ SidenavItem(
"Funding & Reports",
href='/workspaces/123456/reports',
active=g.matchesPath('\/workspaces\/[A-Za-z0-9]*\/reports')
href=url_for("workspaces.workspace_reports", workspace_id=workspace.id),
active=request.url_rule.rule.startswith('/workspaces/<workspace_id>/reports')
) }}
</ul>
</nav>

2
templates/workspace_projects.html
View File

@ -8,7 +8,7 @@
<div class='block-list project-list-item'>
<header class='block-list__header'>
<h2 class='block-list__title'>{{ project['name'] }} ({{ project['environments']|length }} environments)</h2>
<a class='icon-link' href='/workspaces/123456/projects/789/edit'>
<a class='icon-link' href=''>
{{ Icon('edit') }}
<span>edit</span>
</a>