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

Merge pull request #211 from dod-ccpo/workspace-nav-only-for-workspace-users

Browse Source 
Only show Workspaces in the side nav if the current user is in at least one workspace
This commit is contained in:
montana-mil 2018-08-24 11:38:21 -04:00 committed by GitHub
commit fafb3ac73d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/navigation/global_navigation.html
View File

@ -21,6 +21,9 @@
{"label":"New Request", "href":url_for("requests.requests_form_new", screen=1), "icon": "plus", "active": g.matchesPath('/requests/new')},
]
) }}
{{ SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=g.matchesPath('/workspaces')) }}
{% if g.current_user.workspace_roles %}
{{ SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=g.matchesPath('/workspaces')) }}
{% endif %}
</ul>
</div>

19
tests/routes/test_home.py Normal file
View File

@ -0,0 +1,19 @@
from tests.factories import UserFactory, WorkspaceFactory
from atst.domain.workspaces import Workspaces
def test_user_with_workspaces_has_workspaces_nav(client, user_session):
user = UserFactory.create()
workspace = WorkspaceFactory.create()
Workspaces._create_workspace_role(user, workspace, "default")
user_session(user)
response = client.get("/home")
assert b'href="/workspaces"' in response.data
def test_user_without_workspaces_has_no_workspaces_nav(client, user_session):
user = UserFactory.create()
user_session(user)
response = client.get("/home")
assert b'href="/workspaces"' not in response.data