Skip to content

clarify conditionals #813

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

Closed
wants to merge 1 commit into from
Closed

clarify conditionals #813

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/core/allocation/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ def post(self, request, *args, **kwargs):
elif action == "deny":
allocation_obj.status = AllocationStatusChoice.objects.get(name="Denied")

if old_status != "Active" == allocation_obj.status.name:
if old_status != "Active" and allocation_obj.status.name == "Active":
if not allocation_obj.start_date:
allocation_obj.start_date = datetime.datetime.now()
if "approve" in action or not allocation_obj.end_date:
Expand All @@ -284,7 +284,7 @@ def post(self, request, *args, **kwargs):
if action != "auto-approve":
messages.success(request, "Allocation Activated!")

elif old_status != allocation_obj.status.name in ["Denied", "New", "Revoked"]:
elif old_status != allocation_obj.status.name and allocation_obj.status.name in ["Denied", "New", "Revoked"]:
allocation_obj.start_date = None
allocation_obj.end_date = None
allocation_obj.save()
Expand Down