Merge pull request #316 from fasrc/cp_storagemanager

change Data Manager to Storage Manager
fasrc · Aug 13, 2024 · 7f4afd1 · 7f4afd1
2 parents 4276505 + 5b0a7da
commit 7f4afd1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/coldfront/config/core.py b/coldfront/config/core.py
@@ -36,9 +36,9 @@
 INACTIVE_ALLOCATION_STATUSES = ['Denied', 'Expired', 'Inactive', 'Pending Deactivation']
 
 # Categorization of project manager permissions
-MANAGERS = ['General Manager', 'Access Manager', 'Data Manager']
+MANAGERS = ['General Manager', 'Access Manager', 'Storage Manager']
 ACCESS_MANAGERS = ['General Manager', 'Access Manager']
-DATA_MANAGERS = ['General Manager', 'Data Manager']
+DATA_MANAGERS = ['General Manager', 'Storage Manager']
 
 #------------------------------------------------------------------------------
 # DjangoQ settings

diff --git a/coldfront/core/project/management/commands/add_default_project_choices.py b/coldfront/core/project/management/commands/add_default_project_choices.py
@@ -18,7 +18,7 @@ def handle(self, *args, **options):
  for choice in ['Completed', 'Pending', ]:
  ProjectReviewStatusChoice.objects.get_or_create(name=choice)
 
- for choice in ['User', 'General Manager', 'Data Manager', 'Access Manager']:
+ for choice in ['User', 'General Manager', 'Storage Manager', 'Access Manager']:
  ProjectUserRoleChoice.objects.get_or_create(name=choice)
 
  for choice in ['Active', 'Pending - Add', 'Pending - Remove', 'Denied', 'Removed', ]:

diff --git a/coldfront/core/project/templates/project/project_user_detail.html b/coldfront/core/project/templates/project/project_user_detail.html
@@ -56,7 +56,7 @@ <h3>Project: {{project.title}}</h3>
  <td>{{project_user_update_form.role}}<br/><br/>
  <b>Users</b> can view information about their project and the project's related allocations.<br/>
  <b>Access Managers</b> have the permissions to manage group membership and permissions.<br/>
- <b>Data Managers</b> have the permissions to make allocation requests.<br/>
+ <b>Storage Managers</b> have the permissions to make allocation requests.<br/>
  <b>General Managers</b> have all the permissions of a PI.<br/>
  <b>PIs</b> have permissions to manage the project and its related allocations, regardless of their assigned projectuser role.<br/>
  </td>

diff --git a/coldfront/core/project/utils.py b/coldfront/core/project/utils.py
@@ -16,7 +16,7 @@ def add_project_status_choices(apps, schema_editor):
 def add_project_user_role_choices(apps, schema_editor):
  ProjectUserRoleChoice = apps.get_model('project', 'ProjectUserRoleChoice')
 
- for choice in ['User', 'Data Manager', 'General Manager', 'Access Manager']:
+ for choice in ['User', 'Storage Manager', 'General Manager', 'Access Manager']:
  ProjectUserRoleChoice.objects.get_or_create(name=choice)
 
 

diff --git a/coldfront/core/test_helpers/factories.py b/coldfront/core/test_helpers/factories.py
@@ -40,7 +40,7 @@
 ### Default values and Faker provider setup ###
 
 project_status_choice_names = ['New', 'Active', 'Archived']
-project_user_role_choice_names = ['User', 'Access Manager', 'General Manager', 'Data Manager']
+project_user_role_choice_names = ['User', 'Access Manager', 'General Manager', 'Storage Manager']
 field_of_science_names = ['Physics', 'Chemistry', 'Economics', 'Biology', 'Sociology']
 attr_types = ['Date', 'Int', 'Float', 'Text', 'Boolean']
 
@@ -399,7 +399,7 @@ def setup_models(test_case):
 
  for user, role in {
  test_case.pi_user:'General Manager',
- test_case.proj_datamanager: 'Data Manager',
+ test_case.proj_datamanager: 'Storage Manager',
  test_case.proj_accessmanager: 'Access Manager',
  test_case.proj_nonallocation_user: 'User',
  }.items():