Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change Data Manager to Storage Manager #316

Merged
merged 1 commit into from
Aug 13, 2024
Merged

change Data Manager to Storage Manager #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions coldfront/config/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion coldfront/core/project/management/commands/add_default_project_choices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', ]:
Expand Down
2 changes: 1 addition & 1 deletion coldfront/core/project/templates/project/project_user_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion coldfront/core/project/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
4 changes: 2 additions & 2 deletions coldfront/core/test_helpers/factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down Expand Up @@ -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():
Expand Down
Loading