From 92e1036e8aae638d14e686531dfb7cf0cc8d5aa1 Mon Sep 17 00:00:00 2001
From: Patrick Smith <patrick+dds@promptworks.com>
Date: Tue, 21 Aug 2018 14:54:56 -0400
Subject: [PATCH] Check against current url_rule instead of matching a path
 with a regex

---
 templates/navigation/workspace_navigation.html | 12 ++++++------
 templates/workspace_projects.html              |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/navigation/workspace_navigation.html b/templates/navigation/workspace_navigation.html
index a622bf8c..3ed02ea9 100644
--- a/templates/navigation/workspace_navigation.html
+++ b/templates/navigation/workspace_navigation.html
@@ -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>
diff --git a/templates/workspace_projects.html b/templates/workspace_projects.html
index a7f51df1..ccc99759 100644
--- a/templates/workspace_projects.html
+++ b/templates/workspace_projects.html
@@ -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>