Merge pull request #247 from UW-GAC/feature/acm-v0.18

ACM v0.18
UW-GAC · Oct 3, 2023 · f2f11f2 · f2f11f2
2 parents 72c13d1 + 8d32897
commit f2f11f2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/primed/cdsa/adapters.py b/primed/cdsa/adapters.py
@@ -1,4 +1,5 @@
 from anvil_consortium_manager.adapters.workspace import BaseWorkspaceAdapter
+from anvil_consortium_manager.forms import WorkspaceForm
 
 from . import forms, models, tables
 
@@ -12,6 +13,7 @@ class CDSAWorkspaceAdapter(BaseWorkspaceAdapter):
         "Workspaces containing data from the Consortium Data Sharing Agreement."
     )
     list_table_class = tables.CDSAWorkspaceTable
+    workspace_form_class = WorkspaceForm
     workspace_data_model = models.CDSAWorkspace
     workspace_data_form_class = forms.CDSAWorkspaceForm
     workspace_detail_template_name = "cdsa/cdsaworkspace_detail.html"
diff --git a/primed/dbgap/adapters.py b/primed/dbgap/adapters.py
@@ -1,4 +1,5 @@
 from anvil_consortium_manager.adapters.workspace import BaseWorkspaceAdapter
+from anvil_consortium_manager.forms import WorkspaceForm
 
 from . import forms, models, tables
 
@@ -10,6 +11,7 @@ class dbGaPWorkspaceAdapter(BaseWorkspaceAdapter):
     name = "dbGaP workspace"
     description = "Workspaces containing data from released dbGaP accessions"
     list_table_class = tables.dbGaPWorkspaceTable
+    workspace_form_class = WorkspaceForm
     workspace_data_model = models.dbGaPWorkspace
     workspace_data_form_class = forms.dbGaPWorkspaceForm
     workspace_detail_template_name = "dbgap/dbgapworkspace_detail.html"
diff --git a/primed/miscellaneous_workspaces/adapters.py b/primed/miscellaneous_workspaces/adapters.py
@@ -1,6 +1,7 @@
 """Adapters for the `workspaces` app."""
 
 from anvil_consortium_manager.adapters.workspace import BaseWorkspaceAdapter
+from anvil_consortium_manager.forms import WorkspaceForm
 
 from primed.primed_anvil.tables import DefaultWorkspaceTable
 
@@ -14,6 +15,7 @@ class SimulatedDataWorkspaceAdapter(BaseWorkspaceAdapter):
     name = "Simulated Data workspace"
     description = "Workspaces containing simulated data"
     list_table_class = DefaultWorkspaceTable
+    workspace_form_class = WorkspaceForm
     workspace_data_model = models.SimulatedDataWorkspace
     workspace_data_form_class = forms.SimulatedDataWorkspaceForm
     workspace_detail_template_name = (
@@ -28,6 +30,7 @@ class ConsortiumDevelWorkspaceAdapter(BaseWorkspaceAdapter):
     name = "Consortium development workspace"
     description = "Workspaces intended for consortium development of methods"
     list_table_class = DefaultWorkspaceTable
+    workspace_form_class = WorkspaceForm
     workspace_data_model = models.ConsortiumDevelWorkspace
     workspace_data_form_class = forms.ConsortiumDevelWorkspaceForm
     workspace_detail_template_name = "anvil_consortium_manager/workspace_detail.html"
@@ -42,6 +45,7 @@ class ExampleWorkspaceAdapter(BaseWorkspaceAdapter):
         "Workspaces containing examples of using AnVIL, working with data, etc."
     )
     list_table_class = DefaultWorkspaceTable
+    workspace_form_class = WorkspaceForm
     workspace_data_model = models.ExampleWorkspace
     workspace_data_form_class = forms.ExampleWorkspaceForm
     workspace_detail_template_name = "anvil_consortium_manager/workspace_detail.html"
@@ -54,6 +58,7 @@ class TemplateWorkspaceAdapter(BaseWorkspaceAdapter):
     name = "Template workspace"
     description = "Template workspaces that can be cloned to create other workspaces"
     list_table_class = DefaultWorkspaceTable
+    workspace_form_class = WorkspaceForm
     workspace_data_model = models.TemplateWorkspace
     workspace_data_form_class = forms.TemplateWorkspaceForm
     workspace_detail_template_name = "anvil_consortium_manager/workspace_detail.html"
@@ -66,6 +71,7 @@ class OpenAccessWorkspaceAdapter(BaseWorkspaceAdapter):
     name = "Open access workspace"
     description = "Workspaces containing open access data"
     list_table_class = tables.OpenAccessWorkspaceTable
+    workspace_form_class = WorkspaceForm
     workspace_data_model = models.OpenAccessWorkspace
     workspace_data_form_class = forms.OpenAccessWorkspaceForm
     workspace_detail_template_name = (

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -22,7 +22,7 @@ django-dbbackup==4.0.1 # https://github.com/jazzband/django-dbbackup
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
 
 # anvil_consortium_manager
-git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.17
+git+https://github.com/UW-GAC/django-anvil-consortium-manager.git@v0.18
 
 # Simple history - model history tracking
 django-simple-history==3.1.1