From e41da66cace682661f95906c5747930e4b4fd326 Mon Sep 17 00:00:00 2001 From: Sachi King Date: Tue, 23 Jan 2018 13:30:45 +1100 Subject: [PATCH] Fix bulk action Bulk action marks printed + schwag, but as print is automated and happens after checkin is flagged, we should only set checkin and schwag and print will happen. --- vendor/regidesk/regidesk/models.py | 2 +- .../regidesk/regidesk/templates/regidesk/ci_overview.html | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vendor/regidesk/regidesk/models.py b/vendor/regidesk/regidesk/models.py index 35dadca6..0bb590f6 100644 --- a/vendor/regidesk/regidesk/models.py +++ b/vendor/regidesk/regidesk/models.py @@ -107,7 +107,7 @@ class CheckIn(models.Model): self.save() def bulk_mark_given(self): - self.badge_printed = True + self.checked_in_bool = True self.schwag_given = True self.save() diff --git a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html index 9b679265..5a239e52 100644 --- a/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html +++ b/vendor/regidesk/regidesk/templates/regidesk/ci_overview.html @@ -108,15 +108,16 @@ -
+
Bulk actions
+

Mark attendee as checked in and schwag given

-
Status
{% if check_in.badge_printed or check_in.schwag_given %}One of the items in bulk action is marked as given already{% else %}Both items are marked as unrecived{% endif %}
+
Status
{% if check_in.checked_in_bool or check_in.schwag_given %}One of the items in bulk action is marked as given already{% else %}Both items are marked as unrecived{% endif %}
- +