Skip to content

Add approver user #15

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

Merged
s-sajid-ali merged 9 commits into from
Feb 26, 2025
Merged

Add approver user #15

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
47d8d82
Add ApproverProfile with school
Feb 7, 2025
c0326f5
Add ManyToMany relationship for schools in ApproverProfile
Feb 16, 2025
f63508f
Add a load_approver_schools script
Feb 16, 2025
f774751
Add test cases for ApproverProfile and UserProfile and test data
Feb 16, 2025
402b570
Add ManyToMany relationship for schools in ApproverProfile
Feb 17, 2025
691c8f6
Assigned approvers as staff to let them view staff navigation bar for…
Feb 24, 2025
08310ff
remove unnecessary comment
Feb 24, 2025
469c314
place default none school return value before checking if hasattr(sel…
Feb 24, 2025
a09b05c
comment out print in load_approver_schools.py
Feb 24, 2025
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/core/user/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ def is_approver(self):
def schools(self):
"""Get schools from ApproverProfile if the user is an approver."""
if hasattr(self, 'approver_profile'):
return list(self.approver_profile.schools.values_list('description', flat=True))
return []
return self.approver_profile.schools.all()
return School.objects.none()

@schools.setter
def schools(self, values):
Expand Down
4 changes: 2 additions & 2 deletions coldfront/core/user/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def test_approver_profile_creation(self):

# Convert both lists to sets to ignore order
expected_schools = {"Tandon School of Engineering", "NYU IT"}
actual_schools = set(self.data.user_profile.schools)
actual_schools = {school.description for school in self.data.user_profile.schools}

self.assertEqual(expected_schools, actual_schools)

Expand All @@ -100,7 +100,7 @@ def test_schools_property_getter(self):

# Convert both lists to sets to ignore order
expected_schools = {"Tandon School of Engineering", "NYU IT"}
actual_schools = set(self.data.user_profile.schools)
actual_schools = {school.description for school in self.data.user_profile.schools}

self.assertEqual(expected_schools, actual_schools)

Expand Down
Loading