From 3d06a3683bdac02bd159533d866faff1237fd76b Mon Sep 17 00:00:00 2001 From: Adrienne Stilp Date: Thu, 22 Jun 2023 16:21:37 -0700 Subject: [PATCH 1/4] Sync navbar dropdown items and home page card items --- .../anvil_consortium_manager/index.html | 28 +++++++++++++++++-- .../anvil_consortium_manager/navbar.html | 11 -------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/index.html b/anvil_consortium_manager/templates/anvil_consortium_manager/index.html index 3cc2d594..d6e079c9 100644 --- a/anvil_consortium_manager/templates/anvil_consortium_manager/index.html +++ b/anvil_consortium_manager/templates/anvil_consortium_manager/index.html @@ -45,6 +45,10 @@
Billin {% endif %} +
  • + Audit billing projects + +
    • @@ -68,6 +72,10 @@
    Accounts
    {% endif %} +
  • + Audit accounts + +
    • @@ -86,9 +94,13 @@
    Managed List groups +
  • + Group visualization + +
    • {% if perms.anvil_consortium_manager.anvil_project_manager_edit %}
  • - Add a group + Create a new group
  • @@ -100,6 +112,10 @@
    Managed
    • {% endif %} +
  • + Audit groups + +
    • @@ -116,16 +132,22 @@
    Workspace diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html b/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html index 3816eb40..90efc106 100644 --- a/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html +++ b/anvil_consortium_manager/templates/anvil_consortium_manager/navbar.html @@ -80,14 +80,6 @@
  • Create a new group
    • - {% endif %} -
  • - Group-account membership -
    • -
  • - Group-group membership -
    • - {% if perms.anvil_consortium_manager.anvil_project_manager_edit %}
  • Add an account to a group
    • @@ -114,9 +106,6 @@
  • List all workspaces
    • -
  • - Workspace sharing -
    • {% if perms.anvil_consortium_manager.anvil_project_manager_edit %}
  • Share a workspace with a group From f0864bfcb987588f9442479303d43cd7c32dac30 Mon Sep 17 00:00:00 2001 From: Adrienne Stilp Date: Thu, 22 Jun 2023 16:22:44 -0700 Subject: [PATCH 2/4] Update copyright year --- .../templates/anvil_consortium_manager/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anvil_consortium_manager/templates/anvil_consortium_manager/index.html b/anvil_consortium_manager/templates/anvil_consortium_manager/index.html index d6e079c9..e4e317bf 100644 --- a/anvil_consortium_manager/templates/anvil_consortium_manager/index.html +++ b/anvil_consortium_manager/templates/anvil_consortium_manager/index.html @@ -164,7 +164,7 @@
    Workspace
    -

    © 2022 Adrienne Stilp

    +

    © 2023 Adrienne Stilp

    AnVIL Consortium Manager v{{ app_version }}

    From e0f5073981b248b56c9cc7705215364a97452448 Mon Sep 17 00:00:00 2001 From: Adrienne Stilp Date: Thu, 22 Jun 2023 16:25:55 -0700 Subject: [PATCH 3/4] Bump version number and update CHANGELOG --- CHANGELOG.md | 1 + anvil_consortium_manager/__init__.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae6bda46..230f184b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * Import ManagedGroup membership from AnVIL when importing a ManagedGroup and the members already have records in the app. * Sort available workspaces alphabetically in the `WorkspaceImport` view. +* Synchronize dropdown items in navbar and links in cards on home page. ## 0.16.4 (2023-06-16) diff --git a/anvil_consortium_manager/__init__.py b/anvil_consortium_manager/__init__.py index bffcd81d..cffd69d4 100644 --- a/anvil_consortium_manager/__init__.py +++ b/anvil_consortium_manager/__init__.py @@ -1 +1 @@ -__version__ = "0.17dev2" +__version__ = "0.17dev3" From 9a54f79cdc1b4b4c5f73cfcbb0dc43795ea1602c Mon Sep 17 00:00:00 2001 From: Adrienne Stilp Date: Thu, 22 Jun 2023 16:42:42 -0700 Subject: [PATCH 4/4] Modify view test for home page/navbar updates --- anvil_consortium_manager/tests/test_views.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/anvil_consortium_manager/tests/test_views.py b/anvil_consortium_manager/tests/test_views.py index 637fcc85..bc19900e 100644 --- a/anvil_consortium_manager/tests/test_views.py +++ b/anvil_consortium_manager/tests/test_views.py @@ -97,16 +97,14 @@ class ViewEditUrlTest(TestCase): view_urls = ( reverse("anvil_consortium_manager:index"), + reverse("anvil_consortium_manager:status"), reverse("anvil_consortium_manager:accounts:list"), reverse("anvil_consortium_manager:accounts:audit"), reverse("anvil_consortium_manager:billing_projects:list"), reverse("anvil_consortium_manager:billing_projects:audit"), - reverse("anvil_consortium_manager:group_account_membership:list"), - reverse("anvil_consortium_manager:group_group_membership:list"), reverse("anvil_consortium_manager:managed_groups:list"), + reverse("anvil_consortium_manager:managed_groups:visualization"), reverse("anvil_consortium_manager:managed_groups:audit"), - reverse("anvil_consortium_manager:status"), - reverse("anvil_consortium_manager:workspace_group_sharing:list"), reverse("anvil_consortium_manager:workspaces:landing_page"), reverse("anvil_consortium_manager:workspaces:list_all"), reverse("anvil_consortium_manager:workspaces:audit"),