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

Jump to bottom

allocation list view if project is New or Active #365

Merged
merged 1 commit into from
Mar 9, 2022
Merged

allocation list view if project is New or Active #365

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
allocation list view if project is New or Active 
Show allocation in list view if project is New or Active not just Active.
  • Loading branch information
@lebonez
lebonez authored Jan 26, 2022
commit 4fd3af1924d806d83e3a388726d96a7b97f6e43f
2 changes: 1 addition & 1 deletion coldfront/core/allocation/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ def get_queryset(self):
'project', 'project__pi', 'status',).all().order_by(order_by)
else:
allocations = Allocation.objects.prefetch_related('project', 'project__pi', 'status',).filter(
Q(project__status__name='Active') &
Q(project__status__name__in=['New', 'Active', ]) &
Q(project__projectuser__user=self.request.user) &
Q(project__projectuser__status__name='Active') &
Q(allocationuser__user=self.request.user) &
Expand Down