From 22da1cd268e6c584eb2b9dad14558181dc46945f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 25 Nov 2017 13:26:09 +0100 Subject: [PATCH 001/351] Only responsible people should see the edit task button. --- src/teams/templates/team_detail.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/teams/templates/team_detail.html b/src/teams/templates/team_detail.html index 1273043d..44972367 100644 --- a/src/teams/templates/team_detail.html +++ b/src/teams/templates/team_detail.html @@ -81,7 +81,9 @@ Team: {{ team.name }} | {{ block.super }} {{ task.description }} Details - Edit Task + {% if request.user in team.responsible.all %} + Edit Task + {% endif %} {% endfor %} From d8e7ad2d170c26b607d2ec31dc8988a051e06f1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 25 Nov 2017 14:48:46 +0100 Subject: [PATCH 002/351] Loewr the percentage for camp redirect. --- src/bornhack/environment_settings.py.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bornhack/environment_settings.py.dist b/src/bornhack/environment_settings.py.dist index b86f7895..4c9697b9 100644 --- a/src/bornhack/environment_settings.py.dist +++ b/src/bornhack/environment_settings.py.dist @@ -31,7 +31,7 @@ CHANNEL_LAYERS = { # start redirecting to the next camp instead of the previous camp after # this much of the time between the camps has passed -CAMP_REDIRECT_PERCENT=40 +CAMP_REDIRECT_PERCENT=30 ### changes below here are only needed for production From 6a082e6b58c0f3f505cecb0bf1b6e6f79df8c813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 25 Nov 2017 14:54:34 +0100 Subject: [PATCH 003/351] Lower the percentage for camp redirect. --- src/bornhack/environment_settings.py.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bornhack/environment_settings.py.dist b/src/bornhack/environment_settings.py.dist index 4c9697b9..ba64d51c 100644 --- a/src/bornhack/environment_settings.py.dist +++ b/src/bornhack/environment_settings.py.dist @@ -31,7 +31,7 @@ CHANNEL_LAYERS = { # start redirecting to the next camp instead of the previous camp after # this much of the time between the camps has passed -CAMP_REDIRECT_PERCENT=30 +CAMP_REDIRECT_PERCENT=25 ### changes below here are only needed for production From 74729ade14b302a6792d67332f2c234dd994b176 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Mon, 4 Dec 2017 10:43:25 +0100 Subject: [PATCH 004/351] fixup backoffice handout view a bit --- src/backoffice/templates/infodesk.html | 8 +++----- src/backoffice/views.py | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/backoffice/templates/infodesk.html b/src/backoffice/templates/infodesk.html index 080c6a68..1da85489 100644 --- a/src/backoffice/templates/infodesk.html +++ b/src/backoffice/templates/infodesk.html @@ -26,18 +26,16 @@ - {% for order in order_list %} - {% for productrel in order.orderproductrelation_set.all %} + {% for productrel in orderproductrelation_list %} - Order #{{ order.id }} - {{ order.user }} + Order #{{ productrel.order.id }} + {{ productrel.order.user }} {{ productrel.id }} {{ productrel.product.name }} {{ productrel.quantity }} {{ productrel.handed_out }} {% endfor %} - {% endfor %} diff --git a/src/backoffice/views.py b/src/backoffice/views.py index 0dbd2717..bf247609 100644 --- a/src/backoffice/views.py +++ b/src/backoffice/views.py @@ -4,7 +4,7 @@ from django.views import View from django.conf import settings from django.utils.decorators import method_decorator from django.http import HttpResponseForbidden -from shop.models import Order +from shop.models import OrderProductRelation import logging logger = logging.getLogger("bornhack.%s" % __name__) @@ -22,5 +22,5 @@ class BackofficeIndexView(StaffMemberRequiredMixin, TemplateView): class InfodeskView(StaffMemberRequiredMixin, ListView): template_name = "infodesk.html" - queryset = Order.objects.filter(paid=True, cancelled=False, refunded=False, orderproductrelation__handed_out=False).distinct() + queryset = OrderProductRelation.objects.filter(handed_out=False, order__paid=True, order__refunded=False, order__cancelled=False).order_by("'order') From 0806ff138eb0259c34301f278da8b0e1ca4a3c45 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Mon, 4 Dec 2017 10:49:24 +0100 Subject: [PATCH 005/351] typo --- src/backoffice/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backoffice/views.py b/src/backoffice/views.py index bf247609..6b83bbc5 100644 --- a/src/backoffice/views.py +++ b/src/backoffice/views.py @@ -22,5 +22,5 @@ class BackofficeIndexView(StaffMemberRequiredMixin, TemplateView): class InfodeskView(StaffMemberRequiredMixin, ListView): template_name = "infodesk.html" - queryset = OrderProductRelation.objects.filter(handed_out=False, order__paid=True, order__refunded=False, order__cancelled=False).order_by("'order') + queryset = OrderProductRelation.objects.filter(handed_out=False, order__paid=True, order__refunded=False, order__cancelled=False).order_by('order') From 859537706687ccab20ef4cf63ee490938fed10ab Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Tue, 12 Dec 2017 21:57:17 +0100 Subject: [PATCH 006/351] rework backoffice part 1; ticket checkin and badge handout views still need some work --- .../templates/backoffice_index.html | 25 +++++++-- src/backoffice/templates/badge_handout.html | 52 ++++++++++++++++++ .../{infodesk.html => product_handout.html} | 12 ++-- src/backoffice/templates/ticket_checkin.html | 52 ++++++++++++++++++ src/backoffice/urls.py | 4 +- src/backoffice/views.py | 28 +++++++++- src/static_src/images/sort_asc.png | Bin 0 -> 160 bytes src/static_src/images/sort_asc_disabled.png | Bin 0 -> 148 bytes src/static_src/images/sort_both.png | Bin 0 -> 201 bytes src/static_src/images/sort_desc.png | Bin 0 -> 158 bytes src/static_src/images/sort_desc_disabled.png | Bin 0 -> 146 bytes src/tickets/models.py | 1 + 12 files changed, 161 insertions(+), 13 deletions(-) create mode 100644 src/backoffice/templates/badge_handout.html rename src/backoffice/templates/{infodesk.html => product_handout.html} (60%) create mode 100644 src/backoffice/templates/ticket_checkin.html create mode 100644 src/static_src/images/sort_asc.png create mode 100644 src/static_src/images/sort_asc_disabled.png create mode 100644 src/static_src/images/sort_both.png create mode 100644 src/static_src/images/sort_desc.png create mode 100644 src/static_src/images/sort_desc_disabled.png diff --git a/src/backoffice/templates/backoffice_index.html b/src/backoffice/templates/backoffice_index.html index 774edacc..4fd2dad4 100644 --- a/src/backoffice/templates/backoffice_index.html +++ b/src/backoffice/templates/backoffice_index.html @@ -3,18 +3,31 @@ {% load static from staticfiles %} {% load imageutils %} {% block content %} +
+

BornHack Backoffice

- Please select your desired action below. + Welcome to the promised land! Please select your desired action below:
+

-

-

+
+ +

Hand Out Products

+

Use this view to mark products such as merchandise, cabins, fridges and so on as handed out.

+ + +

Check-In Tickets

+

Use this view to check-in tickets when participants arrive.

+ + +

Hand Out Badges

+

Use this view to mark badges as handed out.

+ +
+ {% endblock content %} - diff --git a/src/backoffice/templates/badge_handout.html b/src/backoffice/templates/badge_handout.html new file mode 100644 index 00000000..b031eb29 --- /dev/null +++ b/src/backoffice/templates/badge_handout.html @@ -0,0 +1,52 @@ +{% extends 'base.html' %} +{% load commonmark %} +{% load static from staticfiles %} +{% load imageutils %} +{% block extra_head %} + + +{% endblock extra_head %} +{% block content %} +
+

Hand Out Badges

+
+ Use this view to hand out badges to participants. Use the search field to search for username, email, products, order ID, ticket UUID, etc. To check in participants go to the Ticket Checkin view instead. To hand out merchandise and other products go to the Hand Out Products view instead. +
+
+ This table shows all (Shop|Discount|Sponsor)Tickets which are badge_handed_out=False. Tickets must be checked in before they are shown in this list. +
+
+
+
+ + + + + + + + + + + + {% for ticket in tickets %} + + + + + + + + {% endfor %} + +
TicketUserEmailNameProduct
{{ ticket.uuid }}{{ ticket.order.user }}{{ ticket.order.user.email }}{{ ticket.name }}{{ ticket.email }}
+
+ + +{% endblock content %} + + diff --git a/src/backoffice/templates/infodesk.html b/src/backoffice/templates/product_handout.html similarity index 60% rename from src/backoffice/templates/infodesk.html rename to src/backoffice/templates/product_handout.html index 1da85489..6cc5955a 100644 --- a/src/backoffice/templates/infodesk.html +++ b/src/backoffice/templates/product_handout.html @@ -8,21 +8,25 @@ {% endblock extra_head %} {% block content %}
-

Infodesk Backoffice

+

Hand Out Products

- Paid (and not later refunded) orders with at least one product that is not yet handed out + Use this view to hand out products to participants. Use the search field to search for username, email, products, order ID etc. To check in participants go to the Ticket Checkin view instead. To hand out badges go to the Badge Handout view instead. +
+
+ This table shows all OrderProductRelations which are handed_out=False (not including unpaid, cancelled and refunded orders). The table is initally sorted by order ID but the sorting can be changed by clicking the column headlines (if javascript is enabled).
+
+ - @@ -30,10 +34,10 @@ + - {% endfor %} diff --git a/src/backoffice/templates/ticket_checkin.html b/src/backoffice/templates/ticket_checkin.html new file mode 100644 index 00000000..bb677785 --- /dev/null +++ b/src/backoffice/templates/ticket_checkin.html @@ -0,0 +1,52 @@ +{% extends 'base.html' %} +{% load commonmark %} +{% load static from staticfiles %} +{% load imageutils %} +{% block extra_head %} + + +{% endblock extra_head %} +{% block content %} +
+

Ticket Check-In

+
+ Use this view to check in participants. Use the search field to search for username, email, products, order ID, ticket UUID, etc. To hand out badges go to the Badge Handout view instead. To hand out other products go to the Hand Out Products view instead. +
+
+ This table shows all (Shop|Discount|Sponsor)Tickets which are checked_in=False. +
+
+
+
+
Order UserEmail OPR Id Product QuantityHanded Out?
Order #{{ productrel.order.id }} {{ productrel.order.user }}{{ productrel.order.user.email }} {{ productrel.id }} {{ productrel.product.name }} {{ productrel.quantity }}{{ productrel.handed_out }}
+ + + + + + + + + + + {% for ticket in tickets %} +

{{ ticket }} +

+ + + + + + {% endfor %} + +
TicketUserEmailNameProduct
{{ ticket }}{{ ticket.order.user }}{{ ticket.order.user.email }}{{ ticket.name }}
+
+ + +{% endblock content %} + + diff --git a/src/backoffice/urls.py b/src/backoffice/urls.py index 66d05351..7c849a55 100644 --- a/src/backoffice/urls.py +++ b/src/backoffice/urls.py @@ -3,6 +3,8 @@ from .views import * urlpatterns = [ url(r'^$', BackofficeIndexView.as_view(), name='index'), - url(r'infodesk/$', InfodeskView.as_view(), name='infodesk_index'), + url(r'product_handout/$', ProductHandoutView.as_view(), name='product_handout'), + url(r'badge_handout/$', BadgeHandoutView.as_view(), name='badge_handout'), + url(r'ticket_checkin/$', TicketCheckinView.as_view(), name='ticket_checkin'), ] diff --git a/src/backoffice/views.py b/src/backoffice/views.py index 6b83bbc5..fc460e97 100644 --- a/src/backoffice/views.py +++ b/src/backoffice/views.py @@ -5,6 +5,8 @@ from django.conf import settings from django.utils.decorators import method_decorator from django.http import HttpResponseForbidden from shop.models import OrderProductRelation +from tickets.models import ShopTicket, SponsorTicket, DiscountTicket +from itertools import chain import logging logger = logging.getLogger("bornhack.%s" % __name__) @@ -20,7 +22,29 @@ class BackofficeIndexView(StaffMemberRequiredMixin, TemplateView): template_name = "backoffice_index.html" -class InfodeskView(StaffMemberRequiredMixin, ListView): - template_name = "infodesk.html" +class ProductHandoutView(StaffMemberRequiredMixin, ListView): + template_name = "product_handout.html" queryset = OrderProductRelation.objects.filter(handed_out=False, order__paid=True, order__refunded=False, order__cancelled=False).order_by('order') + +class BadgeHandoutView(StaffMemberRequiredMixin, ListView): + template_name = "badge_handout.html" + context_object_name = 'tickets' + + def get_queryset(self, **kwargs): + shoptickets = ShopTicket.objects.filter(badge_handed_out=False) + sponsortickets = SponsorTicket.objects.filter(badge_handed_out=False) + discounttickets = DiscountTicket.objects.filter(badge_handed_out=False) + return list(chain(shoptickets, sponsortickets, discounttickets)) + + +class TicketCheckinView(StaffMemberRequiredMixin, ListView): + template_name = "ticket_checkin.html" + context_object_name = 'tickets' + + def get_queryset(self, **kwargs): + shoptickets = ShopTicket.objects.filter(checked_in=False) + sponsortickets = SponsorTicket.objects.filter(checked_in=False) + discounttickets = DiscountTicket.objects.filter(checked_in=False) + return list(chain(shoptickets, sponsortickets, discounttickets)) + diff --git a/src/static_src/images/sort_asc.png b/src/static_src/images/sort_asc.png new file mode 100644 index 0000000000000000000000000000000000000000..e1ba61a8055fcb18273f2468d335572204667b1f GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3I*bWaz@5R22v2@;zYta_*?F5u6Q zWR@in#&u+WgT?Hi<}D3B3}GOXuX|8Oj3tosHiJ3*4TN zC7>_x-r1O=t(?KoTC+`+>7&2GzdqLHBg&F)2Q?&EGZ+}|Rpsc~9`m>jw35No)z4*} HQ$iB}HK{Sd literal 0 HcmV?d00001 diff --git a/src/static_src/images/sort_asc_disabled.png b/src/static_src/images/sort_asc_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..fb11dfe24a6c564cb7ddf8bc96703ebb121df1e7 GIT binary patch literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRX(Vi}jAsXkC6BcOhI9!^3NY?Do zDX;f`c1`y6n0RgO@$!H7chZT&|Jn0dmaqO^XNm-CGtk!Ur<_=Jws3;%W$<+Mb6Mw<&;$T1GdZXL literal 0 HcmV?d00001 diff --git a/src/static_src/images/sort_both.png b/src/static_src/images/sort_both.png new file mode 100644 index 0000000000000000000000000000000000000000..af5bc7c5a10b9d6d57cb641aeec752428a07f0ca GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRX6FglULp08Bycxyy87-Q;~nRxO8@-UU*I^KVWyN+&SiMHu5xDOu|HNvwzODfTdXjhVyNu1 z#7^XbGKZ7LW3XeONb$RKLeE*WhqbYpIXPIqK@r4)v+qN8um%99%MPpS9d#7Ed7SL@Bp00i_>zopr0H-Zb Aj{pDw literal 0 HcmV?d00001 diff --git a/src/static_src/images/sort_desc.png b/src/static_src/images/sort_desc.png new file mode 100644 index 0000000000000000000000000000000000000000..0e156deb5f61d18f9e2ec5da4f6a8c94a5b4fb41 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3I*R8JSj5R22v2@yo z(czD9$NuDl3Ljm9c#_#4$vXUz=f1~&WY3aa=h!;z7fOEN>ySP9QA=6C-^Dmb&tuM= z4Z&=WZU;2WF>e%GI&mWJk^K!jrbro{W;-I>FeCfLGJl3}+Z^2)3Kw?+EoAU?^>bP0 Hl+XkKC^j|Q{b@g3TV7E(Grjn^aLC2o)_ptHrtUEoT$S@q)~)7U@V;W{6)!%@ u>N?4t-1qslpJw9!O?PJ&w0Cby Date: Tue, 12 Dec 2017 22:13:38 +0100 Subject: [PATCH 007/351] mark orders as paid in bootstrap script (#189) they are marked as payed such that tickets are generated so we can design the backoffice$ --- src/shop/models.py | 3 ++- src/utils/management/commands/bootstrap-devsite.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/shop/models.py b/src/shop/models.py index 4ebcc7c8..a7ab8953 100644 --- a/src/shop/models.py +++ b/src/shop/models.py @@ -199,7 +199,8 @@ class Order(CreatedUpdatedModel): product=order_product.product, ) ticket.save() - messages.success(request, "Created %s tickets of type: %s" % (order_product.quantity, order_product.product.ticket_type.name)) + if request: + messages.success(request, "Created %s tickets of type: %s" % (order_product.quantity, order_product.product.ticket_type.name)) # and mark the OPR as handed_out=True order_product.handed_out=True order_product.save() diff --git a/src/utils/management/commands/bootstrap-devsite.py b/src/utils/management/commands/bootstrap-devsite.py index d1bf84d1..250f11c2 100644 --- a/src/utils/management/commands/bootstrap-devsite.py +++ b/src/utils/management/commands/bootstrap-devsite.py @@ -364,6 +364,7 @@ class Command(BaseCommand): product=tent1, quantity=1, ) + order0.mark_as_paid(request=None) order1 = Order.objects.create( user=user2, @@ -378,6 +379,8 @@ class Command(BaseCommand): product=tent2, quantity=1, ) + order1.mark_as_paid(request=None) + order2 = Order.objects.create( user=user3, payment_method='cash', @@ -395,6 +398,8 @@ class Command(BaseCommand): product=tent2, quantity=1, ) + order2.mark_as_paid(request=None) + order3 = Order.objects.create( user=user4, payment_method='cash', @@ -412,6 +417,7 @@ class Command(BaseCommand): product=tent1, quantity=1, ) + order3.mark_as_paid(request=None) self.output('Creating eventlocations for {}...'.format(year)) speakers_tent = EventLocation.objects.create( From ecdc62df7ca20e28eacfe7f0ffd400022211eebc Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Tue, 12 Dec 2017 22:16:06 +0100 Subject: [PATCH 008/351] Add IBAN/SWIFT to custom invoices, bank name in settings - fixes #172 (#187) --- src/bornhack/environment_settings.py.dist | 1 + src/shop/invoiceworker.py | 6 ++++++ src/shop/templates/pdf/custominvoice.html | 9 ++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/bornhack/environment_settings.py.dist b/src/bornhack/environment_settings.py.dist index ba64d51c..6dd63947 100644 --- a/src/bornhack/environment_settings.py.dist +++ b/src/bornhack/environment_settings.py.dist @@ -61,6 +61,7 @@ COINIFY_CALLBACK_HOSTNAME='{{ coinify_callback_hostname | default('') }}' # leav # shop settings PDF_LETTERHEAD_FILENAME='{{ pdf_letterhead_filename }}' +BANKACCOUNT_BANK='{{ bank_name }}' BANKACCOUNT_IBAN='{{ iban }}' BANKACCOUNT_SWIFTBIC='{{ swiftbic }}' BANKACCOUNT_REG='{{ regno }}' diff --git a/src/shop/invoiceworker.py b/src/shop/invoiceworker.py index cecd51e3..e3d210bb 100644 --- a/src/shop/invoiceworker.py +++ b/src/shop/invoiceworker.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.core.files import File from utils.pdf import generate_pdf_letter from shop.email import add_invoice_email, add_creditnote_email @@ -39,6 +40,11 @@ def do_work(): template=template, formatdict={ 'invoice': invoice, + 'bank': settings.BANKACCOUNT_BANK, + 'bank_iban': settings.BANKACCOUNT_IBAN, + 'bank_bic': settings.BANKACCOUNT_SWIFTBIC, + 'bank_dk_reg': settings.BANKACCOUNT_REG, + 'bank_dk_accno': settings.BANKACCOUNT_ACCOUNT, }, ) logger.info('Generated pdf for invoice %s' % invoice) diff --git a/src/shop/templates/pdf/custominvoice.html b/src/shop/templates/pdf/custominvoice.html index f204a16a..2d162011 100644 --- a/src/shop/templates/pdf/custominvoice.html +++ b/src/shop/templates/pdf/custominvoice.html @@ -51,5 +51,12 @@

-Payment should be made by bank transfer to our account in Arbejdernes Landsbank reg. 5371 account no. 0244504 within two weeks from {{ invoice.created|date:"b jS, Y" }} please. Thank you! + Payment should be made by bank transfer to our account in {{ bank }}:

+
    +
  • Reg. {{ bank_dk_reg }}, account no. {{ bank_dk_accno }}
    • +
  • BIC: {{ bank_bic }}, IBAN: {{ bank_iban }}
    • +
  • Add invoice number in the transfer notes.
    • +
  • Within two weeks from: {{ invoice.created|date:"b jS, Y" }}
    • +
  • Thank you!
    • +
From a0c646e1cf316e7f0232d92300acdc1fd1b9180e Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Tue, 12 Dec 2017 22:48:45 +0100 Subject: [PATCH 009/351] polish backoffice part 2 --- src/backoffice/templates/badge_handout.html | 16 +++++++++++----- src/backoffice/templates/ticket_checkin.html | 18 ++++++++++++------ src/templates/base.html | 3 +++ 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/src/backoffice/templates/badge_handout.html b/src/backoffice/templates/badge_handout.html index b031eb29..d8e23223 100644 --- a/src/backoffice/templates/badge_handout.html +++ b/src/backoffice/templates/badge_handout.html @@ -21,21 +21,27 @@ - - - - + + + + + + + {% for ticket in tickets %} - + + + + {% endfor %} diff --git a/src/backoffice/templates/ticket_checkin.html b/src/backoffice/templates/ticket_checkin.html index bb677785..cb75cc59 100644 --- a/src/backoffice/templates/ticket_checkin.html +++ b/src/backoffice/templates/ticket_checkin.html @@ -21,21 +21,27 @@
TicketUserEmailNameTicket UUIDTicket TypeTicket Order IDOrder UserOrder EmailTicket NameTicket Email Product
{{ ticket.uuid }}{{ ticket.uuid }}{{ ticket.shortname }}{{ ticket.order.id }} {{ ticket.order.user }} {{ ticket.order.user.email }} {{ ticket.name }} {{ ticket.email }}{{ ticket.product }}
- - - - + + + + + + + {% for ticket in tickets %} -

{{ ticket }}

- + + + + + {% endfor %} diff --git a/src/templates/base.html b/src/templates/base.html index 4e66eb27..adb2d321 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -72,6 +72,9 @@
  • Contact
  • People
    • + {% if user.is_authenticated and user.is_staff %} +
  • Backoffice
    • + {% endif %}
      {% if user.is_authenticated %} From 590bf9fa65fcedf9430192e34a5e64624eea5fcf Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 7 Jan 2018 15:55:32 +0100 Subject: [PATCH 010/351] reenable cardpayment --- src/shop/templates/order_detail.html | 3 +++ src/shop/urls.py | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/shop/templates/order_detail.html b/src/shop/templates/order_detail.html index d242f7a4..c8dd86fc 100644 --- a/src/shop/templates/order_detail.html +++ b/src/shop/templates/order_detail.html @@ -110,6 +110,9 @@ {% bootstrap_button " Cash" button_type="submit" button_class="btn-primary" name="payment_method" value="cash" %} +
      + {% bootstrap_button " Credit card*" button_type="submit" button_class="btn-primary" name="payment_method" value="credit_card" %} +
      * Please consider the alternatives before choosing credit card. Credit cards are expensive and difficult for us to handle. Thank you!
      diff --git a/src/shop/urls.py b/src/shop/urls.py index df8f82b9..78d7dc1d 100644 --- a/src/shop/urls.py +++ b/src/shop/urls.py @@ -12,9 +12,9 @@ urlpatterns = [ url(r'orders/(?P[0-9]+)/invoice/$', DownloadInvoiceView.as_view(), name='download_invoice'), url(r'orders/(?P[0-9]+)/mark_as_paid/$', OrderMarkAsPaidView.as_view(), name='mark_order_as_paid'), - #url(r'orders/(?P[0-9]+)/pay/creditcard/$', EpayFormView.as_view(), name='epay_form'), - #url(r'orders/(?P[0-9]+)/pay/creditcard/callback/$',EpayCallbackView.as_view(), name='epay_callback'), - #url(r'orders/(?P[0-9]+)/pay/creditcard/thanks/$', EpayThanksView.as_view(), name='epay_thanks'), + url(r'orders/(?P[0-9]+)/pay/creditcard/$', EpayFormView.as_view(), name='epay_form'), + url(r'orders/(?P[0-9]+)/pay/creditcard/callback/$',EpayCallbackView.as_view(), name='epay_callback'), + url(r'orders/(?P[0-9]+)/pay/creditcard/thanks/$', EpayThanksView.as_view(), name='epay_thanks'), url(r'orders/(?P[0-9]+)/pay/blockchain/$', CoinifyRedirectView.as_view(), name='coinify_pay'), url(r'orders/(?P[0-9]+)/pay/blockchain/callback/$', CoinifyCallbackView.as_view(), name='coinify_callback'), From 004be0a8349f11365d3d45744b20642dea2899a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 7 Jan 2018 15:56:52 +0100 Subject: [PATCH 011/351] Adding search and improve stuff on shop product admin. --- src/shop/admin.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/shop/admin.py b/src/shop/admin.py index f264f62a..a6f6beb6 100644 --- a/src/shop/admin.py +++ b/src/shop/admin.py @@ -34,6 +34,15 @@ class ProductCategoryAdmin(admin.ModelAdmin): ] +def available_from(product): + return product.available_in.lower.strftime("%c") +available_from.short_description = 'Available from' + +def available_to(product): + return product.available_in.upper.strftime("%c") +available_to.short_description = 'Available to' + + @admin.register(models.Product) class ProductAdmin(admin.ModelAdmin): list_display = [ @@ -41,9 +50,13 @@ class ProductAdmin(admin.ModelAdmin): 'category', 'ticket_type', 'price', - 'available_in', + 'description', + available_from, + available_to ] + search_fields = ['name'] + class ProductInline(admin.TabularInline): model = models.OrderProductRelation From f047deba7628b03914ac087a82f96d2c7fe90cad Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 7 Jan 2018 16:43:11 +0100 Subject: [PATCH 012/351] place card btn in proper div --- src/shop/templates/order_detail.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shop/templates/order_detail.html b/src/shop/templates/order_detail.html index c8dd86fc..6a43b040 100644 --- a/src/shop/templates/order_detail.html +++ b/src/shop/templates/order_detail.html @@ -109,9 +109,9 @@
      {% bootstrap_button " Cash" button_type="submit" button_class="btn-primary" name="payment_method" value="cash" %}
      - -
      - {% bootstrap_button " Credit card*" button_type="submit" button_class="btn-primary" name="payment_method" value="credit_card" %} +
      + {% bootstrap_button " Credit card*" button_type="submit" button_class="btn-primary" name="payment_method" value="credit_card" %} +
      * Please consider the alternatives before choosing credit card. Credit cards are expensive and difficult for us to handle. Thank you!
      From 19963db1028de29fc95133f25d37621576f07e1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 7 Jan 2018 17:15:03 +0100 Subject: [PATCH 013/351] Woops, available_in can be null --- src/shop/admin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/shop/admin.py b/src/shop/admin.py index a6f6beb6..c23cf268 100644 --- a/src/shop/admin.py +++ b/src/shop/admin.py @@ -35,11 +35,15 @@ class ProductCategoryAdmin(admin.ModelAdmin): def available_from(product): - return product.available_in.lower.strftime("%c") + if product.available_in: + return product.available_in.lower.strftime("%c") + return "None" available_from.short_description = 'Available from' def available_to(product): - return product.available_in.upper.strftime("%c") + if product.available_in: + return product.available_in.upper.strftime("%c") + return "None" available_to.short_description = 'Available to' From 61f7e43bdb0166fcd00fa3b574f3d22d05921649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 7 Jan 2018 17:20:45 +0100 Subject: [PATCH 014/351] Erhm... --- src/shop/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shop/admin.py b/src/shop/admin.py index c23cf268..5362cf9d 100644 --- a/src/shop/admin.py +++ b/src/shop/admin.py @@ -35,13 +35,13 @@ class ProductCategoryAdmin(admin.ModelAdmin): def available_from(product): - if product.available_in: + if product.available_in.lower: return product.available_in.lower.strftime("%c") return "None" available_from.short_description = 'Available from' def available_to(product): - if product.available_in: + if product.available_in.upper: return product.available_in.upper.strftime("%c") return "None" available_to.short_description = 'Available to' From c676abd5cf328cff926df10ae7bdab1a0a2f6b38 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 7 Jan 2018 17:36:44 +0100 Subject: [PATCH 015/351] add missing request argument --- src/shop/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shop/views.py b/src/shop/views.py index 0ff51a4e..4d77e1c7 100644 --- a/src/shop/views.py +++ b/src/shop/views.py @@ -447,7 +447,7 @@ class EpayCallbackView(SingleObjectMixin, View): txnid=query.get('txnid'), ) ### and mark order as paid (this will create tickets) - order.mark_as_paid() + order.mark_as_paid(request) else: logger.error("valid epay callback with wrong amount detected") else: From 328d6aa80333cdd0b9cd76794ea92e61145b2b71 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 7 Jan 2018 19:59:53 +0100 Subject: [PATCH 016/351] work on #174 --- src/tickets/apps.py | 6 --- src/tickets/models.py | 71 +++++++++++++++++++++++++++++++++- src/tickets/signal_handlers.py | 36 ----------------- 3 files changed, 69 insertions(+), 44 deletions(-) delete mode 100644 src/tickets/signal_handlers.py diff --git a/src/tickets/apps.py b/src/tickets/apps.py index 307172a7..6418e2fe 100644 --- a/src/tickets/apps.py +++ b/src/tickets/apps.py @@ -1,13 +1,7 @@ from django.apps import AppConfig -from .signal_handlers import ticket_created -from django.db.models.signals import post_save import logging logger = logging.getLogger("bornhack.%s" % __name__) class TicketsConfig(AppConfig): name = 'tickets' - - def ready(self): - post_save.connect(ticket_created, sender='tickets.ShopTicket') - diff --git a/src/tickets/models.py b/src/tickets/models.py index 52c84e0b..279d2543 100644 --- a/src/tickets/models.py +++ b/src/tickets/models.py @@ -4,16 +4,25 @@ import hashlib import base64 import qrcode -from utils.models import CreatedUpdatedModel, CampRelatedModel from django.conf import settings +from django.utils import timezone +from django.dispatch import receiver from django.core.urlresolvers import reverse_lazy from django.utils.translation import ugettext_lazy as _ from utils.models import ( UUIDModel, + CampRelatedModel, CreatedUpdatedModel ) from utils.pdf import generate_pdf_letter from django.db import models +from django.db.models.signals import post_save +from datetime import ( + timedelta, + datetime +) +from django.db.models import Count +from ircbot.models import OutgoingIrcMessage logger = logging.getLogger("bornhack.%s" % __name__) @@ -56,7 +65,9 @@ class BaseTicket(CreatedUpdatedModel, UUIDModel): return qrcode_base64 def get_qr_code_url(self): - return 'data:image/png;base64,{}'.format(self.get_qr_code_base64().decode('utf-8')) + return 'data:image/png;base64,{}'.format( + self.get_qr_code_base64().decode('utf-8') + ) def generate_pdf(self): return generate_pdf_letter( @@ -134,3 +145,59 @@ class ShopTicket(BaseTicket): def shortname(self): return "shop" + +@receiver(post_save, sender=ShopTicket) +def ticket_created(sender, instance, created, **kwargs): + # only send a message when a ticket is created + if not created: + return + + # queue an IRC message to the orga channel if defined, + # otherwise for the default channel + target = settings.IRCBOT_CHANNELS['orga'] if 'orga' in settings.IRCBOT_CHANNELS else settings.IRCBOT_CHANNELS['default'] + + # get ticket stats + ticket_prefix = "BornHack {}".format(datetime.now().year) + + stats = ", ".join( + [ + "{}: {}".format( + tickettype['product__name'].replace( + "{} ".format(ticket_prefix), + "" + ), + tickettype['total'] + ) for tickettype in ShopTicket.objects.filter( + product__name__startswith=ticket_prefix + ).exclude( + product__name__startswith="{} One Day".format(ticket_prefix) + ).values( + 'product__name' + ).annotate( + total=Count('product__name') + ).order_by('-total') + ] + ) + + onedaystats = ShopTicket.objects.filter( + product__name__startswith="{} One Day Ticket".format(ticket_prefix) + ).count() + onedaychildstats = ShopTicket.objects.filter( + product__name__startswith="{} One Day Children".format(ticket_prefix) + ).count() + + # queue the messages + OutgoingIrcMessage.objects.create( + target=target, + message="%s sold!" % instance.product.name, + timeout=timezone.now()+timedelta(minutes=10) + ) + OutgoingIrcMessage.objects.create( + target=target, + message="Totals: {}, 1day: {}, 1day child: {}".format( + stats, + onedaystats, + onedaychildstats + )[:200], + timeout=timezone.now()+timedelta(minutes=10) + ) diff --git a/src/tickets/signal_handlers.py b/src/tickets/signal_handlers.py deleted file mode 100644 index de588c60..00000000 --- a/src/tickets/signal_handlers.py +++ /dev/null @@ -1,36 +0,0 @@ -from django.utils import timezone -from django.conf import settings -from datetime import timedelta -from django.db.models import Count -import logging -logger = logging.getLogger("bornhack.%s" % __name__) - - -def ticket_created(sender, instance, created, **kwargs): - # only send a message when a ticket is created - if not created: - return - - # queue an IRC message to the orga channel if any is defined, otherwise for the default channel - target = settings.IRCBOT_CHANNELS['orga'] if 'orga' in settings.IRCBOT_CHANNELS else settings.IRCBOT_CHANNELS['default'] - - # get ticket stats, FIXME: Camp name is hardcoded here for now - from tickets.models import ShopTicket - stats = ", ".join(["%s: %s" % (tickettype['product__name'].replace("BornHack 2017 ", ""), tickettype['total']) for tickettype in ShopTicket.objects.filter(product__name__startswith="BornHack 2017").exclude(product__name__startswith="BornHack 2017 One Day").values('product__name').annotate(total=Count('product__name')).order_by('-total')]) - - onedaystats = Ticket.objects.filter(product__name__startswith="BornHack 2017 One Day Ticket").count() - onedaychildstats = Ticket.objects.filter(product__name__startswith="BornHack 2017 One Day Children").count() - - # queue the messages - from ircbot.models import OutgoingIrcMessage - OutgoingIrcMessage.objects.create( - target=target, - message="%s sold!" % instance.product.name, - timeout=timezone.now()+timedelta(minutes=10) - ) - OutgoingIrcMessage.objects.create( - target=target, - message="Totals: %s, 1day: %s, 1day child: %s" % (stats, onedaystats, onedaychildstats)[:200], - timeout=timezone.now()+timedelta(minutes=10) - ) - From e3ad6c5657843830e5b4137742ab1e6af7ba3d56 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 7 Jan 2018 20:15:09 +0100 Subject: [PATCH 017/351] update bootstrap script with better dates --- src/utils/management/commands/bootstrap-devsite.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/utils/management/commands/bootstrap-devsite.py b/src/utils/management/commands/bootstrap-devsite.py index 250f11c2..b3331837 100644 --- a/src/utils/management/commands/bootstrap-devsite.py +++ b/src/utils/management/commands/bootstrap-devsite.py @@ -321,29 +321,29 @@ class Command(BaseCommand): camp=camp ) - name = 'Standard ticket {}'.format(year) + name = 'BornHack {} Standard ticket'.format(year) ticket1 = Product.objects.create( name=name, description='A ticket', price=1200, category=tickets, available_in=( - timezone.datetime(2017, 3, 1, 12, 0, tzinfo=timezone.utc), - timezone.datetime(2017, 8, 20, 12, 0, tzinfo=timezone.utc), + timezone.datetime(year, 1, 1, 12, 0, tzinfo=timezone.utc), + timezone.datetime(year, 12, 20, 12, 0, tzinfo=timezone.utc), ), slug='{}'.format(slugify(name)), ticket_type=adult_full_week ) - name = 'Hacker ticket {}'.format(year) + name = 'BornHack {} Hacker ticket'.format(year) ticket2 = Product.objects.create( name=name, description='Another ticket', price=1337, category=tickets, available_in=( - timezone.datetime(2017, 3, 1, 12, 0, tzinfo=timezone.utc), - timezone.datetime(2017, 8, 20, 12, 0, tzinfo=timezone.utc), + timezone.datetime(year, 1, 1, 12, 0, tzinfo=timezone.utc), + timezone.datetime(year, 12, 20, 12, 0, tzinfo=timezone.utc), ), slug='{}'.format(slugify(name)), ticket_type=adult_full_week From 2ffcec7bcdccc07623c32016c3786c69ae4b307b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Wed, 10 Jan 2018 08:22:52 +0100 Subject: [PATCH 018/351] Adding 2018 letterheads. --- src/static_src/pdf/bornhack-2018_letterhead.odt | Bin 0 -> 21610 bytes src/static_src/pdf/bornhack-2018_letterhead.pdf | Bin 0 -> 17443 bytes .../pdf/bornhack-2018_test_letterhead.odt | Bin 0 -> 24315 bytes .../pdf/bornhack-2018_test_letterhead.pdf | Bin 0 -> 23548 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/static_src/pdf/bornhack-2018_letterhead.odt create mode 100644 src/static_src/pdf/bornhack-2018_letterhead.pdf create mode 100644 src/static_src/pdf/bornhack-2018_test_letterhead.odt create mode 100644 src/static_src/pdf/bornhack-2018_test_letterhead.pdf diff --git a/src/static_src/pdf/bornhack-2018_letterhead.odt b/src/static_src/pdf/bornhack-2018_letterhead.odt new file mode 100644 index 0000000000000000000000000000000000000000..b34df314456f88c8466c2a29f1656d2a0624ccaf GIT binary patch literal 21610 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

      X%)c!?RSAn#33 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 literal 0 HcmV?d00001 diff --git a/src/static_src/pdf/bornhack-2018_letterhead.pdf b/src/static_src/pdf/bornhack-2018_letterhead.pdf new file mode 100644 index 0000000000000000000000000000000000000000..8436470b4c2e5e395d0202b501a9e84b42091174 GIT binary patch literal 17443 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 BR0jY6 literal 0 HcmV?d00001 diff --git a/src/static_src/pdf/bornhack-2018_test_letterhead.odt b/src/static_src/pdf/bornhack-2018_test_letterhead.odt new file mode 100644 index 0000000000000000000000000000000000000000..124840345fbd99f3d21accae5595ef4300305b3e GIT binary patch literal 24315 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�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 literal 0 HcmV?d00001 diff --git a/src/static_src/pdf/bornhack-2018_test_letterhead.pdf b/src/static_src/pdf/bornhack-2018_test_letterhead.pdf new file mode 100644 index 0000000000000000000000000000000000000000..683afb1bdb8251b488f308a198ec2168fad6a198 GIT binary patch literal 23548 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

      +32bBz>)H}FPo zP$l$pBsT!=Ag!f}bRDM;Z32O4dtQh+%@Vu7%yXIUVLPV|7X z3H_0Cpvco3iIc7!6hVN4BzQa>Taz(Xl@C$4Jm%Oz;ZEF z!it-oBwsb`2dI!Hi?WE~kPOeke-cX^TiD%-$=oNdUx4e3Ij+xgDBc|Tg z9A)JM6F%W!1vBHRObFAIr0HFlXgJ&llTBfuHutAunWbJ5ou5SHPWQkLdsIZ)a-Wjj zGYXw;+{#EV)u-8Raqm>K2ER`#nSvF`unQwBvFR&G&Lze zHbT#v{ijJWfbXl0_GYusqIF(tqfIDN8L>`a153kQ4OTDgLmAr#6Fzo1G|W9)EhdCz zf(4=6VVtKrc59fwgj>FhzXvrWB~~v>!MzR%tqpNsE-#8Zq1DxGIN0yPz|}@l%dm*i z?XW3QcBwIHs;+@0gul6ABLUm&&Bg21`%9XFp4K842l6?ueI*sbBJ-imU=9j9!@ds^ zh&Y2upfz{4X1T}I>Q7^%))fV_|4t~ZNb~x1wvl5-i^Niu*NfdYLZF_V%~D zo6EuT=FbYEZhxG}>G+#rtU|=)pR-eb~JxSsQmaR=veyq3PXUAK3nsKCEVFfBwz6d z7ti8iL|ck0B5_#6h=Lhuf+7EX%^MsZ8e4^bflFc{#|HE$&$h?Q_VhTu>ao{xx!;Hukv!3dxei|#Mdi28fa@f0+u&z6n$B>9z5WD1K&Wyi2 zj26(Eq7KUmXuce|b6&2^Tq&KsI>(qplGV8HVN4J}_qi&HulzkWN^hpOlZ${0=u$qv zO4V#8SXL34HH}GjkPKdQiU+>OONVhPcwH)ZO++vwqCt250``)9c!dY&kKh~(o;Xp_ z5%eGcySpBw*CjYA(M~Ta+r~zFrRTC942>!E*Tax@iA;eue=Bzd*6vX&F%Eeyq5&d( zqq%qyNC+?s&JSy4vEU#PSTT^;0G+OJ`vv=EKWtWko*%9t1sFRqhO+|2um%RYn-mnV zQBl9bY8NXOMPAoY6$&+qR|;MV_Yk1X#1}ZFPCseEM=P$Pyt1Y46GPC9m676;r|c zkuuujrbMRKk$n00X)jtuB;Hi$<%D$HtL`1cqfqV-;sG9Fhe? zVMaM_D_{XP`X}#tpzTK}j5GKC^mPZc4gQ|PW6>z>8QLcBdUfrM6-UO^F$I}~Q zq~i3$9IFXwP2#+FFLq%|rhSQRQ(XFMu-i6b4*eO)C6ppdS(KrhZ)*a~L(-G`G}nfH zLYbHq$x_0Cr>Nm5DFhM0bQ)&*VZokp{)zB(t=(ie3_A}d(B`#;)g)-~x=QTuQcxSz zkJiwLJF}oq@cP(aIK}6?ZQY%FO?^;3B!bV^Kf~i<)=+4Dyt4b6cYQlS=epu>y|@x5 zZ?cs$lD4~V{8ftiv9?((w~2}RyxRBz&k~cJmu&%KJ+i4)sEjFsz<7%5U*c%%3Y)v@ zbNEd9Q2S>Pd=`G37|?$%$7v7^qNZig343Nrup5ChIhA^A;`wr_g78)7-uX&t*vTBX zmobk-o{JDeeL!0$K@yl!=VmG;>m*fq6dr8FBDEe@AJfo|ghSj0eQ_hC!DTCIB(bI; zlc#e{Vc@3{?CkGbvA5%D^ab$;M`Q*(9b3wIbE&4m21#)XJlIofB$CPj`A#s zX$TpAgEp{3^z@&(^xMSDnOk99D3%lOR~%U&o*s+^o=3@t!fuJWqfHs>&NmL9`XW7y;*dC@LgdrMLhAFItxO!+GrafYLFH zb46i=Wibq(me2Uhp)e3fB2Z_#=;MKFxqw9t>$2++$%7>_ONC%xoV^T zwV1iDZwYB<`BeEnM=#1VO{aHA9;@zUBF^#Hfc?~-y8^Fy#K^p9%4L<8F01fMDscYZ z!5ohzPcgHo;H47Vz2DbS3n2QQltipiq$<^yRboEV@4*uVWYj__mCTVWB=<}o;D>&y zq@R{*|0X3;jF1!^RIUhX!SQy1%impo*psgCFcG#404Xmw3K;hJbV~Pn+`Qc0e&(g{HeRxf_}-KBv42O{?+%B{*w!?jxY71O^wB)7vs4Vh6K_8j zeVFGd0H)OD#Qfodckvv6$=b*65U?ZxG!J)}LPJrqp$&wZ3LMLJp&H<+1eQrfp}1IT zf#&H-^(VZ{OR-p!!jc`5hKyXbk?KMcf!0!=ezeVmWi^|}Rw!KyX1pr!BJGz!g%%l7 zn@K9tmayfx@D`^>hgjD$`o5zAMjIZY{8;BBF$CYXEiAZGqNfjmynYvF+n9OXakX=y zTD4}p+@hRY8j&p=cxBx3FF!yVyAHSSUcnt@q#!9&lifO?B@VX|gISpFR>$DBb1*ud zF-e9At?Im~N6Mu>ZL7Ce&6Z!hyj2apQXf&?Kwg1?PP1p?dF`6>u-BA0;Hi}vydWSo z10cY8f-)_4gMXSs;i2USBFrF-(MdjQ@x$Bywp0Z)1Yd+gaw`P2VAXkb~0`^Nbv(EWS$D+ ztS8KAjFht@g;M2O>mhMn5+qlI zw$poC3}<}T`5dGKr7Wr}1@5^ED|1h)F=YQi3&gS@HNP^j#-3DJ&rRYC8KQ447@DA! z%+T@^22zqPJ_#}r|MlJHcee>!DU1~;X3%Qc2_@sMN_Rcdk4VtARtlBD>M_`?I>aqo zXW-RIxd-nHi5>li+vsVzjL7estkL@DQ@xZ|NJ6LO0rZ@Ms<3vvIeuo`ZCKLzTYSYw zcP|jH$jyC3tPuJ^@>O2EZ>YeOjnx2-5^Ngkc48X_z1M zly-?DZi;<#DrqWshl>-aCgcfifys1O2r}fp5F0twn!T!)d|$JaQ?)m^P=2b`-&7KK zMlII@tzYH|Zk#5lQXNT&V3T0j&@JmT-{b3v;^Os!afTBk6FY4*F`Tr4I)u=KkU{R1 zOQn@dj#@S@Wp?4_LRs{gZd~`WPF8{n<9ElQ6c?+D`~ZT}|{=cZ(&CY-rBeTT8zjSzI5$*ASi$lCL{3 zx?>c7!m-&@Iw3^16U)llwr*%N9*3Q-SAE^|wo)aZvS-(~1G+!txm_?V-!_(TACadw zx4_WBqg>6ZS3UH%pDv{`MRmL4NxBn94~Q+^QA6evO{@^K+_doM2)O#FWCN3_X3m6h zImMA(5$89;>}cLn_nz*U+)|f&l0AeMV6hH?=b8`OZ<`ZuOdN>fwE0!;qzC%5UVfhf zZ%c}e0NtJ2Yj5(kG~ypA96t9~MT)b}+1TV*)i>K%?4!skQbhN8?sG_i65E3-|{bvKAi$&TMz&K>-@@R)aE6%KUO=~2LzXYQ4;+3SbUB} zIRP=D&}fKt=r&H{xffvp3Q8z$JEwJDkR8`9%pbhDI;UzC|I>fx>c5XgWCu8 z?fvS06 z)9m)q$lNS}(-^7f5E*^ZLMc)?x>YgkB=CqLUNGrN$c1fRN1U;hES@0IBK{G)YFHG0ncX_Z@DuQT5NwH2z zFItuDxSx0S83Ut&hV0Mn?bg)h5HaofmVhwf4n}D~kmrbxjc6X;iGt$_q9}hW`sOo0vbBo`e#7#i^mC%9gxB1gr zU-vZaXM@!&cC|RABi>g=;*rAZWy=ygFDw``fF zx|Up%G2V?{kQ?#Q`%TuN9KEYy7uYq`DEC0m87IW)&bPy@TLt|VHKSdAbR6=->|nP+ zdgaQH)HwR|{kKFK$u-UI&{xKce6;(0jv}!40>e&qAvE-wDD!(G-t^%hH|lL!v)U_; zsaw1w7x(Ml_JB(1rr3+#R;?PicV1(>Rq;K0lyAL)^%MLS!K?Q;mQm8KU?1T&`8R7# zzY7PCv=2kk&ON%p^D$Yfu(3i<$<2b_f}h6;yp-2gYpizG(N;dR4^YFiJDfT10zN9= z=KZAo5JSX6(nUUO-UeTWNa&&mXa^kw$;7}=b=yY{)lzspOyFHCCvsn0@iDz72u~;s z5TklZOz|>KBmoyvMWh2lSCT~@4V?5O^GXGq*Cg{y8;91T4H+1QHcXWSSQt`8sx85% zhx(yM{iP;cK{EY^CR)N}7VuM172&PuCmKwVUv$ZdGRk>JXYrO%3yzng4S@$vZshYk zlKXm6MTI2M0PfVJSOk(Y6D>JM4FXXaY6+}vmg?||9qV{Y*3}Vwi6Z3@`d1&xBGv=n zhg8;iW`H^QF!_-#XFs31qM%@ExwrEGDrVZW6RRBDal4w``VkWLM5~$jv6#7AWYj^s z7MAtdnz|cXQq%O%#AGanx(8xIQuA0INJ3@w1?tB+iheZybr{5+k!FWZZg*O{2O zn3?G~*+M@K_S?(pvExCG{!3?DOQ;onriR3A|VK_5M?bJ>u4<+ND{8uX&>iQGJ3SO+K98rNDY0 z^oxGtts9~hG-_y2@o2CXnU;L8w!KC)WQB_A$wVO?-8>yh+vWFIL?y?5O3T*lxfc8% z9XGrf8*#P2_%GR`GgyfG98?D0IGSV?1iCnmTnEghk%W|q zd>9}vJ8Yw&Rz7IUD$uu~;MZOIIbiEACg12Pf77*oF*;;{E|}eLM%v?}=4R3-Mg0L} zh~UT>oxMFWMnsa2+v-iuY1wW}eD95npGQF5RriW~KeaS*eH*|Rb#j9`WcqtcoBY(jGKBZYEUzt0$d)|v@MUN4> zy2oBWm!yuLwY*zURE;8g(R1Ghx%CRRKhN^+J#@xMB|ORmqv;=;YYwj2Uo*5Gg8NRY zc@!@`o{;~@9kB+|nIA3aN11VzcY{qE6dz}UUk3TX%%kJA5TttC-Nd``jkaddxHEkm zP|J6H9%N@F@cG$ff#7O_0iOczQUXZja-fdiTj(wW5P1;XGC~IL8Qgy#eeB+EEI{CBYc1Sc&N6U0Go^;yz0YimNuF*Za z>!jv`?Nn(1#Xd{FrFy!s<#Iw-_9En*cz^GnEhw?^+NwImE%%<$oUM0AQfyfG#Nq`{ z&goh{?Q!t;Doj*{*cGAF;7@ zrr^B6rn|B#*Z41enj))ftmpCQS4_(~UyNdX$W$s3;A0N8_frY^NLf7&qAeqzTY|gJq8q%_T zX7DNUQ-7jK@L}MvX!bE+XE%6CRg2kxh zO#1wrtIheI^-k$RqlU9?d-0CXH_eViIDHU|o89WU;JXm6nDm5?7kV?nvn`cAXC^I4 zwy!qiH1V9Co5wGvxP5TWxyHW-TE}s0&ukZ?A>6VL?Q-1=Z^&JqTepU9zqn+#uP#0+ z!YeFQuA^$Fq`5nr%#)>;`m3Vn`@I06l;3Dx8)U^2Ls(RsEA8V8u5=Aw2X$=}SgLl- zvPWLu+Znn>mp>kgT(bf$rEZR&__tOtoOh=jOqrHACSMz^q|$1 ze1cx$UZEUzS@#AyfX3g<4XJNw_ip7E+XU!_SwCpG&kyWU;=hrZKd8g{w<}V1?N$Z* zyLA})yAvL7$XD54?NWC2!$Cf%`KaN1_U>m#^&R8+mx~YRVZXuN5kKIrrEl21;6Z)* z0Y5*&rjvH;-1Ystce#mPv`gcs^!IL>m5{$ktat2Q@SwiLHvaZ6g!zxBT{{^@_;6Z$`5{{Q3s_5XJqw*T?j{*C`H+kf?(jGWN_ z5$Eq1-T$$u{^znM__r%4LDQ?)soGlp1KR&C;s0%|{qHzD%79vr`b*a*-OgaU%y0bAu2 z7I~cIEi#w0%5-<8)vD!lUHy!PbLTq7P08YVW}AzNruxewxfAOmZq~+h@#6V`n(bDk zmsyg`)vJlGTJ@8x>(}?L`^@VMfTGne9%xPmC>(e2=Mdz$QHvkG*B~(;y&#kxxue9y zyf6YVAxQo2>a*V%n z@Lr2!^%?8mlp}Fs<_MZnK`uW*xN5#HEMzo(o@TD@Ac*lretq%@oZ@x}CXVJ64 zD0(trwUKX4sDP=_ek3t_aWbOGdaXR;oFx@A@P7dJBD6ckEHGv{cI3=s?|h$=;`jku zpq}-@LS6n|AIt;`i-b|P>z=mLecAsuLrZ=0LG1#n?)muw^ z^$T5IS4f>rHmIo6En7jXaI?gAaP@3|P0$xoDzc35rb;0D4#{fJ2xZ1`Y$4|IC)5e@ z4Z~Ku0Vq5{rLNHD@Hdnu%=LZ+UNG$qBuihHHjf@Ly?u*ai>*75^&772k)Fz#b}R3L zcEXlBcxrdB;YTpkR3_doRxkBItoje0t}O$3H}&Huf#J^erY1W}Yn$8mj!D_btl-H< zmvpuzTMZxi$u+5F>&SYq#j!fnu}xR)T2gtIb3|zI#Rz=nwwCM$QAOsib@0E3VR2 zKt!7KDv&}7p$ZATgM#!DdPyJwDGJzWA_&r}q9R?YH0dnTdk2vY(ovcs{$F(WTjksD z>_6wcOmfeiH+SybnUiyWc~`N@5qqtum#xEm=I)XUPo&bbegYpvvlYn@mNr)%)_0bM z|D3^G>y4=(mf;JZd~&Z{UuUsTOvv_zGs2uBvhs`uoFfPio}UVwb6jZe?_#(^~KKc!hk_)RcKLkLsst$~Iv8Yzyg>&XQ!z*Y*VW?{q$wSVf}guLv?Q`g}mw zE(sD1@v(Qs>CNKzxWK*PbIA!?7YhS~VT{$Uz~v^76m6X(1?+{V8mQ2mLFP>7s{Mwu zKBul-Y3imJiHpyvDKaxF^|RM`ZtL&E`+)wyS!abcXQ%3&Vq$GZ<}vD9bF~Sht1i=l zAa6?~^uz3qWkRgg>uqW8@rUNo_v7sBboIL%U{Rq7e7h01vq#=BCh6@LmIh5XuyCBp zj;bt3-Ffv~2Ls>THK>F}rwR;JT!))57deGC+FZFBY%8B{!v0D>uI=$lNO_I+X`%tm zD=5e!@5-6`Q+sDE1V4INK0AMG7Oqt?@W}l0TH1$A?kP(9!M8}WC8cmTidezTOKRR8C^d$bsG*1qblV^9n!nb4ELw_o|l8o{uS%*%Q7DYS+q-$^{uV zNG@(eXX@=%vZJdrEp1dv?&Z*pJE95QPKGjX%4*-Jfk)d|XfIxdgifs(W1-H8yW{Cqn< zWKV6|#%n{GuNc+eFZG7Zv(C`=hJk}#>obkF=i?zXnGDQ#?C^dA$HAG7KALHpcbF&~ zpbbwS)V@EF5EC2<4S~vvesq9dn-XRWw+!1n*lD3Fl}%k|kEhx$yb!36LvctKEtps! z**fp2;E8f7rFYc}Q)7rif_>1&d02wXwUa`;&PjnUFsWNsn=Gq6wB}WccQ4#HK6uAD z;b!GpRSL5Gistg&)WPHh!ANiiq@cEOVY?zHe7Tc>KfkkRA$sKFin(xCKBq-82c7TX z-f8ng^4fQpw%_*F-%AsjaI~M^05> z9;$&W zDnUjF6_1!HQT~f>6TX?Z??#^c@DhWwONz0sKTgp;-(aYAA=o$NmFn+({;`_q=*8b= zg!w8ci793tRwq!x?$Hn8qw~~FS&WLJdlGK()IKl>y9*Q2HSwLMV0#3^ZO}aD7$QYq1mvuP34|Ns~=ymSEk1$S_ z?I^Uq2H?edqPOLmlev_8C`e6USk@tM#jm-$eIonAetWmgyNW}1Mn z4EuYO$cY&FB~{av|LHPy*s|fff73Tqeq_RasN9q%Tlr>P z=KkAIWS-mG1FJ(H*F0@e(>d8QrPE0Pb3Q%RCRQf)GY{H=?znIl-;G%Dl8e&Szt(q#Lg}jQWs^G_Zz4+_4X!Jmu%~3BiaWo@-uV-%2Nym zue-f({Xzw{l()T=!KqWrN_D?g)eE)%G>XkF5@+A2+LrXJTQ!Bg<=ke33K3(EvUti- z78r3oM(8-7B@e=c@-*#IYeD@S(|}m%83UZ5T-0`v(wWJ+`a=Jkhh}?AUB#4EuWbhu zpPRx5^X-z=4U2H%xp~4O*4uoo6XnIVdRZ4=&FanJn9MxObdBa$D<;d~J*7|mH>kt? ztX@@%ZSQ_L+4UMJ+}Tna^X9N}nOxvP;`y9>&BK|!`M{k|BdRNjO{cyTh73-yns~wU z++BwuJpt<&yshfHgMc@@`7uMUrC7ZBr6v-u`9t~xZs1)XK5u-yR{r!}Dy8s_so17> zb&oagqm|1$=_5(00)cx%DR%CzY%*_UntBA46HxV!I@z$DUmq9gv`&3Hkv!r@hNt^I zrAx`Sb?@b-5f9Rax5_=a$9V;@rIa4=k&KUgN&oSEL7^9{f*mh-Lqibmm!8=b$ODgX zG!m!by1RL0oO)+utQ9UR`u7P{bp<7fXoWOmPBj9hD!k2Ro2aS9K~fXBqk_i8Jy^ti zsa^94Zi*9RjO|J?&^_Ai#a!m;_b%7Jv(2z>@BC|2?>K;Lpfa$Nw#TL7w`JbKStF`t4_bqNIkn4 ztl&0wcCpCqOus$uAnWrVm0dl(hHu@s7;^}kEgX|f8hmg#A4jY^KDPgT(aY;oSrLtX zuV@VFWV=e=6<%eYu;M7xPxcJ-eA{ZvxP7iEq|8O81wnUa$VqYJ{EGapME3m z_o=^6PR?`EFT?-v)6_`5msfz_4p>%Do183TVWBHE_1mI`;Se*oWvXkP{TgmXoTqBd z=(OKCt9u(c8}vJ28-nynsw#2(n#~$XL;bEHaS}beiGq0Uq8H2jpF@^t`%Y^n1&e+t zy>yXPX4hxT7|lQbth`%|VM_B{9~HyvU}Ubi4;`b=DW>CKsDbD?d#qXlHMqyIB& zz@C(~uV2}h_Jc5DiMBMf`h$qp`lq6Ao5j27T~iMQRxNx2vp3|vZOYZazG?dnb1tbm z*VH|#nv_VIRX;voak?(%@aw`P{y@a%qX5n7v!!D@GiN%2y0!7CyLEo*O0y3w)Cw1` zY;4usgdX6gqc+YG8LP<^_f}unTT(yV8~;~2g^};NrOaqunFHo6>up5bO?$&VuXHk-;V>7`l&H6lXA5u08u0rWqZF(Z}o-@Om zo9Q<-)G`-uy{r;VQd5lD?0IxqxS(g%f1{4vZ0f-#=V-;rnJ*Km&(+yAFg!grF5YMD z*H~0nCtou%uxMIO&lqFc=LfU)XVS|gzVsrrP|RViG_t{a=pKp}G3P_qgHOFM-7K)$ zy;JZ8;>7|&NUl^p$#xdF^8gSEPwD5&_}lW?(Gp=2VV zVutLo2dJ;7!qmhZ2d&L>aAH??gR28h?SryaDs~!J)YKZZO#XnaTqs`b%^^z=$W~Mf zMPwOy1}HS1dLVK4Fo%E?C5Nw^-Ey3j=;eveTB{2QcVx!EYMRRVAX}+<$Cm3LEA@Nq zSFA_ayRC73vqHHUaX8Ej{VTduN!$(Gt8i*pobmzx*jL$q;{#{j)| zICdi4xWp{M<7y(7W(a)0KX<=?k+t*fTDu)2c5LBe0CQqn)zmO#TEMi==*dv;I#!8u|c*j#G^UwE{_Q5tv zx`!4Eq8e}XUhDOX{F2BZHWnPCH%4qW9I*?xkkewm(c!M267c?_&2*b`jRr%wwygh( zJ8r808{R`C7rT(wa_OF^?1xujr8%Xl15GlYo${2MMTg@uyu6Ic_ z)bF_(dHRRnY}s;fn0GNfK2+CKo<6Rqg85pFVX6AiWAPoIKOqiJByVT1>!hK*BtRW}Nh|`}H(_>4`OAr~3ig#w6f2ioqMVGF zDzBIBW>yGXSzH=pPU4?ce-qA*BGYUe8_3E_V=;a=mZuc40k)>6bl>;jf^G9h36WO@ zHQbt&cvlB`_|&YW_zYX9lN+xpl(L1_9h|K6^!Lb9{C4#7=x(AR{cxBgdjey6WXrVK zH(Jnd?lb?CKmDsf6AUGR`a7u(`-iOR-?_rS5rM)#B7(oz0PKID0Wcg$@I!t@1OIO@ z08oQ}0s|0IZt_<$0RMXuf06+x;$O)?M4M9s_>AK2=MbY8p`0V`y}v(r^6Y%o;+=}G zzZtPq-ZrK$tlF3~3@^SX#@p#I?=*kv&9(4kgOqAX9^X%3VNrH5J5MsJT2)8A$DGj{ zuLUQp=VQ9lR$n*Gj4$={!=K=}UVFc;Ta!;Xwoc*aPM_S%up*o17xZOd6qKZU-SU~^ zrRnpBKGQq#T`EydlPwVj{$u1V7Ik0j=vvP*`JA=l6^o(vFx6IZ`h(@=SSi=bxtej* z#rwK92u#AEIxWKmPGqsc+1OdMzZ@oyK2~H4Qj^M^O7LUdm;K1Mg(60Oo|J4-ozC)S zyL~m8daYMBD%U~9@$O`@2{v6M8K1}D*Yr8I>EDeL_` z^9^L#N!fK$CYyATGS{T`zcbemQndb>x+X3CufgzB%`qjQoET|BKp9sk=XZectLk6W z3@G|aVg{U$AJ7S;L%?J8Z9PmtK%H37Wm|6#vtK~e5f|xL+1rA2tOz8$^zE2r!Ar`F+3q1k#Q!G0A=+73iqZRG|M@4H*61Y?7rUJJcO*h$fsQAfre6ipG1A zocGfZM^BaS^Z5^~(Qw2$gB0)t8(YG6hXCwQ&lc-p0zrYr0O*1c1L8pfA_hbOSPTX@ z1DNsmSd_<-*d#FfD|)J=OVHH{sLqR*bi~==FInRWI0q}NvzU#u5Maqq#{6_T{J0It zx&La6I0PyNkQI_KFmV|0{%^)OczC!GB|#uBFE6p5i~$|7267b2qOAbTinj+M2v~+6 z0YnATcC*F(n6AkWH-oMk8FS)1U0i;=fdRK`SmEpiZLCBw>OwzH7y1(?MFVw;0n#h2 zq^P6>2E&nHFcJy|BTzsK16qI=A)&HVq)hn^#MH?&>w;L^8)%K z#DNQt11ex~QmY8GFyLO_hXj@h0~Aaa#7IKH5D72@0tQP!Au!ZMFhl?h79hFgFRbfL zu(hKCP#S~^xYM66P6Qk-4(GJv{2_xv!AM{qkzSm*KV`sYk|%$aLB%DG>OrC6h@*N? zD4c}6e(4K^LXk&hU?>cHv@Zk>h94aRkVzcv3xPu=fWZ4@3$p$^95^hF$dIs~eBeO8m$0FqvVkos3Hb~ zk$}j Date: Sun, 11 Feb 2018 17:55:15 +0100 Subject: [PATCH 019/351] Fix admin for Info. --- src/info/admin.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/info/admin.py b/src/info/admin.py index e8b9235a..028c25aa 100644 --- a/src/info/admin.py +++ b/src/info/admin.py @@ -1,6 +1,22 @@ from django.contrib import admin from .models import * -admin.site.register(InfoCategory) -admin.site.register(InfoItem) +@admin.register(InfoItem) +class InfoItemAdmin(admin.ModelAdmin): + list_filter = ['category', 'category__camp',] + list_display = ['headline',] + + +class InfoItemInlineAdmin(admin.StackedInline): + model = InfoItem + list_filter = ['category', 'category__camp',] + list_display = ['headline',] + + +@admin.register(InfoCategory) +class InfoCategorydmin(admin.ModelAdmin): + list_filter = ['camp',] + list_display = ['headline',] + search_fields = ['headline', 'body'] + inlines = [InfoItemInlineAdmin] From 6fe1790e893d376717c8ae234f0cf5ad7cdc37ee Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 09:19:16 +0100 Subject: [PATCH 020/351] spelling --- src/utils/management/commands/run_managepy_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/management/commands/run_managepy_worker.py b/src/utils/management/commands/run_managepy_worker.py index 3d70d6f1..6b3c098e 100644 --- a/src/utils/management/commands/run_managepy_worker.py +++ b/src/utils/management/commands/run_managepy_worker.py @@ -9,7 +9,7 @@ logger = logging.getLogger('bornhack.%s' % __name__) class Command(BaseCommand): args = 'none' - help = 'Run a worker. Takes the worker module as the first positional argument and calls the do_work() function in it. Optional argumends can be seen with -h / --help' + help = 'Run a worker. Takes the worker module as the first positional argument and calls the do_work() function in it. Optional arguments can be seen with -h / --help' exit_now = False From 60c4bb49fb23fd2a040a317d2ef2fc57bf467507 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 12:04:07 +0100 Subject: [PATCH 021/351] Create new CampPropertyListFilter based on admin.SimpleListFilter to use for admin filtering of CampRelatedModels where self.camp is a property instead of a real field. Change the Team models camp field to a property, and make the Team model use the new CampPropertyListFilter in the admin. Change the BaseTicket model to being a CampRelatedModel and add a camp property, also, while here move ticket_created signal to signals.py, connect it in apps.py and rename it to ticket_updated. Change Sponsor model to being a CampRelatedModel and add a camp property. --- src/camps/utils.py | 39 ++++++++++++ src/sponsors/models.py | 5 +- src/teams/admin.py | 4 +- .../migrations/0019_auto_20180304_1019.py | 23 +++++++ src/teams/models.py | 28 ++++++--- src/tickets/apps.py | 7 +++ src/tickets/models.py | 61 ++----------------- src/tickets/signals.py | 56 +++++++++++++++++ src/utils/admin.py | 8 --- 9 files changed, 155 insertions(+), 76 deletions(-) create mode 100644 src/teams/migrations/0019_auto_20180304_1019.py create mode 100644 src/tickets/signals.py delete mode 100644 src/utils/admin.py diff --git a/src/camps/utils.py b/src/camps/utils.py index 81454fb7..036a45dd 100644 --- a/src/camps/utils.py +++ b/src/camps/utils.py @@ -1,5 +1,6 @@ from camps.models import Camp from django.utils import timezone +from django.contrib import admin def get_current_camp(): try: @@ -7,3 +8,41 @@ def get_current_camp(): except Camp.DoesNotExist: return False +class CampPropertyListFilter(admin.SimpleListFilter): + """ + SimpleListFilter to filter models by camp when camp is + a property and not a real model field. + """ + title = 'Camp' + parameter_name = 'camp' + + def lookups(self, request, model_admin): + # get the current queryset + qs = model_admin.get_queryset(request) + + # get a list of the unique camps in the current queryset + unique_camps = set([item.camp for item in qs]) + + # loop over camps and yield each as a tuple + for camp in unique_camps: + yield (camp.slug, camp.title) + + + def queryset(self, request, queryset): + # if self.value() is None return everything + if not self.value(): + return queryset + + # ok, get the Camp + try: + camp = Camp.objects.get(slug=self.value()) + except Camp.DoesNotExist: + # camp not found, return nothing + return queryset.model.objects.none() + + # filter out items related to other camps + for item in queryset: + if item.camp != camp: + queryset = queryset.exclude(pk=item.pk) + return queryset + diff --git a/src/sponsors/models.py b/src/sponsors/models.py index fca251d6..2555781a 100644 --- a/src/sponsors/models.py +++ b/src/sponsors/models.py @@ -13,7 +13,7 @@ def get_sponsor_upload_path(instance, filename): ) -class Sponsor(CreatedUpdatedModel): +class Sponsor(CampRelatedModel): name = models.CharField( max_length=150, help_text='Name of the sponsor' @@ -39,6 +39,9 @@ class Sponsor(CreatedUpdatedModel): def __str__(self): return '{} ({})'.format(self.name, self.tier.camp) + @property + def camp(self): + return self.tier.camp class SponsorTier(CampRelatedModel): name = models.CharField( diff --git a/src/teams/admin.py b/src/teams/admin.py index c56d48de..e479c0cc 100644 --- a/src/teams/admin.py +++ b/src/teams/admin.py @@ -1,6 +1,7 @@ from django.contrib import admin from .models import Team, TeamArea, TeamMember, TeamTask from .email import add_added_membership_email, add_removed_membership_email +from camps.utils import CampPropertyListFilter @admin.register(TeamTask) @@ -27,11 +28,10 @@ class TeamAdmin(admin.ModelAdmin): ] list_filter = [ - 'camp', + CampPropertyListFilter, 'needs_members', ] - @admin.register(TeamMember) class TeamMemberAdmin(admin.ModelAdmin): list_filter = [ diff --git a/src/teams/migrations/0019_auto_20180304_1019.py b/src/teams/migrations/0019_auto_20180304_1019.py new file mode 100644 index 00000000..019b3764 --- /dev/null +++ b/src/teams/migrations/0019_auto_20180304_1019.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-04 09:19 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0018_auto_20171122_2204'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='team', + unique_together=set([]), + ), + migrations.RemoveField( + model_name='team', + name='camp', + ), + ] diff --git a/src/teams/models.py b/src/teams/models.py index bbfc14b3..3c7eb8f5 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -29,13 +29,8 @@ class TeamArea(CampRelatedModel): class Team(CampRelatedModel): - class Meta: - ordering = ['name'] - unique_together = (('name', 'camp'), ('slug', 'camp')) - name = models.CharField(max_length=255) slug = models.SlugField(max_length=255, blank=True) - camp = models.ForeignKey('camps.Camp', related_name="teams") area = models.ForeignKey( 'teams.TeamArea', related_name='teams', @@ -50,9 +45,28 @@ class Team(CampRelatedModel): ) mailing_list = models.EmailField(blank=True) + class Meta: + ordering = ['name'] + def __str__(self): return '{} ({})'.format(self.name, self.camp) + def validate_unique(self, exclude): + """ + We cannot use unique_together with the camp field because it is a property, + so check uniqueness of team name and slug here instead + """ + # check if this team name is in use under this camp + if self.camp.teams.filter(name=self.name).exists(): + raise ValidationError("This Team name already exists for this Camp") + if self.camp.teams.filter(slug=self.slug).exists(): + raise ValidationError("This Team slug already exists for this Camp") + return True + + @property + def camp(self): + return self.area.camp + def save(self, **kwargs): if ( not self.pk or @@ -63,10 +77,6 @@ class Team(CampRelatedModel): super().save(**kwargs) - def clean(self): - if self.camp != self.area.camp: - raise ValidationError({'camp': 'camp is different from area.camp'}) - def memberstatus(self, member): if member not in self.members.all(): return "Not member" diff --git a/src/tickets/apps.py b/src/tickets/apps.py index 6418e2fe..d97353e2 100644 --- a/src/tickets/apps.py +++ b/src/tickets/apps.py @@ -1,7 +1,14 @@ from django.apps import AppConfig +from django.db.models.signals import post_save +from .signals import ticket_changed import logging logger = logging.getLogger("bornhack.%s" % __name__) class TicketsConfig(AppConfig): name = 'tickets' + + def ready(self): + # connect the post_save signal, including a dispatch_uid to prevent it being called multiple times in corner cases + post_save.connect(ticket_changed, sender='models.ShopTicket', dispatch_uid='shopticket_save_signal') + diff --git a/src/tickets/models.py b/src/tickets/models.py index 279d2543..8490f464 100644 --- a/src/tickets/models.py +++ b/src/tickets/models.py @@ -36,15 +36,18 @@ class TicketType(CampRelatedModel, UUIDModel): return '{} ({})'.format(self.name, self.camp.title) -class BaseTicket(CreatedUpdatedModel, UUIDModel): +class BaseTicket(CampRelatedModel, UUIDModel): ticket_type = models.ForeignKey('TicketType') checked_in = models.BooleanField(default=False) - badge_handed_out = models.BooleanField(default=False) class Meta: abstract = True + @property + def camp(self): + return self.ticket_type.camp + def _get_token(self): return hashlib.sha256( '{_id}{secret_key}'.format( @@ -146,58 +149,4 @@ class ShopTicket(BaseTicket): return "shop" -@receiver(post_save, sender=ShopTicket) -def ticket_created(sender, instance, created, **kwargs): - # only send a message when a ticket is created - if not created: - return - # queue an IRC message to the orga channel if defined, - # otherwise for the default channel - target = settings.IRCBOT_CHANNELS['orga'] if 'orga' in settings.IRCBOT_CHANNELS else settings.IRCBOT_CHANNELS['default'] - - # get ticket stats - ticket_prefix = "BornHack {}".format(datetime.now().year) - - stats = ", ".join( - [ - "{}: {}".format( - tickettype['product__name'].replace( - "{} ".format(ticket_prefix), - "" - ), - tickettype['total'] - ) for tickettype in ShopTicket.objects.filter( - product__name__startswith=ticket_prefix - ).exclude( - product__name__startswith="{} One Day".format(ticket_prefix) - ).values( - 'product__name' - ).annotate( - total=Count('product__name') - ).order_by('-total') - ] - ) - - onedaystats = ShopTicket.objects.filter( - product__name__startswith="{} One Day Ticket".format(ticket_prefix) - ).count() - onedaychildstats = ShopTicket.objects.filter( - product__name__startswith="{} One Day Children".format(ticket_prefix) - ).count() - - # queue the messages - OutgoingIrcMessage.objects.create( - target=target, - message="%s sold!" % instance.product.name, - timeout=timezone.now()+timedelta(minutes=10) - ) - OutgoingIrcMessage.objects.create( - target=target, - message="Totals: {}, 1day: {}, 1day child: {}".format( - stats, - onedaystats, - onedaychildstats - )[:200], - timeout=timezone.now()+timedelta(minutes=10) - ) diff --git a/src/tickets/signals.py b/src/tickets/signals.py new file mode 100644 index 00000000..0ed8c752 --- /dev/null +++ b/src/tickets/signals.py @@ -0,0 +1,56 @@ +from django.conf import settings +from .models import ShopTicket +from ircbot.models import OutgoingIrcMessage + +def ticket_changed(sender, instance, created, **kwargs): + """ + This signal is called every time a ShopTicket is saved + """ + # only queue an IRC message when a new ticket is created + if not created: + return + + # queue an IRC message to the orga channel if defined, + # otherwise for the default channel + target = settings.IRCBOT_CHANNELS['orga'] if 'orga' in settings.IRCBOT_CHANNELS else settings.IRCBOT_CHANNELS['default'] + + # get ticket stats + ticket_prefix = "BornHack {}".format(datetime.now().year) + + stats = ", ".join( + [ + "{}: {}".format( + tickettype['product__name'].replace( + "{} ".format(ticket_prefix), + "" + ), + tickettype['total'] + ) for tickettype in ShopTicket.objects.filter( + product__name__startswith=ticket_prefix + ).exclude( + product__name__startswith="{} One Day".format(ticket_prefix) + ).values( + 'product__name' + ).annotate( + total=Count('product__name') + ).order_by('-total') + ] + ) + + onedaystats = ShopTicket.objects.filter( + product__name__startswith="{} One Day Ticket".format(ticket_prefix) + ).count() + onedaychildstats = ShopTicket.objects.filter( + product__name__startswith="{} One Day Children".format(ticket_prefix) + ).count() + + # queue the messages + OutgoingIrcMessage.objects.create( + target=target, + message="%s sold!" % instance.product.name, + timeout=timezone.now()+timedelta(minutes=10) + ) + OutgoingIrcMessage.objects.create( + target=target, + message="Totals: {}, 1day: {}, 1day child: {}".format( + stats, diff --git a/src/utils/admin.py b/src/utils/admin.py deleted file mode 100644 index 7eb6ca09..00000000 --- a/src/utils/admin.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.contrib import admin - -from .models import OutgoingEmail - - -@admin.register(OutgoingEmail) -class OutgoingEmailAdmin(admin.ModelAdmin): - pass From fe4e47edb07eb45ed5e14a20f4e6a10fdf203622 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 12:48:35 +0100 Subject: [PATCH 022/351] add a related_name for the camp relation for TeamArea, and a teams property to Camp model to make it easier to get all teams under all teamareas, also add exclude=None to the validate_unique call in our CleanedModel class --- src/camps/models.py | 7 +++++++ .../migrations/0020_auto_20180304_1233.py | 21 +++++++++++++++++++ src/teams/models.py | 2 +- src/utils/models.py | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/teams/migrations/0020_auto_20180304_1233.py diff --git a/src/camps/models.py b/src/camps/models.py index 809dcc32..e9886edd 100644 --- a/src/camps/models.py +++ b/src/camps/models.py @@ -188,3 +188,10 @@ class Camp(CreatedUpdatedModel, UUIDModel): return False else: return True + + @property + def teams(self): + """ Return a queryset with all teams under all TeamAreas under this Camp """ + from teams.models import Team + return Team.objects.filter(area__in=self.teamareas.all()) + diff --git a/src/teams/migrations/0020_auto_20180304_1233.py b/src/teams/migrations/0020_auto_20180304_1233.py new file mode 100644 index 00000000..4cfe13a0 --- /dev/null +++ b/src/teams/migrations/0020_auto_20180304_1233.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-04 11:33 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0019_auto_20180304_1019'), + ] + + operations = [ + migrations.AlterField( + model_name='teamarea', + name='camp', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='teamareas', to='camps.Camp'), + ), + ] diff --git a/src/teams/models.py b/src/teams/models.py index 3c7eb8f5..33e2a9bd 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -18,7 +18,7 @@ class TeamArea(CampRelatedModel): name = models.CharField(max_length=255) description = models.TextField(default='') - camp = models.ForeignKey('camps.Camp') + camp = models.ForeignKey('camps.Camp', related_name="teamareas", on_delete=models.PROTECT) responsible = models.ManyToManyField( 'auth.User', related_name='responsible_team_areas' diff --git a/src/utils/models.py b/src/utils/models.py index 5699b323..4c4ddd1b 100644 --- a/src/utils/models.py +++ b/src/utils/models.py @@ -20,7 +20,7 @@ class CleanedModel(models.Model): # which is not supposed to happen. Call them manually one by one instead. self.clean_fields() self.clean() - self.validate_unique() + self.validate_unique(exclude=None) except ValidationError as e: message = "Got ValidationError while saving: %s" % e if hasattr(self, 'request'): From 07b338783100cfac60ed738432b0652a8285213d Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 13:19:42 +0100 Subject: [PATCH 023/351] import later, add missing bit of signal, change model reference in signal connection --- src/tickets/__init__.py | 2 ++ src/tickets/apps.py | 2 +- src/tickets/signals.py | 10 ++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/tickets/__init__.py b/src/tickets/__init__.py index e69de29b..56457177 100644 --- a/src/tickets/__init__.py +++ b/src/tickets/__init__.py @@ -0,0 +1,2 @@ +default_app_config = 'tickets.apps.TicketsConfig' + diff --git a/src/tickets/apps.py b/src/tickets/apps.py index d97353e2..7559fae7 100644 --- a/src/tickets/apps.py +++ b/src/tickets/apps.py @@ -10,5 +10,5 @@ class TicketsConfig(AppConfig): def ready(self): # connect the post_save signal, including a dispatch_uid to prevent it being called multiple times in corner cases - post_save.connect(ticket_changed, sender='models.ShopTicket', dispatch_uid='shopticket_save_signal') + post_save.connect(ticket_changed, sender='tickets.ShopTicket', dispatch_uid='shopticket_save_signal') diff --git a/src/tickets/signals.py b/src/tickets/signals.py index 0ed8c752..542c8ef0 100644 --- a/src/tickets/signals.py +++ b/src/tickets/signals.py @@ -1,6 +1,4 @@ from django.conf import settings -from .models import ShopTicket -from ircbot.models import OutgoingIrcMessage def ticket_changed(sender, instance, created, **kwargs): """ @@ -15,6 +13,7 @@ def ticket_changed(sender, instance, created, **kwargs): target = settings.IRCBOT_CHANNELS['orga'] if 'orga' in settings.IRCBOT_CHANNELS else settings.IRCBOT_CHANNELS['default'] # get ticket stats + from .models import ShopTicket ticket_prefix = "BornHack {}".format(datetime.now().year) stats = ", ".join( @@ -45,6 +44,7 @@ def ticket_changed(sender, instance, created, **kwargs): ).count() # queue the messages + from ircbot.models import OutgoingIrcMessage OutgoingIrcMessage.objects.create( target=target, message="%s sold!" % instance.product.name, @@ -54,3 +54,9 @@ def ticket_changed(sender, instance, created, **kwargs): target=target, message="Totals: {}, 1day: {}, 1day child: {}".format( stats, + onedaystats, + onedaychildstats + )[:200], + timeout=timezone.now()+timedelta(minutes=10) + ) + From 782331793997cf02f22fa3e0bf47f4a992d29598 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 13:29:43 +0100 Subject: [PATCH 024/351] add missing imports --- src/tickets/models.py | 4 ---- src/tickets/signals.py | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tickets/models.py b/src/tickets/models.py index 8490f464..e6ed1253 100644 --- a/src/tickets/models.py +++ b/src/tickets/models.py @@ -17,10 +17,6 @@ from utils.models import ( from utils.pdf import generate_pdf_letter from django.db import models from django.db.models.signals import post_save -from datetime import ( - timedelta, - datetime -) from django.db.models import Count from ircbot.models import OutgoingIrcMessage diff --git a/src/tickets/signals.py b/src/tickets/signals.py index 542c8ef0..df43840e 100644 --- a/src/tickets/signals.py +++ b/src/tickets/signals.py @@ -1,4 +1,8 @@ from django.conf import settings +from datetime import ( + timedelta, + datetime +) def ticket_changed(sender, instance, created, **kwargs): """ From 0f0794edfa24412518e140289345fb17025f6ff8 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 13:39:11 +0100 Subject: [PATCH 025/351] another missing requirement --- src/tickets/models.py | 2 -- src/tickets/signals.py | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tickets/models.py b/src/tickets/models.py index e6ed1253..52070fbf 100644 --- a/src/tickets/models.py +++ b/src/tickets/models.py @@ -17,8 +17,6 @@ from utils.models import ( from utils.pdf import generate_pdf_letter from django.db import models from django.db.models.signals import post_save -from django.db.models import Count -from ircbot.models import OutgoingIrcMessage logger = logging.getLogger("bornhack.%s" % __name__) diff --git a/src/tickets/signals.py b/src/tickets/signals.py index df43840e..310984ea 100644 --- a/src/tickets/signals.py +++ b/src/tickets/signals.py @@ -3,6 +3,7 @@ from datetime import ( timedelta, datetime ) +from django.db.models import Count def ticket_changed(sender, instance, created, **kwargs): """ From ee628f418352ba4f464fad1a8d9c89e04786d56c Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:16:22 +0100 Subject: [PATCH 026/351] move another import --- src/tickets/models.py | 1 - src/tickets/signals.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tickets/models.py b/src/tickets/models.py index 52070fbf..f196676f 100644 --- a/src/tickets/models.py +++ b/src/tickets/models.py @@ -5,7 +5,6 @@ import base64 import qrcode from django.conf import settings -from django.utils import timezone from django.dispatch import receiver from django.core.urlresolvers import reverse_lazy from django.utils.translation import ugettext_lazy as _ diff --git a/src/tickets/signals.py b/src/tickets/signals.py index 310984ea..c7fec0c2 100644 --- a/src/tickets/signals.py +++ b/src/tickets/signals.py @@ -4,6 +4,7 @@ from datetime import ( datetime ) from django.db.models import Count +from django.utils import timezone def ticket_changed(sender, instance, created, **kwargs): """ From 477177a9367e8708bdfd4a05f246c5458a038910 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:30:27 +0100 Subject: [PATCH 027/351] remove unneeded imports from backoffice app --- src/backoffice/views.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/backoffice/views.py b/src/backoffice/views.py index fc460e97..dfb3de69 100644 --- a/src/backoffice/views.py +++ b/src/backoffice/views.py @@ -1,8 +1,4 @@ from django.views.generic import TemplateView, ListView -from django.shortcuts import redirect -from django.views import View -from django.conf import settings -from django.utils.decorators import method_decorator from django.http import HttpResponseForbidden from shop.models import OrderProductRelation from tickets.models import ShopTicket, SponsorTicket, DiscountTicket From 6980f53a96d80ed93db30439aab244cb89b824a8 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:31:13 +0100 Subject: [PATCH 028/351] remove unneeded imports from bar app --- src/bar/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bar/views.py b/src/bar/views.py index b87306f4..eb0cf10e 100644 --- a/src/bar/views.py +++ b/src/bar/views.py @@ -1,5 +1,4 @@ -from .models import ProductCategory, Product - +from .models import ProductCategory from django.views.generic import ListView @@ -7,3 +6,4 @@ class MenuView(ListView): model = ProductCategory template_name = "bar_menu.html" context_object_name = "categories" + From 9e82013ca0114046a69f6ddd1bc277e966946403 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:31:46 +0100 Subject: [PATCH 029/351] remove unneeded imports from bornhack app --- src/bornhack/urls.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bornhack/urls.py b/src/bornhack/urls.py index 5b4d6f0f..5d1189d9 100644 --- a/src/bornhack/urls.py +++ b/src/bornhack/urls.py @@ -12,7 +12,6 @@ from program.views import * from sponsors.views import * from teams.views import * from people.views import * -from tickets.views import ShopTicketListView from bar.views import MenuView urlpatterns = [ From 81abf8db36fcf2f80119b893a9c276f93e694251 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:35:27 +0100 Subject: [PATCH 030/351] remove unneeded imports from info app --- src/info/models.py | 2 +- src/info/tests.py | 3 --- src/info/views.py | 4 +--- 3 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 src/info/tests.py diff --git a/src/info/models.py b/src/info/models.py index e166b2d7..ac6964c2 100644 --- a/src/info/models.py +++ b/src/info/models.py @@ -1,5 +1,5 @@ from django.db import models -from utils.models import CreatedUpdatedModel, CampRelatedModel +from utils.models import CampRelatedModel from django.core.exceptions import ValidationError diff --git a/src/info/tests.py b/src/info/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/info/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/info/views.py b/src/info/views.py index 08e14ea5..a9db1920 100644 --- a/src/info/views.py +++ b/src/info/views.py @@ -1,6 +1,4 @@ -from django.shortcuts import render -from django.views.generic import ListView, DetailView -from django.utils import timezone +from django.views.generic import ListView from .models import * from camps.mixins import CampViewMixin From ad9f9d15811a9b610334d749561b7f3d8ac08311 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:36:52 +0100 Subject: [PATCH 031/351] remove unneeded imports from ircbot app --- src/ircbot/ircworker.py | 1 - src/ircbot/models.py | 2 +- src/ircbot/views.py | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 src/ircbot/views.py diff --git a/src/ircbot/ircworker.py b/src/ircbot/ircworker.py index 3e683057..94fac174 100644 --- a/src/ircbot/ircworker.py +++ b/src/ircbot/ircworker.py @@ -1,4 +1,3 @@ -from .models import OutgoingIrcMessage from django.conf import settings import logging, irc3 logging.basicConfig(level=logging.INFO) diff --git a/src/ircbot/models.py b/src/ircbot/models.py index ae422fc8..23c5207e 100644 --- a/src/ircbot/models.py +++ b/src/ircbot/models.py @@ -1,5 +1,5 @@ from django.core.exceptions import ValidationError -from utils.models import UUIDModel, CreatedUpdatedModel +from utils.models import CreatedUpdatedModel from django.db import models from django.utils import timezone diff --git a/src/ircbot/views.py b/src/ircbot/views.py deleted file mode 100644 index 91ea44a2..00000000 --- a/src/ircbot/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. From 0d47ec5607e499663175e44d955dcfb1b13ab261 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:39:01 +0100 Subject: [PATCH 032/351] remove unneeded imports from people app --- src/people/admin.py | 3 --- src/people/models.py | 3 --- src/people/tests.py | 3 --- src/people/views.py | 1 - 4 files changed, 10 deletions(-) delete mode 100644 src/people/admin.py delete mode 100644 src/people/models.py delete mode 100644 src/people/tests.py diff --git a/src/people/admin.py b/src/people/admin.py deleted file mode 100644 index 8c38f3f3..00000000 --- a/src/people/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/src/people/models.py b/src/people/models.py deleted file mode 100644 index 71a83623..00000000 --- a/src/people/models.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.db import models - -# Create your models here. diff --git a/src/people/tests.py b/src/people/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/people/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/people/views.py b/src/people/views.py index e9ec181f..570e3e7e 100644 --- a/src/people/views.py +++ b/src/people/views.py @@ -1,4 +1,3 @@ -from django.shortcuts import render from django.views.generic import ListView from camps.models import Camp From d140155b6331409a315890b7d58e9e2a6fde552d Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:41:51 +0100 Subject: [PATCH 033/351] remove unneeded imports from sponsors app --- src/sponsors/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sponsors/models.py b/src/sponsors/models.py index 2555781a..c7f78731 100644 --- a/src/sponsors/models.py +++ b/src/sponsors/models.py @@ -1,6 +1,6 @@ from django.db import models -from utils.models import CampRelatedModel, CreatedUpdatedModel +from utils.models import CampRelatedModel def get_sponsor_upload_path(instance, filename): From bd32595783fb2f2dc01a36d954db7c43606f12f9 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:42:57 +0100 Subject: [PATCH 034/351] remove unneeded imports from teams app --- src/teams/tests.py | 3 --- src/teams/views.py | 5 ++--- 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 src/teams/tests.py diff --git a/src/teams/tests.py b/src/teams/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/teams/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/teams/views.py b/src/teams/views.py index d5937e00..f739e781 100644 --- a/src/teams/views.py +++ b/src/teams/views.py @@ -1,13 +1,12 @@ from django.views.generic import ListView, DetailView -from django.views.generic.edit import CreateView, UpdateView, FormView +from django.views.generic.edit import CreateView, UpdateView from camps.mixins import CampViewMixin from .models import Team, TeamMember, TeamTask -from .forms import ManageTeamForm from .email import add_added_membership_email, add_removed_membership_email from django.contrib.auth.mixins import LoginRequiredMixin from django.shortcuts import redirect from django.contrib import messages -from django.http import Http404, HttpResponseRedirect +from django.http import HttpResponseRedirect from django.views.generic.detail import SingleObjectMixin from django.core.urlresolvers import reverse_lazy From afa782b26b4064eb05efb2031550d4c8cd70d0bf Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:43:56 +0100 Subject: [PATCH 035/351] remove unneeded imports from tickets app --- src/tickets/models.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/tickets/models.py b/src/tickets/models.py index f196676f..f81dc31e 100644 --- a/src/tickets/models.py +++ b/src/tickets/models.py @@ -1,22 +1,17 @@ import io -import logging import hashlib import base64 import qrcode - from django.conf import settings -from django.dispatch import receiver from django.core.urlresolvers import reverse_lazy from django.utils.translation import ugettext_lazy as _ from utils.models import ( UUIDModel, CampRelatedModel, - CreatedUpdatedModel ) from utils.pdf import generate_pdf_letter from django.db import models -from django.db.models.signals import post_save - +import logging logger = logging.getLogger("bornhack.%s" % __name__) From 99cb7f5307982fb719be93b3efbcaaba6c04e47b Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:44:33 +0100 Subject: [PATCH 036/351] remove unneeded imports from utils app --- src/utils/templatetags/menubutton.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/templatetags/menubutton.py b/src/utils/templatetags/menubutton.py index 72fa4986..5d4029e4 100644 --- a/src/utils/templatetags/menubutton.py +++ b/src/utils/templatetags/menubutton.py @@ -1,4 +1,3 @@ -import datetime from django import template register = template.Library() From 0c005245706fd29def3ac9a51491072e9cf58e91 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 14:46:18 +0100 Subject: [PATCH 037/351] remove unneeded imports from villages app --- src/villages/models.py | 2 +- src/villages/tests.py | 3 --- src/villages/views.py | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 src/villages/tests.py diff --git a/src/villages/models.py b/src/villages/models.py index 19aa81b3..a6f8db8c 100644 --- a/src/villages/models.py +++ b/src/villages/models.py @@ -1,7 +1,7 @@ from django.core.urlresolvers import reverse_lazy from django.db import models from django.utils.text import slugify -from utils.models import CreatedUpdatedModel, UUIDModel, CampRelatedModel +from utils.models import UUIDModel, CampRelatedModel from .managers import VillageQuerySet diff --git a/src/villages/tests.py b/src/villages/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/villages/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/villages/views.py b/src/villages/views.py index 2595503c..d7c42d83 100644 --- a/src/villages/views.py +++ b/src/villages/views.py @@ -8,7 +8,6 @@ from .models import Village from camps.models import Camp from camps.mixins import CampViewMixin from .mixins import EnsureWritableCampMixin -from django.contrib import messages class VillageListView(CampViewMixin, ListView): From 10bd3bdd0d13c99ed04d3ddbf9ebc02f8802a6a1 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:18:59 +0100 Subject: [PATCH 038/351] remove camp from team objects in bootstrap script --- src/utils/management/commands/bootstrap-devsite.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/utils/management/commands/bootstrap-devsite.py b/src/utils/management/commands/bootstrap-devsite.py index b3331837..040274de 100644 --- a/src/utils/management/commands/bootstrap-devsite.py +++ b/src/utils/management/commands/bootstrap-devsite.py @@ -1405,13 +1405,11 @@ Please note that sleeping in the parking lot is not permitted. If you want to sl noc_team = Team.objects.create( name="NOC", description="The NOC team is in charge of establishing and running a network onsite.".format(year), - camp=camp, area=infrastructure_area, ) bar_team = Team.objects.create( name="Bar", description="The Bar team plans, builds and run the IRL bar!", - camp=camp, area=bar_area ) From bc042a1755a94c3bfe296f502e030a9340a390cf Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:22:13 +0100 Subject: [PATCH 039/351] add self to fix reference to team responsible --- src/teams/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/teams/models.py b/src/teams/models.py index 33e2a9bd..4e6353d1 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -165,5 +165,5 @@ class TeamTask(CampRelatedModel): @property def responsible(self): - return team.responsible.all() + return self.team.responsible.all() From d83592b13c9075e4402e5c71670a3e66691b39eb Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 15:41:07 +0100 Subject: [PATCH 040/351] Add BSD 3-clause LICENSE file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding everyone who contributed to the bornhack-website repo as co-authors for this commit. Co-authored-by: Víðir Valberg Guðmundsson Co-authored-by: Stephan Telling Co-authored-by: Kasper Christensen Co-authored-by: Benjamin Bach Co-authored-by: Ronni Elken Lindsgaard Co-authored-by: Alexander Færøy Co-authored-by: RadicalPet Co-authored-by: Reynir Björnsson Co-authored-by: coral Co-authored-by: klarstrup Co-authored-by: Janus Troelsen Co-authored-by: kugg Co-authored-by: Ximin Luo Co-authored-by: Henrik Kramshøj Co-authored-by: Jonty Wareing --- LICENSE | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..1d932f6b --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +BSD 3-Clause License + +Copyright (c) 2016-2018, BornHack +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 2a151a6a2368dfa74a11102e3d9e8c803e4ac6c3 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 15:43:03 +0100 Subject: [PATCH 041/351] Remove old notes from README --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 4494c0ea..384a69fe 100644 --- a/README.md +++ b/README.md @@ -101,9 +101,3 @@ You can also specify details like: * A `static_src/img/{camp-slug}/logo` and add two logos: * `{camp-slug}-logo-large.png` * `{camp-slug}-logo-small.png` - -### multicamp prod migration notes - -* when villages.0008 migration fails go add camp_id to all existing villages -* go to admin interface and add bornhack 2017, and set slug for bornhack 2016 -* convert events to the new format (somehow) From e3297553e94f70adb453d04f2aadd4d412f4abff Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 15:54:20 +0100 Subject: [PATCH 042/351] Add a Contributors section at the bottom of README --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 384a69fe..3a1e2171 100644 --- a/README.md +++ b/README.md @@ -101,3 +101,21 @@ You can also specify details like: * A `static_src/img/{camp-slug}/logo` and add two logos: * `{camp-slug}-logo-large.png` * `{camp-slug}-logo-small.png` + +## Contributors +Alexander Færøy https://github.com/ahf +Benjamin Bach https://github.com/benjaoming +coral https://github.com/coral +Henrik Kramshøj https://github.com/kramse +Janus Troelsen https://github.com/ysangkok +Jonty Wareing https://github.com/Jonty +Kasper Christensen https://github.com/fALKENdk +klarstrup https://github.com/klarstrup +kugg https://github.com/kugg +RadicalPet https://github.com/RadicalPet +Reynir Björnsson https://github.com/reynir +Ronni Elken Lindsgaard https://github.com/rlindsgaard +Stephan Telling https://github.com/Telling +Thomas Steen Rasmusssen https://github.com/tykling +Víðir Valberg Guðmundsson https://github.com/valberg +Ximin Luo https://github.com/infinity0 From 139d2deff91dd7e1ee84a78cf227cd7a95bad68a Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 15:55:18 +0100 Subject: [PATCH 043/351] Make contrbutors a list --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 3a1e2171..3c44f1ae 100644 --- a/README.md +++ b/README.md @@ -103,19 +103,19 @@ You can also specify details like: * `{camp-slug}-logo-small.png` ## Contributors -Alexander Færøy https://github.com/ahf -Benjamin Bach https://github.com/benjaoming -coral https://github.com/coral -Henrik Kramshøj https://github.com/kramse -Janus Troelsen https://github.com/ysangkok -Jonty Wareing https://github.com/Jonty -Kasper Christensen https://github.com/fALKENdk -klarstrup https://github.com/klarstrup -kugg https://github.com/kugg -RadicalPet https://github.com/RadicalPet -Reynir Björnsson https://github.com/reynir -Ronni Elken Lindsgaard https://github.com/rlindsgaard -Stephan Telling https://github.com/Telling -Thomas Steen Rasmusssen https://github.com/tykling -Víðir Valberg Guðmundsson https://github.com/valberg -Ximin Luo https://github.com/infinity0 +* Alexander Færøy https://github.com/ahf +* Benjamin Bach https://github.com/benjaoming +* coral https://github.com/coral +* Henrik Kramshøj https://github.com/kramse +* Janus Troelsen https://github.com/ysangkok +* Jonty Wareing https://github.com/Jonty +* Kasper Christensen https://github.com/fALKENdk +* klarstrup https://github.com/klarstrup +* kugg https://github.com/kugg +* RadicalPet https://github.com/RadicalPet +* Reynir Björnsson https://github.com/reynir +* Ronni Elken Lindsgaard https://github.com/rlindsgaard +* Stephan Telling https://github.com/Telling +* Thomas Steen Rasmusssen https://github.com/tykling +* Víðir Valberg Guðmundsson https://github.com/valberg +* Ximin Luo https://github.com/infinity0 From 488767b4f0bbd8abb22a7b569b6ea2a5c1d25187 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:38:40 +0100 Subject: [PATCH 044/351] cleanup in shop/ --- src/shop/admin.py | 1 + src/shop/apps.py | 1 + src/shop/coinify.py | 11 +++-- src/shop/context_processors.py | 5 -- src/shop/epay.py | 12 +++-- src/shop/forms.py | 1 - src/shop/managers.py | 2 - src/shop/models.py | 13 ++--- src/shop/tests.py | 3 -- src/shop/urls.py | 1 - src/shop/views.py | 89 +++++++++++++++++++--------------- 11 files changed, 70 insertions(+), 69 deletions(-) delete mode 100644 src/shop/tests.py diff --git a/src/shop/admin.py b/src/shop/admin.py index 5362cf9d..b783e359 100644 --- a/src/shop/admin.py +++ b/src/shop/admin.py @@ -40,6 +40,7 @@ def available_from(product): return "None" available_from.short_description = 'Available from' + def available_to(product): if product.available_in.upper: return product.available_in.upper.strftime("%c") diff --git a/src/shop/apps.py b/src/shop/apps.py index 5edbc95c..8e6d60e7 100644 --- a/src/shop/apps.py +++ b/src/shop/apps.py @@ -2,6 +2,7 @@ from django.apps import AppConfig import logging logger = logging.getLogger("bornhack.%s" % __name__) + class ShopConfig(AppConfig): name = 'shop' diff --git a/src/shop/coinify.py b/src/shop/coinify.py index 1077f97b..3b984c5a 100644 --- a/src/shop/coinify.py +++ b/src/shop/coinify.py @@ -1,8 +1,9 @@ from vendor.coinify.coinify_api import CoinifyAPI -from vendor.coinify.coinify_callback import CoinifyCallback from .models import CoinifyAPIRequest, CoinifyAPIInvoice, CoinifyAPICallback from django.conf import settings -import json, logging +import json +import logging +import requests logger = logging.getLogger("bornhack.%s" % __name__) @@ -34,7 +35,7 @@ def save_coinify_callback(request, order): # now attempt to parse json try: parsed = json.loads(request.body.decode('utf-8')) - except Exception as E: + except Exception: parsed = '' # save this callback to db @@ -89,8 +90,8 @@ def handle_coinify_api_response(req, order): if req.response['success']: # save this new coinify invoice to the DB coinifyinvoice = process_coinify_invoice_json( - invoicejson = req.response['data'], - order = order, + invoicejson=req.response['data'], + order=order, ) return coinifyinvoice else: diff --git a/src/shop/context_processors.py b/src/shop/context_processors.py index 676e42b5..94796c89 100644 --- a/src/shop/context_processors.py +++ b/src/shop/context_processors.py @@ -1,6 +1,3 @@ -from django.conf import settings - - def current_order(request): if request.user.is_authenticated(): order = None @@ -11,5 +8,3 @@ def current_order(request): return {'current_order': order} return {} - - diff --git a/src/shop/epay.py b/src/shop/epay.py index dba32ba1..764cec28 100644 --- a/src/shop/epay.py +++ b/src/shop/epay.py @@ -1,6 +1,7 @@ import hashlib from django.conf import settings + def calculate_epay_hash(order, request): hashstring = ( '{merchant_number}{description}11{amount}DKK' @@ -10,9 +11,9 @@ def calculate_epay_hash(order, request): description=order.description, amount=order.total*100, order_id=order.pk, - accept_url = order.get_epay_accept_url(request), - cancel_url = order.get_cancel_url(request), - callback_url = order.get_epay_callback_url(request), + accept_url=order.get_epay_accept_url(request), + cancel_url=order.get_cancel_url(request), + callback_url=order.get_epay_callback_url(request), md5_secret=settings.EPAY_MD5_SECRET, ) epay_hash = hashlib.md5(hashstring.encode('utf-8')).hexdigest() @@ -24,6 +25,7 @@ def validate_epay_callback(query): for key, value in query.items(): if key != 'hash': hashstring += value - hash = hashlib.md5((hashstring + settings.EPAY_MD5_SECRET).encode('utf-8')).hexdigest() + hash = hashlib.md5( + (hashstring + settings.EPAY_MD5_SECRET).encode('utf-8') + ).hexdigest() return hash == query['hash'] - diff --git a/src/shop/forms.py b/src/shop/forms.py index 6d6f41af..3d8dcbcd 100644 --- a/src/shop/forms.py +++ b/src/shop/forms.py @@ -1,5 +1,4 @@ from django import forms -from .models import Order class AddToOrderForm(forms.Form): diff --git a/src/shop/managers.py b/src/shop/managers.py index e10d1906..dc01c2e6 100644 --- a/src/shop/managers.py +++ b/src/shop/managers.py @@ -1,5 +1,3 @@ -from psycopg2.extras import DateTimeTZRange - from django.db.models import QuerySet from django.utils import timezone diff --git a/src/shop/models.py b/src/shop/models.py index a7ab8953..a8d3acc7 100644 --- a/src/shop/models.py +++ b/src/shop/models.py @@ -1,8 +1,4 @@ -import io import logging -import hashlib -import base64 -import qrcode from django.conf import settings from django.db import models @@ -202,7 +198,7 @@ class Order(CreatedUpdatedModel): if request: messages.success(request, "Created %s tickets of type: %s" % (order_product.quantity, order_product.product.ticket_type.name)) # and mark the OPR as handed_out=True - order_product.handed_out=True + order_product.handed_out = True order_product.save() self.save() @@ -210,8 +206,8 @@ class Order(CreatedUpdatedModel): if not self.paid: messages.error(request, "Order %s is not paid, so cannot mark it as refunded!" % self.pk) else: - self.refunded=True - ### delete any tickets related to this order + self.refunded = True + # delete any tickets related to this order if self.tickets.all(): messages.success(request, "Order %s marked as refunded, deleting %s tickets..." % (self.pk, self.tickets.count())) self.tickets.all().delete() @@ -259,7 +255,6 @@ class Order(CreatedUpdatedModel): if not self.coinify_api_invoices.exists(): return False - coinifyinvoice = None for tempinvoice in self.coinify_api_invoices.all(): # we already have a coinifyinvoice for this order, check if it expired if not tempinvoice.expired: @@ -512,7 +507,7 @@ class CoinifyAPIInvoice(CreatedUpdatedModel): @property def expired(self): - return parse_datetime(self.invoicejson['expire_time']) < timezone.now() + return parse_datetime(self.invoicejson['expire_time']) < timezone.now() class CoinifyAPICallback(CreatedUpdatedModel): diff --git a/src/shop/tests.py b/src/shop/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/shop/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/shop/urls.py b/src/shop/urls.py index 78d7dc1d..5f089d28 100644 --- a/src/shop/urls.py +++ b/src/shop/urls.py @@ -1,6 +1,5 @@ from django.conf.urls import url from .views import * -from tickets.views import ShopTicketListView urlpatterns = [ url(r'^$', ShopIndexView.as_view(), name='index'), diff --git a/src/shop/views.py b/src/shop/views.py index 4d77e1c7..2ed4dc13 100644 --- a/src/shop/views.py +++ b/src/shop/views.py @@ -3,21 +3,23 @@ from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin from django.core.urlresolvers import reverse, reverse_lazy from django.db.models import Count, F -from django.http import HttpResponse, HttpResponseRedirect, HttpResponseBadRequest, Http404 +from django.http import ( + HttpResponse, + HttpResponseRedirect, + HttpResponseBadRequest, + Http404 +) from django.shortcuts import get_object_or_404 from django.views.generic import ( View, - TemplateView, ListView, DetailView, FormView, - UpdateView, ) from django.views.generic.base import RedirectView from django.views.generic.detail import SingleObjectMixin from django.utils.decorators import method_decorator from django.views.decorators.csrf import csrf_exempt -from django.utils.dateparse import parse_datetime from django.utils import timezone from shop.models import ( @@ -27,24 +29,22 @@ from shop.models import ( ProductCategory, EpayCallback, EpayPayment, - CoinifyAPIInvoice, - CoinifyAPICallback, CreditNote, ) from .forms import AddToOrderForm from .epay import calculate_epay_hash, validate_epay_callback from collections import OrderedDict -from vendor.coinify.coinify_api import CoinifyAPI from vendor.coinify.coinify_callback import CoinifyCallback -from .coinify import create_coinify_invoice, save_coinify_callback, process_coinify_invoice_json -import json, time +from .coinify import ( + create_coinify_invoice, + save_coinify_callback, + process_coinify_invoice_json +) import logging logger = logging.getLogger("bornhack.%s" % __name__) - -################################################################################# -### Mixins +# Mixins class EnsureCreditNoteHasPDFMixin(SingleObjectMixin): model = CreditNote @@ -92,7 +92,9 @@ class EnsureUnpaidOrderMixin(SingleObjectMixin): def dispatch(self, request, *args, **kwargs): if self.get_object().paid: messages.error(request, "This order is already paid for!") - return HttpResponseRedirect(reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk})) + return HttpResponseRedirect( + reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk}) + ) return super(EnsureUnpaidOrderMixin, self).dispatch( request, *args, **kwargs @@ -105,7 +107,9 @@ class EnsurePaidOrderMixin(SingleObjectMixin): def dispatch(self, request, *args, **kwargs): if not self.get_object().paid: messages.error(request, "This order is not paid for!") - return HttpResponseRedirect(reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk})) + return HttpResponseRedirect( + reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk}) + ) return super(EnsurePaidOrderMixin, self).dispatch( request, *args, **kwargs @@ -118,7 +122,9 @@ class EnsureClosedOrderMixin(SingleObjectMixin): def dispatch(self, request, *args, **kwargs): if self.get_object().open is not None: messages.error(request, 'This order is still open!') - return HttpResponseRedirect(reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk})) + return HttpResponseRedirect( + reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk}) + ) return super(EnsureClosedOrderMixin, self).dispatch( request, *args, **kwargs @@ -160,15 +166,16 @@ class EnsureOrderHasInvoicePDFMixin(SingleObjectMixin): def dispatch(self, request, *args, **kwargs): if not self.get_object().invoice.pdf: messages.error(request, "This order has no invoice yet!") - return HttpResponseRedirect(reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk})) + return HttpResponseRedirect( + reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk}) + ) return super(EnsureOrderHasInvoicePDFMixin, self).dispatch( request, *args, **kwargs ) -################################################################################# -### Shop views +# Shop views class ShopIndexView(ListView): model = Product template_name = "shop_index.html" @@ -215,7 +222,7 @@ class ProductDetailView(FormView, DetailView): def dispatch(self, request, *args, **kwargs): if not self.get_object().category.public: - ### this product is not publicly available + # this product is not publicly available raise Http404("Product not found") return super(ProductDetailView, self).dispatch( @@ -264,7 +271,9 @@ class ProductDetailView(FormView, DetailView): return super(ProductDetailView, self).form_valid(form) def get_success_url(self): - return Order.objects.get(user=self.request.user, open__isnull=False).get_absolute_url() + return Order.objects.get( + user=self.request.user, open__isnull=False + ).get_absolute_url() class OrderListView(LoginRequiredMixin, ListView): @@ -289,7 +298,9 @@ class OrderDetailView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureOrderH if payment_method in order.PAYMENT_METHODS: if not request.POST.get('accept_terms'): messages.error(request, "You need to accept the general terms and conditions before you can continue!") - return HttpResponseRedirect(reverse_lazy('shop:order_detail', kwargs={'pk': order.pk})) + return HttpResponseRedirect( + reverse_lazy('shop:order_detail', kwargs={'pk': order.pk}) + ) # Set payment method and mark the order as closed order.payment_method = payment_method @@ -389,9 +400,7 @@ class OrderMarkAsPaidView(LoginRequiredMixin, SingleObjectMixin, View): return HttpResponseRedirect(request.META.get('HTTP_REFERER')) -################################################################################# -### Epay views - +# Epay views class EpayFormView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUnpaidOrderMixin, EnsureClosedOrderMixin, EnsureOrderHasProductsMixin, DetailView): model = Order template_name = 'epay_form.html' @@ -435,18 +444,18 @@ class EpayCallbackView(SingleObjectMixin, View): return HttpResponse(status=400) if order.paid: - ### this order is already paid, perhaps we are seeing a double callback? + # this order is already paid, perhaps we are seeing a double callback? return HttpResponse('OK') - ### epay callback is valid - has the order been paid in full? + # epay callback is valid - has the order been paid in full? if int(query['amount']) == order.total * 100: - ### create an EpayPayment object linking the callback to the order + # create an EpayPayment object linking the callback to the order EpayPayment.objects.create( order=order, callback=callback, txnid=query.get('txnid'), ) - ### and mark order as paid (this will create tickets) + # and mark order as paid (this will create tickets) order.mark_as_paid(request) else: logger.error("valid epay callback with wrong amount detected") @@ -464,15 +473,16 @@ class EpayThanksView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureClosedO if request.GET: # epay redirects the user back to our accepturl with a long # and ugly querystring, redirect user to the clean url - return HttpResponseRedirect(reverse('shop:epay_thanks', kwargs={'pk': self.get_object().pk})) + return HttpResponseRedirect( + reverse('shop:epay_thanks', kwargs={'pk': self.get_object().pk}) + ) return super(EpayThanksView, self).dispatch( request, *args, **kwargs ) -################################################################################# -### Bank Transfer view +# Bank Transfer view class BankTransferView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUnpaidOrderMixin, EnsureOrderHasProductsMixin, DetailView): model = Order @@ -489,16 +499,14 @@ class BankTransferView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUnpai return context -################################################################################# -### Cash payment view +# Cash payment view class CashView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUnpaidOrderMixin, EnsureOrderHasProductsMixin, DetailView): model = Order template_name = 'cash.html' -################################################################################# -### Coinify views +# Coinify views class CoinifyRedirectView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUnpaidOrderMixin, EnsureClosedOrderMixin, EnsureOrderHasProductsMixin, SingleObjectMixin, RedirectView): model = Order @@ -511,7 +519,9 @@ class CoinifyRedirectView(LoginRequiredMixin, EnsureUserOwnsOrderMixin, EnsureUn coinifyinvoice = create_coinify_invoice(order, request) if not coinifyinvoice: messages.error(request, "There was a problem with the payment provider. Please try again later") - return HttpResponseRedirect(reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk})) + return HttpResponseRedirect( + reverse_lazy('shop:order_detail', kwargs={'pk': self.get_object().pk}) + ) return super(CoinifyRedirectView, self).dispatch( request, *args, **kwargs @@ -544,14 +554,17 @@ class CoinifyCallbackView(SingleObjectMixin, View): # attemt to validate the callbackc if sdk.validate_callback(request.body, request.META['HTTP_X_COINIFY_CALLBACK_SIGNATURE']): # mark callback as valid in db - callbackobject.valid=True + callbackobject.valid = True callbackobject.save() else: logger.error("invalid coinify callback detected") return HttpResponseBadRequest('something is fucky') if callbackobject.payload['event'] == 'invoice_state_change' or callbackobject.payload['event'] == 'invoice_manual_resend': - coinifyinvoice = process_coinify_invoice_json(callbackobject.payload['data'], self.get_object()) + process_coinify_invoice_json( + callbackobject.payload['data'], + self.get_object() + ) return HttpResponse('OK') else: logger.error("unsupported callback event %s" % callbackobject.payload['event']) From 8026dba14fa59c879b56c0b69274b6c63220ae2b Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:39:22 +0100 Subject: [PATCH 045/351] cleanup in sponsors/ --- src/sponsors/apps.py | 2 -- src/sponsors/models.py | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sponsors/apps.py b/src/sponsors/apps.py index c1102258..4db5584e 100644 --- a/src/sponsors/apps.py +++ b/src/sponsors/apps.py @@ -1,5 +1,3 @@ - - from django.apps import AppConfig diff --git a/src/sponsors/models.py b/src/sponsors/models.py index c7f78731..f1823b99 100644 --- a/src/sponsors/models.py +++ b/src/sponsors/models.py @@ -43,6 +43,7 @@ class Sponsor(CampRelatedModel): def camp(self): return self.tier.camp + class SponsorTier(CampRelatedModel): name = models.CharField( max_length=25, From 5bffb9c53a092014086d9437ef3abad390436f28 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:40:34 +0100 Subject: [PATCH 046/351] cleanup in villages/ --- src/villages/apps.py | 2 -- src/villages/mixins.py | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/villages/apps.py b/src/villages/apps.py index 13a45918..473aafca 100644 --- a/src/villages/apps.py +++ b/src/villages/apps.py @@ -1,5 +1,3 @@ - - from django.apps import AppConfig diff --git a/src/villages/mixins.py b/src/villages/mixins.py index 9b157ef6..a6356ed2 100644 --- a/src/villages/mixins.py +++ b/src/villages/mixins.py @@ -9,9 +9,9 @@ class EnsureWritableCampMixin(SingleObjectMixin): # do not permit view if camp is in readonly mode if self.camp.read_only: messages.error(request, "No thanks") - return redirect(reverse('village_list', kwargs={'camp_slug': self.camp.slug})) + return redirect( + reverse('village_list', kwargs={'camp_slug': self.camp.slug}) + ) # alright, continue with the request return super().dispatch(request, *args, **kwargs) - - From f9ba48ddfb77a0ba5be11f566d83a85e100e11c4 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:48:57 +0100 Subject: [PATCH 047/351] cleanup in program/ --- src/program/consumers.py | 9 ++++++++- src/program/mixins.py | 22 ++++++++++++++++------ src/program/models.py | 5 ----- src/program/tests.py | 3 --- src/program/views.py | 17 +++++++---------- 5 files changed, 31 insertions(+), 25 deletions(-) delete mode 100644 src/program/tests.py diff --git a/src/program/consumers.py b/src/program/consumers.py index 4c659066..06713545 100644 --- a/src/program/consumers.py +++ b/src/program/consumers.py @@ -1,7 +1,14 @@ from channels.generic.websockets import JsonWebsocketConsumer from camps.models import Camp -from .models import Event, EventInstance, Favorite, EventLocation, EventType, Speaker +from .models import ( + Event, + EventInstance, + Favorite, + EventLocation, + EventType, + Speaker +) class ScheduleConsumer(JsonWebsocketConsumer): diff --git a/src/program/mixins.py b/src/program/mixins.py index 79a837ab..9cf00b5f 100644 --- a/src/program/mixins.py +++ b/src/program/mixins.py @@ -3,8 +3,9 @@ from django.shortcuts import redirect from django.urls import reverse from . import models from django.contrib import messages -import sys, mimetypes from django.http import Http404, HttpResponse +import sys +import mimetypes class EnsureCFSOpenMixin(SingleObjectMixin): @@ -12,7 +13,9 @@ class EnsureCFSOpenMixin(SingleObjectMixin): # do not permit editing if call for speakers is not open if not self.camp.call_for_speakers_open: messages.error(request, "The Call for Speakers is not open.") - return redirect(reverse('proposal_list', kwargs={'camp_slug': self.camp.slug})) + return redirect( + reverse('proposal_list', kwargs={'camp_slug': self.camp.slug}) + ) # alright, continue with the request return super().dispatch(request, *args, **kwargs) @@ -23,8 +26,10 @@ class CreateProposalMixin(SingleObjectMixin): # set camp and user before saving form.instance.camp = self.camp form.instance.user = self.request.user - speaker = form.save() - return redirect(reverse('proposal_list', kwargs={'camp_slug': self.camp.slug})) + form.save() + return redirect( + reverse('proposal_list', kwargs={'camp_slug': self.camp.slug}) + ) class EnsureUnapprovedProposalMixin(SingleObjectMixin): @@ -54,7 +59,9 @@ class EnsureUserOwnsProposalMixin(SingleObjectMixin): # make sure that this proposal belongs to the logged in user if self.get_object().user.username != request.user.username: messages.error(request, "No thanks") - return redirect(reverse('proposal_list', kwargs={'camp_slug': self.camp.slug})) + return redirect( + reverse('proposal_list', kwargs={'camp_slug': self.camp.slug}) + ) # alright, continue with the request return super().dispatch(request, *args, **kwargs) @@ -83,7 +90,10 @@ class PictureViewMixin(SingleObjectMixin): def get_picture_response(self, path): if 'runserver' in sys.argv or 'runserver_plus' in sys.argv: # this is a local devserver situation, guess mimetype from extension and return picture directly - response = HttpResponse(self.picture, content_type=mimetypes.types_map[".%s" % self.picture.name.split(".")[-1]]) + response = HttpResponse( + self.picture, + content_type=mimetypes.types_map[".%s" % self.picture.name.split(".")[-1]] + ) else: # make nginx serve the picture using X-Accel-Redirect # (this works for nginx only, other webservers use x-sendfile) diff --git a/src/program/models.py b/src/program/models.py index b34bed8a..43a0c8eb 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -1,7 +1,6 @@ import uuid import os import icalendar -import CommonMark import logging from datetime import timedelta @@ -10,12 +9,9 @@ from django.contrib.postgres.fields import DateTimeRangeField from django.contrib import messages from django.db import models from django.core.exceptions import ObjectDoesNotExist, ValidationError -from django.dispatch import receiver from django.utils.text import slugify from django.conf import settings from django.core.urlresolvers import reverse_lazy -from django.core.exceptions import ValidationError -from django.core.urlresolvers import reverse_lazy, reverse from django.core.files.storage import FileSystemStorage from django.urls import reverse from django.apps import apps @@ -644,7 +640,6 @@ class Speaker(CampRelatedModel): def get_large_picture_url(self): return self.get_picture_url('large') - def serialize(self): data = { 'name': self.name, diff --git a/src/program/tests.py b/src/program/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/program/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/program/views.py b/src/program/views.py index acb08112..c6c7ec3b 100644 --- a/src/program/views.py +++ b/src/program/views.py @@ -1,4 +1,3 @@ -import datetime import logging import os @@ -12,7 +11,6 @@ from django.contrib.admin.views.decorators import staff_member_required from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib import messages from django.urls import reverse -from django.db.models import Q from django.template import Engine, Context import icalendar @@ -34,7 +32,7 @@ from . import models logger = logging.getLogger("bornhack.%s" % __name__) -############## ical calendar ######################################################## +# ical calendar class ICSView(CampViewMixin, View): @@ -90,7 +88,7 @@ class ICSView(CampViewMixin, View): return response -############## proposals ######################################################## +# proposals class ProposalListView(LoginRequiredMixin, CampViewMixin, ListView): @@ -241,7 +239,7 @@ class EventProposalDetailView(LoginRequiredMixin, CampViewMixin, EnsureUserOwnsP template_name = 'eventproposal_detail.html' -################## speakers ############################################### +# speakers @method_decorator(require_safe, name='dispatch') @@ -268,7 +266,7 @@ class SpeakerListView(CampViewMixin, ListView): template_name = 'speaker_list.html' -################## events ############################################## +# events class EventListView(CampViewMixin, ListView): @@ -281,7 +279,7 @@ class EventDetailView(CampViewMixin, DetailView): template_name = 'schedule_event_detail.html' -################## schedule ############################################# +# schedule class NoScriptScheduleView(CampViewMixin, TemplateView): @@ -293,13 +291,12 @@ class NoScriptScheduleView(CampViewMixin, TemplateView): return context - class ScheduleView(CampViewMixin, TemplateView): template_name = 'schedule_overview.html' def get_context_data(self, *args, **kwargs): context = super(ScheduleView, self).get_context_data(**kwargs) - context['schedule_midnight_offset_hours'] = settings.SCHEDULE_MIDNIGHT_OFFSET_HOURS; + context['schedule_midnight_offset_hours'] = settings.SCHEDULE_MIDNIGHT_OFFSET_HOURS return context @@ -308,8 +305,8 @@ class CallForSpeakersView(CampViewMixin, TemplateView): return '%s_call_for_speakers.html' % self.camp.slug +# control center -################## control center ############################################# class ProgramControlCenter(CampViewMixin, TemplateView): template_name = "control/index.html" From aac89c0a9c2626984f54d263c8488f8748cb118b Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:50:05 +0100 Subject: [PATCH 048/351] cleanup in profiles/ --- src/profiles/admin.py | 1 + src/profiles/tests.py | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 src/profiles/tests.py diff --git a/src/profiles/admin.py b/src/profiles/admin.py index a2c46950..012a4199 100644 --- a/src/profiles/admin.py +++ b/src/profiles/admin.py @@ -1,6 +1,7 @@ from django.contrib import admin from .models import Profile + @admin.register(Profile) class OrderAdmin(admin.ModelAdmin): actions = ['approve_public_credit_names'] diff --git a/src/profiles/tests.py b/src/profiles/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/profiles/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. From e482501d7bd91e1247300cffd956730e565a1dd4 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:51:33 +0100 Subject: [PATCH 049/351] cleanup in news/ --- src/news/apps.py | 2 -- src/news/models.py | 2 -- src/news/tests.py | 3 --- src/news/views.py | 3 ++- 4 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 src/news/tests.py diff --git a/src/news/apps.py b/src/news/apps.py index 0077041d..5a7b92d0 100644 --- a/src/news/apps.py +++ b/src/news/apps.py @@ -1,5 +1,3 @@ - - from django.apps import AppConfig diff --git a/src/news/models.py b/src/news/models.py index ee8a028e..86b2b786 100644 --- a/src/news/models.py +++ b/src/news/models.py @@ -1,5 +1,3 @@ - - from django.db import models from django.utils import encoding from django.utils.text import slugify diff --git a/src/news/tests.py b/src/news/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/src/news/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/news/views.py b/src/news/views.py index 8056bc9d..7d324709 100644 --- a/src/news/views.py +++ b/src/news/views.py @@ -1,6 +1,7 @@ from django.views.generic import ListView, DetailView from django.utils import timezone -from .models import * +from .models import NewsItem + class NewsIndex(ListView): model = NewsItem From f20695094ec2c764afe074eacbf251db0331a47e Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:52:56 +0100 Subject: [PATCH 050/351] cleanup in ircbot/ --- src/ircbot/admin.py | 2 +- src/ircbot/apps.py | 2 -- src/ircbot/ircworker.py | 5 +++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ircbot/admin.py b/src/ircbot/admin.py index 91278423..eff2cb89 100644 --- a/src/ircbot/admin.py +++ b/src/ircbot/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import * +from .models import OutgoingIrcMessage admin.site.register(OutgoingIrcMessage) diff --git a/src/ircbot/apps.py b/src/ircbot/apps.py index d057f8c7..54a5147b 100644 --- a/src/ircbot/apps.py +++ b/src/ircbot/apps.py @@ -1,5 +1,3 @@ - - from django.apps import AppConfig diff --git a/src/ircbot/ircworker.py b/src/ircbot/ircworker.py index 94fac174..b0afd363 100644 --- a/src/ircbot/ircworker.py +++ b/src/ircbot/ircworker.py @@ -1,5 +1,6 @@ from django.conf import settings -import logging, irc3 +import logging +import irc3 logging.basicConfig(level=logging.INFO) logger = logging.getLogger('bornhack.%s' % __name__) @@ -24,5 +25,5 @@ def do_work(): irc3.IrcBot(**config).run(forever=True) except Exception as E: logger.exception("Got exception inside do_work for %s" % self.workermodule) - raise + raise E From d20a964793e5d33841b6269cb6abc7e0cacf5a44 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:56:11 +0100 Subject: [PATCH 051/351] cleanup in info/ --- src/info/admin.py | 5 ++++- src/info/apps.py | 2 -- src/info/models.py | 32 +++++++++++++++----------------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/info/admin.py b/src/info/admin.py index 028c25aa..941ac13a 100644 --- a/src/info/admin.py +++ b/src/info/admin.py @@ -1,5 +1,8 @@ from django.contrib import admin -from .models import * +from .models import ( + InfoItem, + InfoCategory +) @admin.register(InfoItem) diff --git a/src/info/apps.py b/src/info/apps.py index 7fca4660..3891f47e 100644 --- a/src/info/apps.py +++ b/src/info/apps.py @@ -1,5 +1,3 @@ - - from django.apps import AppConfig diff --git a/src/info/models.py b/src/info/models.py index ac6964c2..f507c683 100644 --- a/src/info/models.py +++ b/src/info/models.py @@ -11,22 +11,22 @@ class InfoCategory(CampRelatedModel): camp = models.ForeignKey( 'camps.Camp', - related_name = 'infocategories', - on_delete = models.PROTECT + related_name='infocategories', + on_delete=models.PROTECT ) headline = models.CharField( - max_length = 100, - help_text = "The headline of this info category" + max_length=100, + help_text="The headline of this info category" ) anchor = models.SlugField( - help_text = "The HTML anchor to use for this info category." + help_text="The HTML anchor to use for this info category." ) weight = models.PositiveIntegerField( - help_text = 'Determines sorting/ordering. Heavier categories sink to the bottom. Categories with the same weight are ordered alphabetically. Defaults to 100.', - default = 100, + help_text='Determines sorting/ordering. Heavier categories sink to the bottom. Categories with the same weight are ordered alphabetically. Defaults to 100.', + default=100, ) def clean(self): @@ -45,26 +45,26 @@ class InfoItem(CampRelatedModel): category = models.ForeignKey( 'info.InfoCategory', - related_name = 'infoitems', - on_delete = models.PROTECT + related_name='infoitems', + on_delete=models.PROTECT ) headline = models.CharField( - max_length = 100, - help_text = "Headline of this info item." + max_length=100, + help_text="Headline of this info item." ) anchor = models.SlugField( - help_text = "The HTML anchor to use for this info item." + help_text="The HTML anchor to use for this info item." ) body = models.TextField( - help_text = 'Body of this info item. Markdown is supported.' + help_text='Body of this info item. Markdown is supported.' ) weight = models.PositiveIntegerField( - help_text = 'Determines sorting/ordering. Heavier items sink to the bottom. Items with the same weight are ordered alphabetically. Defaults to 100.', - default = 100, + help_text='Determines sorting/ordering. Heavier items sink to the bottom. Items with the same weight are ordered alphabetically. Defaults to 100.', + default=100, ) @property @@ -78,5 +78,3 @@ class InfoItem(CampRelatedModel): def __str__(self): return '%s (%s)' % (self.headline, self.category) - - From aaa4df27db2d97f98ad2eaa8cc31727abed70ed8 Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:58:20 +0100 Subject: [PATCH 052/351] cleanup in camps/ --- src/camps/context_processors.py | 2 -- src/camps/mixins.py | 4 +--- src/camps/utils.py | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/camps/context_processors.py b/src/camps/context_processors.py index a1b290f7..bedd7ee2 100644 --- a/src/camps/context_processors.py +++ b/src/camps/context_processors.py @@ -1,6 +1,4 @@ -from django.conf import settings from .models import Camp -from django.utils import timezone def camp(request): diff --git a/src/camps/mixins.py b/src/camps/mixins.py index 5234c1c7..83338f84 100644 --- a/src/camps/mixins.py +++ b/src/camps/mixins.py @@ -17,10 +17,8 @@ class CampViewMixin(object): if queryset: # check if we have a foreignkey to Camp, filter if so for field in queryset.model._meta.fields: - if field.name=="camp" and field.related_model._meta.label == "camps.Camp": + if field.name == "camp" and field.related_model._meta.label == "camps.Camp": return queryset.filter(camp=self.camp) # Camp relation not found, or queryset is empty, return it unaltered return queryset - - diff --git a/src/camps/utils.py b/src/camps/utils.py index 036a45dd..c4e2838e 100644 --- a/src/camps/utils.py +++ b/src/camps/utils.py @@ -2,12 +2,14 @@ from camps.models import Camp from django.utils import timezone from django.contrib import admin + def get_current_camp(): try: return Camp.objects.get(camp__contains=timezone.now()) except Camp.DoesNotExist: return False + class CampPropertyListFilter(admin.SimpleListFilter): """ SimpleListFilter to filter models by camp when camp is @@ -27,7 +29,6 @@ class CampPropertyListFilter(admin.SimpleListFilter): for camp in unique_camps: yield (camp.slug, camp.title) - def queryset(self, request, queryset): # if self.value() is None return everything if not self.value(): @@ -45,4 +46,3 @@ class CampPropertyListFilter(admin.SimpleListFilter): if item.camp != camp: queryset = queryset.exclude(pk=item.pk) return queryset - From 663099a6030b0a29613bd8901a47a8e7bc3b650d Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 15:59:12 +0100 Subject: [PATCH 053/351] cleanup in bar/ --- src/bar/admin.py | 3 --- src/bar/apps.py | 2 -- src/bar/models.py | 1 - src/bar/views.py | 1 - 4 files changed, 7 deletions(-) diff --git a/src/bar/admin.py b/src/bar/admin.py index 337ee768..ee04ed0f 100644 --- a/src/bar/admin.py +++ b/src/bar/admin.py @@ -1,5 +1,4 @@ from django.contrib import admin - from .models import ProductCategory, Product @@ -12,5 +11,3 @@ class ProductCategoryAdmin(admin.ModelAdmin): class ProductAdmin(admin.ModelAdmin): list_display = ['name', 'price', 'category', 'in_stock'] list_editable = ['in_stock'] - - diff --git a/src/bar/apps.py b/src/bar/apps.py index 7a6c111b..e24009a8 100644 --- a/src/bar/apps.py +++ b/src/bar/apps.py @@ -1,5 +1,3 @@ - - from django.apps import AppConfig diff --git a/src/bar/models.py b/src/bar/models.py index 9c70a485..8d4d3b87 100644 --- a/src/bar/models.py +++ b/src/bar/models.py @@ -1,5 +1,4 @@ from django.db import models - from utils.models import CampRelatedModel diff --git a/src/bar/views.py b/src/bar/views.py index eb0cf10e..747a744e 100644 --- a/src/bar/views.py +++ b/src/bar/views.py @@ -6,4 +6,3 @@ class MenuView(ListView): model = ProductCategory template_name = "bar_menu.html" context_object_name = "categories" - From 075a43d2453f5f8c32db267e9a3947a168364704 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 16:17:32 +0100 Subject: [PATCH 054/351] remove irc3 command plugin for now since we are not using it --- src/ircbot/irc3module.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ircbot/irc3module.py b/src/ircbot/irc3module.py index 2de24b83..97844016 100644 --- a/src/ircbot/irc3module.py +++ b/src/ircbot/irc3module.py @@ -13,7 +13,6 @@ class Plugin(object): requires = [ 'irc3.plugins.core', # makes the bot able to connect to an irc server and do basic irc stuff 'irc3.plugins.userlist', # maintains a convenient list of the channels the bot is in and their users - 'irc3.plugins.command', # what does this do? ] def __init__(self, bot): From df5e1673767c5728959a0c137a678f5b9e659bac Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Sun, 4 Mar 2018 16:26:35 +0100 Subject: [PATCH 055/351] add on_delete to all foreignkeys --- src/bar/models.py | 8 ++++++-- src/program/models.py | 6 +++++- src/shop/models.py | 12 ++++++++---- src/sponsors/models.py | 3 ++- src/teams/models.py | 5 +++-- src/tickets/models.py | 14 +++++++++----- src/villages/models.py | 4 ++-- 7 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/bar/models.py b/src/bar/models.py index 8d4d3b87..ce82f445 100644 --- a/src/bar/models.py +++ b/src/bar/models.py @@ -4,7 +4,7 @@ from utils.models import CampRelatedModel class ProductCategory(CampRelatedModel): name = models.CharField(max_length=255) - camp = models.ForeignKey('camps.Camp') + camp = models.ForeignKey('camps.Camp', on_delete=models.PROTECT) def __str__(self): return self.name @@ -16,7 +16,11 @@ class ProductCategory(CampRelatedModel): class Product(models.Model): name = models.CharField(max_length=255) price = models.IntegerField() - category = models.ForeignKey(ProductCategory, related_name="products") + category = models.ForeignKey( + ProductCategory, + related_name="products", + on_delete=models.PROTECT + ) in_stock = models.BooleanField(default=True) class Meta: diff --git a/src/program/models.py b/src/program/models.py index 43a0c8eb..c7e7b34b 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -655,7 +655,11 @@ class Speaker(CampRelatedModel): class Favorite(models.Model): - user = models.ForeignKey('auth.User', related_name='favorites') + user = models.ForeignKey( + 'auth.User', + related_name='favorites', + on_delete=models.PROTECT + ) event_instance = models.ForeignKey('program.EventInstance') class Meta: diff --git a/src/shop/models.py b/src/shop/models.py index a8d3acc7..3ec7c917 100644 --- a/src/shop/models.py +++ b/src/shop/models.py @@ -72,6 +72,7 @@ class Order(CreatedUpdatedModel): verbose_name=_('User'), help_text=_('The user this shop order belongs to.'), related_name='orders', + on_delete=models.PROTECT, ) paid = models.BooleanField( @@ -290,7 +291,8 @@ class Product(CreatedUpdatedModel, UUIDModel): category = models.ForeignKey( 'shop.ProductCategory', - related_name='products' + related_name='products', + on_delete=models.PROTECT, ) name = models.CharField(max_length=150) @@ -311,6 +313,7 @@ class Product(CreatedUpdatedModel, UUIDModel): ticket_type = models.ForeignKey( 'tickets.TicketType', + on_delete=models.PROTECT, null=True, blank=True ) @@ -345,8 +348,8 @@ class Product(CreatedUpdatedModel, UUIDModel): class OrderProductRelation(CreatedUpdatedModel): - order = models.ForeignKey('shop.Order') - product = models.ForeignKey('shop.Product') + order = models.ForeignKey('shop.Order', on_delete=models.PROTECT) + product = models.ForeignKey('shop.Product', on_delete=models.PROTECT) quantity = models.PositiveIntegerField() handed_out = models.BooleanField(default=False) @@ -374,7 +377,7 @@ class EpayPayment(CreatedUpdatedModel, UUIDModel): verbose_name_plural = 'Epay Payments' order = models.OneToOneField('shop.Order') - callback = models.ForeignKey('shop.EpayCallback') + callback = models.ForeignKey('shop.EpayCallback', on_delete=models.PROTECT) txnid = models.IntegerField() @@ -402,6 +405,7 @@ class CreditNote(CreatedUpdatedModel): verbose_name=_('User'), help_text=_('The user this credit note belongs to, if any.'), related_name='creditnotes', + on_delete=models.PROTECT, null=True, blank=True ) diff --git a/src/sponsors/models.py b/src/sponsors/models.py index f1823b99..bad3655f 100644 --- a/src/sponsors/models.py +++ b/src/sponsors/models.py @@ -19,7 +19,7 @@ class Sponsor(CampRelatedModel): help_text='Name of the sponsor' ) - tier = models.ForeignKey('sponsors.SponsorTier') + tier = models.ForeignKey('sponsors.SponsorTier', on_delete=models.PROTECT) description = models.TextField( help_text='A short description of the sponsorship' @@ -57,6 +57,7 @@ class SponsorTier(CampRelatedModel): camp = models.ForeignKey( 'camps.Camp', null=True, + on_delete=models.PROTECT, related_name='sponsor_tiers', help_text='The camp this sponsor tier belongs to', ) diff --git a/src/teams/models.py b/src/teams/models.py index 4e6353d1..5599f27a 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -106,8 +106,8 @@ class Team(CampRelatedModel): class TeamMember(CampRelatedModel): - user = models.ForeignKey('auth.User') - team = models.ForeignKey('teams.Team') + user = models.ForeignKey('auth.User', on_delete=models.PROTECT) + team = models.ForeignKey('teams.Team', on_delete=models.PROTECT) approved = models.BooleanField(default=False) responsible = models.BooleanField(default=False) @@ -132,6 +132,7 @@ class TeamTask(CampRelatedModel): team = models.ForeignKey( 'teams.Team', related_name='tasks', + on_delete=models.PROTECT, help_text='The team this task belongs to', ) name = models.CharField( diff --git a/src/tickets/models.py b/src/tickets/models.py index f81dc31e..31269e3b 100644 --- a/src/tickets/models.py +++ b/src/tickets/models.py @@ -18,14 +18,14 @@ logger = logging.getLogger("bornhack.%s" % __name__) # TicketType can be full week, one day. etc. class TicketType(CampRelatedModel, UUIDModel): name = models.TextField() - camp = models.ForeignKey('camps.Camp') + camp = models.ForeignKey('camps.Camp', on_delete=models.PROTECT) def __str__(self): return '{} ({})'.format(self.name, self.camp.title) class BaseTicket(CampRelatedModel, UUIDModel): - ticket_type = models.ForeignKey('TicketType') + ticket_type = models.ForeignKey('TicketType', on_delete=models.PROTECT) checked_in = models.BooleanField(default=False) badge_handed_out = models.BooleanField(default=False) @@ -69,7 +69,7 @@ class BaseTicket(CampRelatedModel, UUIDModel): class SponsorTicket(BaseTicket): - sponsor = models.ForeignKey('sponsors.Sponsor') + sponsor = models.ForeignKey('sponsors.Sponsor', on_delete=models.PROTECT) def __str__(self): return 'SponsorTicket: {}'.format(self.pk) @@ -93,8 +93,12 @@ class DiscountTicket(BaseTicket): class ShopTicket(BaseTicket): - order = models.ForeignKey('shop.Order', related_name='shoptickets') - product = models.ForeignKey('shop.Product') + order = models.ForeignKey( + 'shop.Order', + related_name='shoptickets', + on_delete=models.PROTECT + ) + product = models.ForeignKey('shop.Product', on_delete=models.PROTECT) name = models.CharField( max_length=100, diff --git a/src/villages/models.py b/src/villages/models.py index a6f8db8c..24b7685b 100644 --- a/src/villages/models.py +++ b/src/villages/models.py @@ -11,8 +11,8 @@ class Village(UUIDModel, CampRelatedModel): ordering = ['name'] unique_together = ('slug', 'camp') - contact = models.ForeignKey('auth.User') - camp = models.ForeignKey('camps.Camp') + contact = models.ForeignKey('auth.User', on_delete=models.PROTECT) + camp = models.ForeignKey('camps.Camp', on_delete=models.PROTECT) name = models.CharField(max_length=255) slug = models.SlugField(max_length=255, blank=True) description = models.TextField( From f8c86cac31987174dfba8d23c5d238e1a56d9b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 4 Mar 2018 16:34:10 +0100 Subject: [PATCH 056/351] Should be team_slug, not slug (#201) --- src/teams/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/teams/views.py b/src/teams/views.py index f739e781..a5056af8 100644 --- a/src/teams/views.py +++ b/src/teams/views.py @@ -48,7 +48,7 @@ class TeamManageView(CampViewMixin, EnsureTeamResponsibleMixin, UpdateView): slug_url_kwarg = 'team_slug' def get_success_url(self): - return reverse_lazy('teams:detail', kwargs={'camp_slug': self.camp.slug, 'slug': self.get_object().slug}) + return reverse_lazy('teams:detail', kwargs={'camp_slug': self.camp.slug, 'team_slug': self.get_object().slug}) class TeamJoinView(LoginRequiredMixin, CampViewMixin, UpdateView): From 01a55ae14942a2814cd0498c93df6bd56773bbb6 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 4 Mar 2018 17:17:57 +0100 Subject: [PATCH 057/351] make our CampViewMixin also filter if camp happens to be a property and not a real model field --- src/camps/mixins.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/camps/mixins.py b/src/camps/mixins.py index 83338f84..59503c90 100644 --- a/src/camps/mixins.py +++ b/src/camps/mixins.py @@ -20,5 +20,13 @@ class CampViewMixin(object): if field.name == "camp" and field.related_model._meta.label == "camps.Camp": return queryset.filter(camp=self.camp) + # check if we have a camp property, filter if so + if hasattr(queryset[0], 'camp') and isinstance(getattr(type(queryset[0]), 'camp', None), property): + for item in queryset: + if item.camp != self.camp: + queryset = queryset.exclude(pk=item.pk) + return queryset + # Camp relation not found, or queryset is empty, return it unaltered return queryset + From 03fc20a459564e573f140062a31a22a512c378b6 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 18 Mar 2018 09:07:34 +0100 Subject: [PATCH 058/351] add missing migrations after cleanup and adding of on_delete to all foreignkeys --- src/bar/migrations/0003_auto_20180318_0906.py | 26 ++++++++++ .../migrations/0046_auto_20180318_0906.py | 22 ++++++++ .../migrations/0053_auto_20180318_0906.py | 52 +++++++++++++++++++ .../migrations/0007_auto_20180318_0906.py | 26 ++++++++++ .../migrations/0021_auto_20180318_0906.py | 32 ++++++++++++ .../migrations/0005_auto_20180318_0906.py | 51 ++++++++++++++++++ .../migrations/0011_auto_20180318_0906.py | 27 ++++++++++ 7 files changed, 236 insertions(+) create mode 100644 src/bar/migrations/0003_auto_20180318_0906.py create mode 100644 src/program/migrations/0046_auto_20180318_0906.py create mode 100644 src/shop/migrations/0053_auto_20180318_0906.py create mode 100644 src/sponsors/migrations/0007_auto_20180318_0906.py create mode 100644 src/teams/migrations/0021_auto_20180318_0906.py create mode 100644 src/tickets/migrations/0005_auto_20180318_0906.py create mode 100644 src/villages/migrations/0011_auto_20180318_0906.py diff --git a/src/bar/migrations/0003_auto_20180318_0906.py b/src/bar/migrations/0003_auto_20180318_0906.py new file mode 100644 index 00000000..1c600524 --- /dev/null +++ b/src/bar/migrations/0003_auto_20180318_0906.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 08:06 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('bar', '0002_auto_20170916_2128'), + ] + + operations = [ + migrations.AlterField( + model_name='product', + name='category', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='products', to='bar.ProductCategory'), + ), + migrations.AlterField( + model_name='productcategory', + name='camp', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='camps.Camp'), + ), + ] diff --git a/src/program/migrations/0046_auto_20180318_0906.py b/src/program/migrations/0046_auto_20180318_0906.py new file mode 100644 index 00000000..a9b5b961 --- /dev/null +++ b/src/program/migrations/0046_auto_20180318_0906.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 08:06 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('program', '0045_event_proposal'), + ] + + operations = [ + migrations.AlterField( + model_name='favorite', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='favorites', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/src/shop/migrations/0053_auto_20180318_0906.py b/src/shop/migrations/0053_auto_20180318_0906.py new file mode 100644 index 00000000..0acbc182 --- /dev/null +++ b/src/shop/migrations/0053_auto_20180318_0906.py @@ -0,0 +1,52 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 08:06 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('shop', '0052_auto_20171004_0005'), + ] + + operations = [ + migrations.AlterField( + model_name='creditnote', + name='user', + field=models.ForeignKey(blank=True, help_text='The user this credit note belongs to, if any.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='creditnotes', to=settings.AUTH_USER_MODEL, verbose_name='User'), + ), + migrations.AlterField( + model_name='epaypayment', + name='callback', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='shop.EpayCallback'), + ), + migrations.AlterField( + model_name='order', + name='user', + field=models.ForeignKey(help_text='The user this shop order belongs to.', on_delete=django.db.models.deletion.PROTECT, related_name='orders', to=settings.AUTH_USER_MODEL, verbose_name='User'), + ), + migrations.AlterField( + model_name='orderproductrelation', + name='order', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='shop.Order'), + ), + migrations.AlterField( + model_name='orderproductrelation', + name='product', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='shop.Product'), + ), + migrations.AlterField( + model_name='product', + name='category', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='products', to='shop.ProductCategory'), + ), + migrations.AlterField( + model_name='product', + name='ticket_type', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='tickets.TicketType'), + ), + ] diff --git a/src/sponsors/migrations/0007_auto_20180318_0906.py b/src/sponsors/migrations/0007_auto_20180318_0906.py new file mode 100644 index 00000000..b08c2de7 --- /dev/null +++ b/src/sponsors/migrations/0007_auto_20180318_0906.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 08:06 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('sponsors', '0006_auto_20170715_1110'), + ] + + operations = [ + migrations.AlterField( + model_name='sponsor', + name='tier', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='sponsors.SponsorTier'), + ), + migrations.AlterField( + model_name='sponsortier', + name='camp', + field=models.ForeignKey(help_text='The camp this sponsor tier belongs to', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='sponsor_tiers', to='camps.Camp'), + ), + ] diff --git a/src/teams/migrations/0021_auto_20180318_0906.py b/src/teams/migrations/0021_auto_20180318_0906.py new file mode 100644 index 00000000..e03f8214 --- /dev/null +++ b/src/teams/migrations/0021_auto_20180318_0906.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 08:06 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0020_auto_20180304_1233'), + ] + + operations = [ + migrations.AlterField( + model_name='teammember', + name='team', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='teams.Team'), + ), + migrations.AlterField( + model_name='teammember', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='teamtask', + name='team', + field=models.ForeignKey(help_text='The team this task belongs to', on_delete=django.db.models.deletion.PROTECT, related_name='tasks', to='teams.Team'), + ), + ] diff --git a/src/tickets/migrations/0005_auto_20180318_0906.py b/src/tickets/migrations/0005_auto_20180318_0906.py new file mode 100644 index 00000000..adb2c53b --- /dev/null +++ b/src/tickets/migrations/0005_auto_20180318_0906.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 08:06 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('tickets', '0004_auto_20170823_1228'), + ] + + operations = [ + migrations.AlterField( + model_name='discountticket', + name='ticket_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='tickets.TicketType'), + ), + migrations.AlterField( + model_name='shopticket', + name='order', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='shoptickets', to='shop.Order'), + ), + migrations.AlterField( + model_name='shopticket', + name='product', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='shop.Product'), + ), + migrations.AlterField( + model_name='shopticket', + name='ticket_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='tickets.TicketType'), + ), + migrations.AlterField( + model_name='sponsorticket', + name='sponsor', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='sponsors.Sponsor'), + ), + migrations.AlterField( + model_name='sponsorticket', + name='ticket_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='tickets.TicketType'), + ), + migrations.AlterField( + model_name='tickettype', + name='camp', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='camps.Camp'), + ), + ] diff --git a/src/villages/migrations/0011_auto_20180318_0906.py b/src/villages/migrations/0011_auto_20180318_0906.py new file mode 100644 index 00000000..07f6759c --- /dev/null +++ b/src/villages/migrations/0011_auto_20180318_0906.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 08:06 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('villages', '0010_auto_20170318_1506'), + ] + + operations = [ + migrations.AlterField( + model_name='village', + name='camp', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='camps.Camp'), + ), + migrations.AlterField( + model_name='village', + name='contact', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), + ), + ] From ff758b15ff7ea818039761c1730d1d28871d729e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Tue, 3 Apr 2018 18:44:10 +0200 Subject: [PATCH 059/351] Initial work on uprading. --- src/backoffice/urls.py | 3 ++ src/bornhack/environment_settings.py.dist | 3 +- src/bornhack/urls.py | 2 +- src/camps/migrations/0001_initial.py | 10 +++---- src/news/urls.py | 2 +- src/profiles/migrations/0001_initial.py | 2 +- src/profiles/models.py | 1 + src/profiles/urls.py | 2 ++ src/profiles/views.py | 2 +- src/program/models.py | 29 ++++++++++++++----- src/requirements/dev.txt | 3 ++ .../production.txt} | 15 +++------- src/shop/models.py | 18 +++++++++--- src/shop/urls.py | 2 ++ src/shop/views.py | 2 +- src/teams/models.py | 2 +- src/teams/urls.py | 3 ++ src/teams/views.py | 2 +- src/tickets/models.py | 2 +- src/tickets/urls.py | 2 ++ src/villages/models.py | 2 +- src/villages/urls.py | 3 ++ src/villages/views.py | 2 +- 23 files changed, 76 insertions(+), 38 deletions(-) create mode 100644 src/requirements/dev.txt rename src/{requirements.txt => requirements/production.txt} (63%) diff --git a/src/backoffice/urls.py b/src/backoffice/urls.py index 7c849a55..e1af8680 100644 --- a/src/backoffice/urls.py +++ b/src/backoffice/urls.py @@ -1,6 +1,9 @@ from django.conf.urls import url from .views import * + +app_name = 'backoffice' + urlpatterns = [ url(r'^$', BackofficeIndexView.as_view(), name='index'), url(r'product_handout/$', ProductHandoutView.as_view(), name='product_handout'), diff --git a/src/bornhack/environment_settings.py.dist b/src/bornhack/environment_settings.py.dist index 6dd63947..cff7578d 100644 --- a/src/bornhack/environment_settings.py.dist +++ b/src/bornhack/environment_settings.py.dist @@ -24,11 +24,12 @@ WKHTMLTOPDF_CMD="{{ wkhtmltopdf_path }}" CHANNEL_LAYERS = { "default": { "BACKEND": "{{ django_channels_backend }}", - "ROUTING": "bornhack.routing.channel_routing", "CONFIG": {{ django_channels_config }} }, } +ASGI_APPLICATION = "bornhack.routing.channel_routing" + # start redirecting to the next camp instead of the previous camp after # this much of the time between the camps has passed CAMP_REDIRECT_PERCENT=25 diff --git a/src/bornhack/urls.py b/src/bornhack/urls.py index 5d1189d9..e50c504a 100644 --- a/src/bornhack/urls.py +++ b/src/bornhack/urls.py @@ -62,7 +62,7 @@ urlpatterns = [ name='general-terms' ), url(r'^accounts/', include('allauth.urls')), - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), url( r'^camps/$', diff --git a/src/camps/migrations/0001_initial.py b/src/camps/migrations/0001_initial.py index 167f4b26..f715b265 100644 --- a/src/camps/migrations/0001_initial.py +++ b/src/camps/migrations/0001_initial.py @@ -35,7 +35,7 @@ class Migration(migrations.Migration): ('updated', models.DateTimeField(auto_now=True)), ('uuid', models.UUIDField(default=uuid.uuid4, serialize=False, editable=False, primary_key=True)), ('date', models.DateField(help_text='What date?', verbose_name='Date')), - ('camp', models.ForeignKey(to='camps.Camp', help_text='Which camp does this day belong to.', verbose_name='Camp')), + ('camp', models.ForeignKey(on_delete=models.PROTECT, to='camps.Camp', help_text='Which camp does this day belong to.', verbose_name='Camp')), ], options={ 'verbose_name_plural': 'Days', @@ -51,8 +51,8 @@ class Migration(migrations.Migration): ('description', models.CharField(max_length=255, help_text='What this expense covers.', verbose_name='Description')), ('amount', models.DecimalField(max_digits=7, help_text='The amount of the expense.', verbose_name='Amount', decimal_places=2)), ('currency', models.CharField(max_length=3, choices=[('btc', 'BTC'), ('dkk', 'DKK'), ('eur', 'EUR'), ('sek', 'SEK')], help_text='What currency the amount is in.', verbose_name='Currency')), - ('camp', models.ForeignKey(to='camps.Camp', help_text='The camp to which this expense relates to.', verbose_name='Camp')), - ('covered_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, blank=True, help_text='Which user, if any, covered this expense.', verbose_name='Covered by', null=True)), + ('camp', models.ForeignKey(on_delete=models.PROTECT, to='camps.Camp', help_text='The camp to which this expense relates to.', verbose_name='Camp')), + ('covered_by', models.ForeignKey(on_delete=models.PROTECT, to=settings.AUTH_USER_MODEL, blank=True, help_text='Which user, if any, covered this expense.', verbose_name='Covered by', null=True)), ], options={ 'verbose_name_plural': 'Expenses', @@ -67,8 +67,8 @@ class Migration(migrations.Migration): ('uuid', models.UUIDField(default=uuid.uuid4, serialize=False, editable=False, primary_key=True)), ('cost', models.DecimalField(default=1500.0, decimal_places=2, help_text='What the user should/is willing to pay for this signup.', verbose_name='Cost', max_digits=7)), ('paid', models.BooleanField(help_text='Whether the user has paid.', verbose_name='Paid?', default=False)), - ('camp', models.ForeignKey(to='camps.Camp', help_text='The camp that has been signed up for.', verbose_name='Camp')), - ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, help_text='The user that has signed up.', verbose_name='User')), + ('camp', models.ForeignKey(on_delete=models.PROTECT, to='camps.Camp', help_text='The camp that has been signed up for.', verbose_name='Camp')), + ('user', models.ForeignKey(on_delete=models.PROTECT, to=settings.AUTH_USER_MODEL, help_text='The user that has signed up.', verbose_name='User')), ], options={ 'verbose_name_plural': 'Signups', diff --git a/src/news/urls.py b/src/news/urls.py index 766b4e3c..6f8d3818 100644 --- a/src/news/urls.py +++ b/src/news/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import url from . import views - +app_name = 'news' urlpatterns = [ url(r'^$', views.NewsIndex.as_view(), kwargs={'archived': False}, name='index'), url(r'^archive/$', views.NewsIndex.as_view(), kwargs={'archived': True}, name='archive'), diff --git a/src/profiles/migrations/0001_initial.py b/src/profiles/migrations/0001_initial.py index 95aa9c79..e4617e2c 100644 --- a/src/profiles/migrations/0001_initial.py +++ b/src/profiles/migrations/0001_initial.py @@ -19,7 +19,7 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ('updated', models.DateTimeField(auto_now=True)), ('uuid', models.UUIDField(serialize=False, editable=False, primary_key=True, default=uuid.uuid4)), - ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, help_text='The django user this profile belongs to.', verbose_name='User')), + ('user', models.OneToOneField(on_delete=models.PROTECT, to=settings.AUTH_USER_MODEL, help_text='The django user this profile belongs to.', verbose_name='User')), ], options={ 'verbose_name_plural': 'Profiles', diff --git a/src/profiles/models.py b/src/profiles/models.py index c7fcb2ec..4be26059 100644 --- a/src/profiles/models.py +++ b/src/profiles/models.py @@ -24,6 +24,7 @@ class Profile(CreatedUpdatedModel, UUIDModel): User, verbose_name=_('User'), help_text=_('The django user this profile belongs to.'), + on_delete=models.PROTECT ) name = models.CharField( diff --git a/src/profiles/urls.py b/src/profiles/urls.py index 54c8123c..8c3f5b07 100644 --- a/src/profiles/urls.py +++ b/src/profiles/urls.py @@ -2,6 +2,8 @@ from django.conf.urls import url from .views import ProfileDetail, ProfileUpdate + +app_name = 'profiles' urlpatterns = [ url(r'^$', ProfileDetail.as_view(), name='detail'), url(r'^edit$', ProfileUpdate.as_view(), name='update'), diff --git a/src/profiles/views.py b/src/profiles/views.py index 79ae29bb..1f9799e6 100644 --- a/src/profiles/views.py +++ b/src/profiles/views.py @@ -1,6 +1,6 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import DetailView, UpdateView -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.contrib import messages from . import models diff --git a/src/program/models.py b/src/program/models.py index c7e7b34b..04503f5b 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -11,7 +11,7 @@ from django.db import models from django.core.exceptions import ObjectDoesNotExist, ValidationError from django.utils.text import slugify from django.conf import settings -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.core.files.storage import FileSystemStorage from django.urls import reverse from django.apps import apps @@ -75,6 +75,7 @@ class UserSubmittedModel(CampRelatedModel): user = models.ForeignKey( 'auth.User', + on_delete=models.PROTECT ) PROPOSAL_DRAFT = 'draft' @@ -148,7 +149,8 @@ class SpeakerProposal(UserSubmittedModel): camp = models.ForeignKey( 'camps.Camp', - related_name='speakerproposals' + related_name='speakerproposals', + on_delete=models.PROTECT ) name = models.CharField( @@ -216,7 +218,8 @@ class EventProposal(UserSubmittedModel): camp = models.ForeignKey( 'camps.Camp', - related_name='eventproposals' + related_name='eventproposals', + on_delete=models.PROTECT ) title = models.CharField( @@ -231,6 +234,7 @@ class EventProposal(UserSubmittedModel): event_type = models.ForeignKey( 'program.EventType', help_text='The type of event', + on_delete=models.PROTECT ) speakers = models.ManyToManyField( @@ -300,7 +304,8 @@ class EventLocation(CampRelatedModel): camp = models.ForeignKey( 'camps.Camp', - related_name='eventlocations' + related_name='eventlocations', + on_delete=models.PROTECT ) def __str__(self): @@ -379,6 +384,7 @@ class Event(CampRelatedModel): event_type = models.ForeignKey( 'program.EventType', help_text='The type of this event', + on_delete=models.PROTECT ) slug = models.SlugField( @@ -391,6 +397,7 @@ class Event(CampRelatedModel): 'camps.Camp', related_name='events', help_text='The camp this event belongs to', + on_delete=models.PROTECT ) video_url = models.URLField( @@ -410,6 +417,7 @@ class Event(CampRelatedModel): null=True, blank=True, help_text='The event proposal object this event was created from', + on_delete=models.PROTECT ) class Meta: @@ -463,7 +471,8 @@ class EventInstance(CampRelatedModel): event = models.ForeignKey( 'program.event', - related_name='instances' + related_name='instances', + on_delete=models.PROTECT ) when = DateTimeRangeField() @@ -474,7 +483,8 @@ class EventInstance(CampRelatedModel): location = models.ForeignKey( 'program.EventLocation', - related_name='eventinstances' + related_name='eventinstances', + on_delete=models.PROTECT ) class Meta: @@ -600,6 +610,7 @@ class Speaker(CampRelatedModel): null=True, related_name='speakers', help_text='The camp this speaker belongs to', + on_delete=models.PROTECT ) events = models.ManyToManyField( @@ -614,6 +625,7 @@ class Speaker(CampRelatedModel): null=True, blank=True, help_text='The speaker proposal object this speaker was created from', + on_delete=models.PROTECT ) class Meta: @@ -660,7 +672,10 @@ class Favorite(models.Model): related_name='favorites', on_delete=models.PROTECT ) - event_instance = models.ForeignKey('program.EventInstance') + event_instance = models.ForeignKey( + 'program.EventInstance', + on_delete=models.PROTECT + ) class Meta: unique_together = ['user', 'event_instance'] diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt new file mode 100644 index 00000000..da53e734 --- /dev/null +++ b/src/requirements/dev.txt @@ -0,0 +1,3 @@ +-r production.txt + +django-debug-toolbar==1.9.1 diff --git a/src/requirements.txt b/src/requirements/production.txt similarity index 63% rename from src/requirements.txt rename to src/requirements/production.txt index 5c860590..c675c1d2 100644 --- a/src/requirements.txt +++ b/src/requirements/production.txt @@ -1,26 +1,19 @@ +Django==2.0.4 +channels==2.0.2 +channels_redis=2.1.1 + CommonMark==0.7.3 -Django==1.10.5 Pillow==4.0.0 PyPDF2==1.26.0 Unidecode==0.04.20 argparse==1.2.1 -asgi-redis==1.3.0 asyncio==3.4.3 bleach==1.5.0 -# fix https://github.com/django/daphne/pull/107 -git+https://github.com/tykling/daphne@ws-x-forwarded-for-bugfix - -# fix https://github.com/django/channels/issues/622 -#channels==1.1.3 -git+https://github.com/tykling/channels@master - defusedxml==0.4.1 django-allauth==0.30.0 django-bleach==0.3.0 django-bootstrap3==8.2.2 -django-debug-toolbar==1.6 -django-channels-panel==0.0.5 django-extensions==1.7.7 django-wkhtmltopdf==3.1.0 docopt==0.6.2 diff --git a/src/shop/models.py b/src/shop/models.py index 3ec7c917..9ea27135 100644 --- a/src/shop/models.py +++ b/src/shop/models.py @@ -8,7 +8,7 @@ from django.contrib.postgres.fields import DateTimeRangeField, JSONField from django.utils.text import slugify from django.utils.translation import ugettext_lazy as _ from django.utils import timezone -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.core.exceptions import ValidationError from decimal import Decimal from datetime import timedelta @@ -376,7 +376,7 @@ class EpayPayment(CreatedUpdatedModel, UUIDModel): verbose_name = 'Epay Payment' verbose_name_plural = 'Epay Payments' - order = models.OneToOneField('shop.Order') + order = models.OneToOneField('shop.Order', on_delete=models.PROTECT) callback = models.ForeignKey('shop.EpayCallback', on_delete=models.PROTECT) txnid = models.IntegerField() @@ -469,8 +469,18 @@ class CreditNote(CreatedUpdatedModel): class Invoice(CreatedUpdatedModel): - order = models.OneToOneField('shop.Order', null=True, blank=True) - customorder = models.OneToOneField('shop.CustomOrder', null=True, blank=True) + order = models.OneToOneField( + 'shop.Order', + null=True, + blank=True, + on_delete=models.PROTECT + ) + customorder = models.OneToOneField( + 'shop.CustomOrder', + null=True, + blank=True, + on_delete=models.PROTECT + ) pdf = models.FileField(null=True, blank=True, upload_to='invoices/') sent_to_customer = models.BooleanField(default=False) diff --git a/src/shop/urls.py b/src/shop/urls.py index 5f089d28..f3ea70c7 100644 --- a/src/shop/urls.py +++ b/src/shop/urls.py @@ -1,6 +1,8 @@ from django.conf.urls import url from .views import * +app_name = 'shop' + urlpatterns = [ url(r'^$', ShopIndexView.as_view(), name='index'), diff --git a/src/shop/views.py b/src/shop/views.py index 2ed4dc13..025f62f3 100644 --- a/src/shop/views.py +++ b/src/shop/views.py @@ -1,7 +1,7 @@ from django.conf import settings from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin -from django.core.urlresolvers import reverse, reverse_lazy +from django.urls import reverse, reverse_lazy from django.db.models import Count, F from django.http import ( HttpResponse, diff --git a/src/teams/models.py b/src/teams/models.py index 5599f27a..2913582b 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -6,7 +6,7 @@ from utils.models import CampRelatedModel from .email import add_new_membership_email from django.core.exceptions import ValidationError from django.contrib.auth.models import User -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy import logging logger = logging.getLogger("bornhack.%s" % __name__) diff --git a/src/teams/urls.py b/src/teams/urls.py index 28072dbe..fac5f2ab 100644 --- a/src/teams/urls.py +++ b/src/teams/urls.py @@ -1,6 +1,9 @@ from django.conf.urls import url, include from .views import * + +app_name = 'teams' + urlpatterns = [ url( r'^$', diff --git a/src/teams/views.py b/src/teams/views.py index a5056af8..64ca0371 100644 --- a/src/teams/views.py +++ b/src/teams/views.py @@ -8,7 +8,7 @@ from django.shortcuts import redirect from django.contrib import messages from django.http import HttpResponseRedirect from django.views.generic.detail import SingleObjectMixin -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from profiles.models import Profile diff --git a/src/tickets/models.py b/src/tickets/models.py index 31269e3b..8295c4ae 100644 --- a/src/tickets/models.py +++ b/src/tickets/models.py @@ -3,7 +3,7 @@ import hashlib import base64 import qrcode from django.conf import settings -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _ from utils.models import ( UUIDModel, diff --git a/src/tickets/urls.py b/src/tickets/urls.py index 002283ba..9ef1ffbe 100644 --- a/src/tickets/urls.py +++ b/src/tickets/urls.py @@ -6,6 +6,8 @@ from .views import ( ShopTicketDetailView ) +app_name = 'tickets' + urlpatterns = [ url( r'^$', diff --git a/src/villages/models.py b/src/villages/models.py index 24b7685b..4d8e8014 100644 --- a/src/villages/models.py +++ b/src/villages/models.py @@ -1,4 +1,4 @@ -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.db import models from django.utils.text import slugify from utils.models import UUIDModel, CampRelatedModel diff --git a/src/villages/urls.py b/src/villages/urls.py index 015818df..cf06449b 100644 --- a/src/villages/urls.py +++ b/src/villages/urls.py @@ -1,6 +1,9 @@ from django.conf.urls import url from .views import * + +app_name = 'villages' + urlpatterns = [ url(r'^$', VillageListView.as_view(), name='list'), url(r'create/$', VillageCreateView.as_view(), name='create'), diff --git a/src/villages/views.py b/src/villages/views.py index d7c42d83..482f7e0e 100644 --- a/src/villages/views.py +++ b/src/villages/views.py @@ -1,6 +1,6 @@ from django.http import Http404 from django.contrib.auth.mixins import LoginRequiredMixin -from django.core.urlresolvers import reverse_lazy +from django.urls import reverse_lazy from django.http import HttpResponseRedirect from django.views.generic import ListView, DetailView, CreateView, UpdateView, DeleteView from django.views.generic.detail import SingleObjectMixin From aae3d7e3c91e08b176433432652272871bbbacd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Tue, 3 Apr 2018 20:52:39 +0200 Subject: [PATCH 060/351] Got channels2 working. --- src/bornhack/environment_settings.py.dist | 2 +- src/bornhack/routing.py | 16 ++++++--- src/program/consumers.py | 44 +++++++++++++++-------- src/shop/context_processors.py | 2 +- 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/src/bornhack/environment_settings.py.dist b/src/bornhack/environment_settings.py.dist index cff7578d..cf5fb10c 100644 --- a/src/bornhack/environment_settings.py.dist +++ b/src/bornhack/environment_settings.py.dist @@ -28,7 +28,7 @@ CHANNEL_LAYERS = { }, } -ASGI_APPLICATION = "bornhack.routing.channel_routing" +ASGI_APPLICATION = "bornhack.routing.application" # start redirecting to the next camp instead of the previous camp after # this much of the time between the camps has passed diff --git a/src/bornhack/routing.py b/src/bornhack/routing.py index 7776c0e7..d426b02c 100644 --- a/src/bornhack/routing.py +++ b/src/bornhack/routing.py @@ -1,8 +1,14 @@ +from django.conf.urls import url + +from channels.routing import ProtocolTypeRouter, URLRouter +from channels.auth import AuthMiddlewareStack from program.consumers import ScheduleConsumer -channel_routing = [ - ScheduleConsumer.as_route(path=r"^/schedule/"), -] - - +application = ProtocolTypeRouter({ + "websocket": AuthMiddlewareStack( + URLRouter([ + url(r"^schedule/", ScheduleConsumer) + ]) + ) +}) diff --git a/src/program/consumers.py b/src/program/consumers.py index 06713545..d5ac9dc8 100644 --- a/src/program/consumers.py +++ b/src/program/consumers.py @@ -1,4 +1,4 @@ -from channels.generic.websockets import JsonWebsocketConsumer +from channels.generic.websocket import JsonWebsocketConsumer from camps.models import Camp from .models import ( @@ -12,13 +12,11 @@ from .models import ( class ScheduleConsumer(JsonWebsocketConsumer): - http_user = True + groups = ['schedule_users'] - def connection_groups(self, **kwargs): - return ['schedule_users'] - - def raw_receive(self, message, **kwargs): - content = self.decode_json(message['text']) + def receive(self, text_data, **kwargs): + user = self.scope['user'] + content = self.decode_json(text_data) action = content.get('action') data = {} @@ -39,14 +37,27 @@ class ScheduleConsumer(JsonWebsocketConsumer): events_query_set = Event.objects.filter(camp=camp) events = list([x.serialize() for x in events_query_set]) - event_instances_query_set = EventInstance.objects.filter(event__camp=camp) - event_instances = list([x.serialize(user=message.user) for x in event_instances_query_set]) + event_instances_query_set = EventInstance.objects.filter( + event__camp=camp + ) + event_instances = list([ + x.serialize(user=user) + for x in event_instances_query_set + ]) - event_locations_query_set = EventLocation.objects.filter(camp=camp) - event_locations = list([x.serialize() for x in event_locations_query_set]) + event_locations_query_set = EventLocation.objects.filter( + camp=camp + ) + event_locations = list([ + x.serialize() + for x in event_locations_query_set + ]) event_types_query_set = EventType.objects.filter() - event_types = list([x.serialize() for x in event_types_query_set]) + event_types = list([ + x.serialize() + for x in event_types_query_set + ]) speakers_query_set = Speaker.objects.filter(camp=camp) speakers = list([x.serialize() for x in speakers_query_set]) @@ -67,18 +78,21 @@ class ScheduleConsumer(JsonWebsocketConsumer): event_instance_id = content.get('event_instance_id') event_instance = EventInstance.objects.get(id=event_instance_id) Favorite.objects.create( - user=message.user, + user=user, event_instance=event_instance ) if action == 'unfavorite': event_instance_id = content.get('event_instance_id') event_instance = EventInstance.objects.get(id=event_instance_id) - favorite = Favorite.objects.get(event_instance=event_instance, user=message.user) + favorite = Favorite.objects.get( + event_instance=event_instance, + user=user + ) favorite.delete() if data: - self.send(data) + self.send_json(data) def disconnect(self, message, **kwargs): pass diff --git a/src/shop/context_processors.py b/src/shop/context_processors.py index 94796c89..ec572d80 100644 --- a/src/shop/context_processors.py +++ b/src/shop/context_processors.py @@ -1,5 +1,5 @@ def current_order(request): - if request.user.is_authenticated(): + if request.user.is_authenticated: order = None orders = request.user.orders.filter(open__isnull=False) From edcf363027e723e9f83b3705220c3ae7d7586427 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Mon, 9 Apr 2018 23:11:05 +0200 Subject: [PATCH 061/351] Merge teamcomms branch. Refactor team app and add events app. * Primary commit towards improved team communications. Add new events app to handle team notifications when various events happen, with a Type model which contain event types and a Routing model which controls routing of events to teams. Add shortslug for Camp and Team models. events.handler.py contains the code for sending irc and email notifications for teams. The first two eventtypes have been added in datamigrations, 'ticket_created' and 'public_credit_name_changed', and the tickets and profile apps have been adjusted accordingly. Team IRC channels can be marked as managed and if so the IRC bot will register the team channel with ChanServ if possible. Team IRC channels can be marked as private and the bot will set invite only and maintain an ACL with team members. Users can set their NickServ username in their profile to get on the ACL. Rework all team views and templates. Remove TeamArea model and make Team have an FK to Camp directly. Add docstrings a whole bunch of places. Move signal handlers to apps.py and signal_handlers.py in a few apps. Add basic team mailing list handling, more work to be done. Update bootstrap-devsite script to add more teammembers and add some team event routing for the two eventtypes we have. * default to the console backend for email unless we specifically ask for realworld email * fix signal for public_credit_name approval irc message * fix name display on /people/ page * fix the text on people pages when all non-responsible team members are anonymous * handle cases where we fallback to the area responsible properly * readd removed property, it is used in team_detail view * make it possible to filter profiles by public_credit_name_approved * add method for sending IRC messages in ircbot.utils.add_irc_message(), extend periodic bot method to do more than check for outgoing messages so rename it, refactor chanserv and nickserv handling code, create methods to check and join/part IRC channels as needed, maintain channel ACLs for private channels, do not autojoin any channels when instatiating the bot instead rely on the new check_irc_channels() method to join them, rename profile presave signal, add checking for changed nickserv usernames for acl handling, add teammember.irc_channel_acl_ok boolean to track ACL state, add missing help_text properties to TeamMember fields, rename teammember postsave signal, add teammember deleted signal, readd wrongly deleted EnsureTeamMemberResponsibleMixin * add a few missing early returns --- scripts/schemagif.sh | 69 +++++ src/bornhack/environment_settings.py.dist | 13 +- src/bornhack/settings.py | 1 + src/camps/migrations/0023_camp_shortslug.py | 20 ++ .../0024_populate_camp_shortslugs.py | 22 ++ .../migrations/0025_auto_20180318_1250.py | 20 ++ src/camps/models.py | 11 +- src/events/__init__.py | 0 src/events/admin.py | 12 + src/events/apps.py | 5 + src/events/handler.py | 81 ++++++ src/events/migrations/0001_initial.py | 51 ++++ .../migrations/0002_create_eventtype.py | 20 ++ .../0003_create_another_eventtype.py | 20 ++ .../migrations/0004_auto_20180403_1228.py | 25 ++ src/events/migrations/__init__.py | 0 src/events/models.py | 61 +++++ src/events/tests.py | 3 + src/events/views.py | 3 + src/ircbot/irc3module.py | 255 ++++++++++++++++- src/ircbot/ircworker.py | 7 +- src/ircbot/utils.py | 21 ++ src/people/templates/people.html | 26 +- src/profiles/__init__.py | 2 + src/profiles/admin.py | 4 + src/profiles/apps.py | 16 ++ .../migrations/0008_auto_20180325_2022.py | 20 ++ .../0009_profile_nickserv_username.py | 20 ++ src/profiles/models.py | 49 ++-- src/profiles/signal_handlers.py | 81 ++++++ src/profiles/templates/profile_detail.html | 6 +- src/profiles/views.py | 4 +- src/program/apps.py | 4 +- src/program/signal_handlers.py | 40 --- src/teams/admin.py | 12 +- src/teams/apps.py | 8 + src/teams/email.py | 3 +- src/teams/forms.py | 8 - .../migrations/0022_auto_20180318_1135.py | 35 +++ .../migrations/0023_auto_20180318_1256.py | 30 ++ .../migrations/0024_populate_shortslugs.py | 22 ++ .../migrations/0025_auto_20180318_1318.py | 20 ++ src/teams/migrations/0026_team_camp.py | 22 ++ src/teams/migrations/0027_fixup_teams.py | 60 ++++ .../migrations/0028_auto_20180331_1416.py | 21 ++ src/teams/migrations/0029_remove_team_area.py | 19 ++ .../migrations/0030_auto_20180402_1514.py | 30 ++ .../migrations/0031_auto_20180402_2146.py | 25 ++ .../migrations/0032_auto_20180402_2148.py | 21 ++ .../migrations/0033_auto_20180402_2204.py | 30 ++ .../migrations/0034_auto_20180402_2334.py | 19 ++ .../migrations/0035_auto_20180402_2344.py | 19 ++ .../migrations/0036_auto_20180403_0201.py | 20 ++ .../migrations/0037_auto_20180408_1416.py | 42 +++ src/teams/models.py | 259 ++++++++++++------ src/teams/signal_handlers.py | 31 +++ src/teams/templates/team_detail.html | 75 +++-- src/teams/templates/team_join.html | 9 +- src/teams/templates/team_list.html | 39 ++- src/teams/templates/team_manage.html | 158 ++++++----- src/teams/templatetags/teams_tags.py | 24 +- src/teams/views.py | 46 +++- src/tickets/signals.py | 27 +- .../management/commands/bootstrap-devsite.py | 219 ++++++++++++--- 64 files changed, 1934 insertions(+), 411 deletions(-) create mode 100755 scripts/schemagif.sh create mode 100644 src/camps/migrations/0023_camp_shortslug.py create mode 100644 src/camps/migrations/0024_populate_camp_shortslugs.py create mode 100644 src/camps/migrations/0025_auto_20180318_1250.py create mode 100644 src/events/__init__.py create mode 100644 src/events/admin.py create mode 100644 src/events/apps.py create mode 100644 src/events/handler.py create mode 100644 src/events/migrations/0001_initial.py create mode 100644 src/events/migrations/0002_create_eventtype.py create mode 100644 src/events/migrations/0003_create_another_eventtype.py create mode 100644 src/events/migrations/0004_auto_20180403_1228.py create mode 100644 src/events/migrations/__init__.py create mode 100644 src/events/models.py create mode 100644 src/events/tests.py create mode 100644 src/events/views.py create mode 100644 src/ircbot/utils.py create mode 100644 src/profiles/apps.py create mode 100644 src/profiles/migrations/0008_auto_20180325_2022.py create mode 100644 src/profiles/migrations/0009_profile_nickserv_username.py create mode 100644 src/profiles/signal_handlers.py delete mode 100644 src/teams/forms.py create mode 100644 src/teams/migrations/0022_auto_20180318_1135.py create mode 100644 src/teams/migrations/0023_auto_20180318_1256.py create mode 100644 src/teams/migrations/0024_populate_shortslugs.py create mode 100644 src/teams/migrations/0025_auto_20180318_1318.py create mode 100644 src/teams/migrations/0026_team_camp.py create mode 100644 src/teams/migrations/0027_fixup_teams.py create mode 100644 src/teams/migrations/0028_auto_20180331_1416.py create mode 100644 src/teams/migrations/0029_remove_team_area.py create mode 100644 src/teams/migrations/0030_auto_20180402_1514.py create mode 100644 src/teams/migrations/0031_auto_20180402_2146.py create mode 100644 src/teams/migrations/0032_auto_20180402_2148.py create mode 100644 src/teams/migrations/0033_auto_20180402_2204.py create mode 100644 src/teams/migrations/0034_auto_20180402_2334.py create mode 100644 src/teams/migrations/0035_auto_20180402_2344.py create mode 100644 src/teams/migrations/0036_auto_20180403_0201.py create mode 100644 src/teams/migrations/0037_auto_20180408_1416.py create mode 100644 src/teams/signal_handlers.py diff --git a/scripts/schemagif.sh b/scripts/schemagif.sh new file mode 100755 index 00000000..41407832 --- /dev/null +++ b/scripts/schemagif.sh @@ -0,0 +1,69 @@ +#!/bin/sh +################################# +# Loop over migrations in the +# BornHack website project, apply +# one by one, and run +# postgresql_autodoc for each. +# +# Use the generated .dot files +# to generate PNGs and watermark +# the PNG with the migration name. +# +# Finally use $whatever to combine +# all the PNGs to an animation and +# marvel at the ingenuity of Man. +# +# This scripts makes a million +# assumptions about the local env. +# and installed packages. Enjoy! +# +# /Tykling, April 2018 +################################# +#set -x + +# warn the user +read -p "WARNING: This scripts deletes and recreates the local pg database named bornhackdb several times. Continue? " + +# wipe database +sudo su postgres -c "dropdb bornhackdb; createdb -O bornhack bornhackdb" + +# run migrate with --fake to get list of migrations +MIGRATIONS=$(python manage.py migrate --fake | grep FAKED | cut -d " " -f 4 | cut -d "." -f 1-2) + +# wipe database again +sudo su postgres -c "dropdb bornhackdb; createdb -O bornhack bornhackdb" + +# create output folder +sudo rm -rf postgres_autodoc +mkdir postgres_autodoc +sudo chown postgres:postgres postgres_autodoc + +# loop over migrations +COUNTER=0 +for MIGRATION in $MIGRATIONS; do + COUNTER=$(( $COUNTER + 1 )) + ALFACOUNTER=$(printf "%04d" $COUNTER) + + echo "processing migration #${COUNTER}: $MIG" + APP=$(echo $MIGRATION | cut -d "." -f 1) + MIG=$(echo $MIGRATION | cut -d "." -f 2) + + echo "--- running migration: APP: $APP MIGRATION: $MIG ..." + python manage.py migrate --no-input $APP $MIG + + echo "--- running postgresql_autodoc and dot..." + cd postgres_autodoc + sudo su postgres -c "mkdir ${ALFACOUNTER}-$MIGRATION" + cd "${ALFACOUNTER}-${MIGRATION}" + # run postgresql_autodoc + sudo su postgres -c "postgresql_autodoc -d bornhackdb" + # create PNG from .dot file + sudo su postgres -c "dot -Tpng bornhackdb.dot -o bornhackdb.png" + # create watermark image with migration name as white on black text + sudo su postgres -c "convert -background none -undercolor black -fill white -font DejaVu-Sans-Mono-Bold -size 5316x4260 -pointsize 72 -gravity SouthEast label:${ALFACOUNTER}-${MIGRATION} background.png" + # combine the images + sudo su postgres -c "composite -gravity center bornhackdb.png background.png final.png" + cd .. + cd .. +done + diff --git a/src/bornhack/environment_settings.py.dist b/src/bornhack/environment_settings.py.dist index 6dd63947..8f2bc189 100644 --- a/src/bornhack/environment_settings.py.dist +++ b/src/bornhack/environment_settings.py.dist @@ -36,6 +36,9 @@ CAMP_REDIRECT_PERCENT=25 ### changes below here are only needed for production # email settings +{% if not django_email_realworld | default(False) %} +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +{% endif %} EMAIL_HOST='{{ django_email_host }}' EMAIL_PORT={{ django_email_port }} EMAIL_HOST_USER='{{ django_email_user }}' @@ -76,13 +79,13 @@ SCHEDULE_EVENT_NOTIFICATION_MINUTES=10 # irc bot settings IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS=10 IRCBOT_NICK='{{ django_ircbot_nickname }}' +IRCBOT_CHANSERV_MASK='{{ django_ircbot_chanserv_mask }}' +IRCBOT_NICKSERV_MASK='{{ django_ircbot_nickserv_mask }}' IRCBOT_NICKSERV_PASSWORD='{{ django_ircbot_nickserv_password }}' +IRCBOT_NICKSERV_EMAIL='{{ django_ircbot_nickserv_email }}' +IRCBOT_NICKSERV_IDENTIFY_STRING="This nickname is registered. Please choose a different nickname, or identify via \x02/msg NickServ identify \x02." IRCBOT_SERVER_HOSTNAME='{{ django_ircbot_server }}' IRCBOT_SERVER_PORT=6697 IRCBOT_SERVER_USETLS=True -IRCBOT_CHANNELS={ - 'default': '{{ django_ircbot_default_channel }}', - 'orga': '{{ django_ircbot_orga_channel }}', - 'public': '{{ django_ircbot_public_channel }}' -} +IRCBOT_PUBLIC_CHANNEL='{{ django_ircbot_public_channel }}' diff --git a/src/bornhack/settings.py b/src/bornhack/settings.py index 1fa0e4f8..560455b1 100644 --- a/src/bornhack/settings.py +++ b/src/bornhack/settings.py @@ -45,6 +45,7 @@ INSTALLED_APPS = [ 'tickets', 'bar', 'backoffice', + 'events', 'allauth', 'allauth.account', diff --git a/src/camps/migrations/0023_camp_shortslug.py b/src/camps/migrations/0023_camp_shortslug.py new file mode 100644 index 00000000..27f715aa --- /dev/null +++ b/src/camps/migrations/0023_camp_shortslug.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 11:44 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('camps', '0022_camp_colour'), + ] + + operations = [ + migrations.AddField( + model_name='camp', + name='shortslug', + field=models.SlugField(blank=True, help_text='Abbreviated version of the slug. Used in IRC channel names and other places with restricted name length.', verbose_name='Short Slug'), + ), + ] diff --git a/src/camps/migrations/0024_populate_camp_shortslugs.py b/src/camps/migrations/0024_populate_camp_shortslugs.py new file mode 100644 index 00000000..2033c633 --- /dev/null +++ b/src/camps/migrations/0024_populate_camp_shortslugs.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 11:45 +from __future__ import unicode_literals + +from django.db import migrations + +def populate_camp_shortslugs(apps, schema_editor): + Camp = apps.get_model('camps', 'Camp') + for camp in Camp.objects.all(): + if not camp.shortslug: + camp.shortslug = camp.slug + camp.save() + +class Migration(migrations.Migration): + dependencies = [ + ('camps', '0023_camp_shortslug'), + ] + + operations = [ + migrations.RunPython(populate_camp_shortslugs), + ] + diff --git a/src/camps/migrations/0025_auto_20180318_1250.py b/src/camps/migrations/0025_auto_20180318_1250.py new file mode 100644 index 00000000..d7c596e1 --- /dev/null +++ b/src/camps/migrations/0025_auto_20180318_1250.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 11:50 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('camps', '0024_populate_camp_shortslugs'), + ] + + operations = [ + migrations.AlterField( + model_name='camp', + name='shortslug', + field=models.SlugField(help_text='Abbreviated version of the slug. Used in IRC channel names and other places with restricted name length.', verbose_name='Short Slug'), + ), + ] diff --git a/src/camps/models.py b/src/camps/models.py index e9886edd..d390aa13 100644 --- a/src/camps/models.py +++ b/src/camps/models.py @@ -34,6 +34,11 @@ class Camp(CreatedUpdatedModel, UUIDModel): help_text='The url slug to use for this camp' ) + shortslug = models.SlugField( + verbose_name='Short Slug', + help_text='Abbreviated version of the slug. Used in IRC channel names and other places with restricted name length.', + ) + buildup = DateTimeRangeField( verbose_name='Buildup Period', help_text='The camp buildup period.', @@ -189,9 +194,3 @@ class Camp(CreatedUpdatedModel, UUIDModel): else: return True - @property - def teams(self): - """ Return a queryset with all teams under all TeamAreas under this Camp """ - from teams.models import Team - return Team.objects.filter(area__in=self.teamareas.all()) - diff --git a/src/events/__init__.py b/src/events/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/events/admin.py b/src/events/admin.py new file mode 100644 index 00000000..b0d4fd2d --- /dev/null +++ b/src/events/admin.py @@ -0,0 +1,12 @@ +from django.contrib import admin +from .models import Type, Routing + +@admin.register(Type) +class TypeAdmin(admin.ModelAdmin): + pass + +@admin.register(Routing) +class RoutingAdmin(admin.ModelAdmin): + pass + + diff --git a/src/events/apps.py b/src/events/apps.py new file mode 100644 index 00000000..38546443 --- /dev/null +++ b/src/events/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class EventsConfig(AppConfig): + name = 'events' diff --git a/src/events/handler.py b/src/events/handler.py new file mode 100644 index 00000000..b38cb152 --- /dev/null +++ b/src/events/handler.py @@ -0,0 +1,81 @@ +from django.utils import timezone +from datetime import timedelta +from ircbot.utils import add_irc_message +import logging +logger = logging.getLogger("bornhack.%s" % __name__) + + +def handle_team_event(eventtype, irc_message=None, irc_timeout=60, email_template=None, email_formatdict=None): + """ + This method is our basic event handler. + The type of event determines which teams receive notifications. + TODO: Add some sort of priority to messages + """ + logger.info("Inside handle_team_event, eventtype %s" % eventtype) + + # get event type from database + from .models import Type + try: + eventtype = Type.objects.get(name=eventtype) + except Type.DoesNotExist: + # unknown event type, do nothing + logger.error("Unknown eventtype %s" % eventtype) + return + + if not eventtype.teams: + # no routes found for this eventtype, do nothing + logger.error("No routes round for eventtype %s" % eventtype) + return + + # loop over routes (teams) for this eventtype + for team in eventtype.teams: + logger.info("Handling eventtype %s for team %s" % (eventtype, team)) + team_irc_notification(team=team, eventtype=eventtype, irc_message=irc_message, irc_timeout=irc_timeout) + team_email_notification(team=team, eventtype=eventtype, email_template=None, email_formatdict=None) + # handle any future notification types here.. + + +def team_irc_notification(team, eventtype, irc_message=None, irc_timeout=60): + """ + Sends IRC notifications for events to team IRC channels + """ + logger.info("Inside team_irc_notification, message %s" % irc_message) + if not irc_message: + logger.error("No IRC message found") + return + + if not eventtype.irc_notification: + logger.error("IRC notifications not enabled for eventtype %s" % eventtype) + return + + if not team.irc_channel or not team.irc_channel_name: + logger.error("team %s is not IRC enabled" % team) + return + + # send an IRC message to the the channel for this team + add_irc_message( + target=team.irc_channel_name, + message=irc_message, + timeout=60 + ) + logger.info("Added new IRC message for channel %s" % team.irc_channel_name) + + +def team_email_notification(team, eventtype, email_template=None, email_formatdict=None): + """ + Sends email notifications for events to team mailinglists (if possible, + otherwise directly to the team responsibles) + """ + if not email_template or not email_formatdict or not eventtype.email_notification: + # no email message found, or email notifications are not enabled for this event type + return + + if team.mailing_list: + # send notification to the team mailing list + recipient_list = [team.mailing_list] + else: + # no team mailinglist, send to the team responsibles instead + recipient_list = [resp.email for resp in team.responsible_members.all()] + + # TODO: actually send the email here + diff --git a/src/events/migrations/0001_initial.py b/src/events/migrations/0001_initial.py new file mode 100644 index 00000000..3c3c00f8 --- /dev/null +++ b/src/events/migrations/0001_initial.py @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 13:16 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('teams', '0025_auto_20180318_1318'), + ] + + operations = [ + migrations.CreateModel( + name='Routing', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(auto_now_add=True)), + ('updated', models.DateTimeField(auto_now=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='Type', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(auto_now_add=True)), + ('updated', models.DateTimeField(auto_now=True)), + ('name', models.TextField(help_text='The type of event', unique=True)), + ], + options={ + 'abstract': False, + }, + ), + migrations.AddField( + model_name='routing', + name='eventtype', + field=models.ForeignKey(help_text='The type of event to route', on_delete=django.db.models.deletion.PROTECT, related_name='eventroutes', to='events.Type'), + ), + migrations.AddField( + model_name='routing', + name='team', + field=models.ForeignKey(help_text='The team which should receive events of this type.', on_delete=django.db.models.deletion.PROTECT, related_name='eventroutes', to='teams.Team'), + ), + ] diff --git a/src/events/migrations/0002_create_eventtype.py b/src/events/migrations/0002_create_eventtype.py new file mode 100644 index 00000000..a84eb0ef --- /dev/null +++ b/src/events/migrations/0002_create_eventtype.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 13:18 +from __future__ import unicode_literals + +from django.db import migrations + +def create_eventtypes(apps, schema_editor): + Type = apps.get_model('events', 'Type') + Type.objects.create(name='public_credit_name_changed') + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0001_initial'), + ] + + operations = [ + migrations.RunPython(create_eventtypes), + ] + diff --git a/src/events/migrations/0003_create_another_eventtype.py b/src/events/migrations/0003_create_another_eventtype.py new file mode 100644 index 00000000..1259799c --- /dev/null +++ b/src/events/migrations/0003_create_another_eventtype.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-25 14:16 +from __future__ import unicode_literals + +from django.db import migrations + +def create_eventtype(apps, schema_editor): + Type = apps.get_model('events', 'Type') + Type.objects.create(name='ticket_created') + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0002_create_eventtype'), + ] + + operations = [ + migrations.RunPython(create_eventtype), + ] diff --git a/src/events/migrations/0004_auto_20180403_1228.py b/src/events/migrations/0004_auto_20180403_1228.py new file mode 100644 index 00000000..23fe4e15 --- /dev/null +++ b/src/events/migrations/0004_auto_20180403_1228.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-03 10:28 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0003_create_another_eventtype'), + ] + + operations = [ + migrations.AddField( + model_name='type', + name='email_notification', + field=models.BooleanField(default=False, help_text='Check to send email notifications for this type of event.'), + ), + migrations.AddField( + model_name='type', + name='irc_notification', + field=models.BooleanField(default=False, help_text='Check to send IRC notifications for this type of event.'), + ), + ] diff --git a/src/events/migrations/__init__.py b/src/events/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/events/models.py b/src/events/models.py new file mode 100644 index 00000000..74ba03a8 --- /dev/null +++ b/src/events/models.py @@ -0,0 +1,61 @@ +from django.db import models +from utils.models import CreatedUpdatedModel +from teams.models import Team + +class Type(CreatedUpdatedModel): + """ + The events.Type model contains different types of system events which can happen. + New event types should be added in data migrations. + The following types are currently used in the codebase: + - ticket_created: Whenever a new ShopTicket is created + - public_credit_name_changed: Whenever a user changes public_credit_name in the profile + """ + name = models.TextField( + unique=True, + help_text='The type of event' + ) + + irc_notification = models.BooleanField( + default=False, + help_text='Check to send IRC notifications for this type of event.', + ) + + email_notification = models.BooleanField( + default=False, + help_text='Check to send email notifications for this type of event.', + ) + def __str__(self): + return self.name + + @property + def teams(self): + """ + This property returns a queryset with all the teams that should receive this type of events + """ + team_ids = Routing.objects.filter(eventtype=self).values_list('team', flat=True) + return Team.objects.filter(pk__in=team_ids) + + +class Routing(CreatedUpdatedModel): + """ + The events.Routing model contains routings for system events. + Add a new entry to route events of a certain type to a team. + Several teams can receive the same type of event. + """ + eventtype = models.ForeignKey( + 'events.Type', + related_name='eventroutes', + on_delete=models.PROTECT, + help_text='The type of event to route', + ) + + team = models.ForeignKey( + 'teams.Team', + related_name='eventroutes', + on_delete=models.PROTECT, + help_text='The team which should receive events of this type.' + ) + + def __str__(self): + return "%s -> %s" % (self.eventtype, self.team) + diff --git a/src/events/tests.py b/src/events/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/src/events/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/events/views.py b/src/events/views.py new file mode 100644 index 00000000..91ea44a2 --- /dev/null +++ b/src/events/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/src/ircbot/irc3module.py b/src/ircbot/irc3module.py index 97844016..e8c461a3 100644 --- a/src/ircbot/irc3module.py +++ b/src/ircbot/irc3module.py @@ -1,7 +1,9 @@ -import irc3 +import irc3, re from ircbot.models import OutgoingIrcMessage +from teams.models import Team, TeamMember from django.conf import settings from django.utils import timezone +from events.models import Routing import logging logger = logging.getLogger("bornhack.%s" % __name__) @@ -26,6 +28,12 @@ class Plugin(object): """triggered after the server sent the MOTD (require core plugin)""" logger.debug("inside server_ready(), kwargs: %s" % kwargs) + logger.info("Identifying with %s" % settings.IRCBOT_NICKSERV_MASK) + self.bot.privmsg(settings.IRCBOT_NICKSERV_MASK, "identify %s %s" % (settings.IRCBOT_NICK, settings.IRCBOT_NICKSERV_PASSWORD)) + + logger.info("Calling self.bot.do_stuff() in %s seconds.." % settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS) + self.bot.loop.call_later(settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS, self.bot.do_stuff) + def connection_lost(self, **kwargs): """triggered when connection is lost""" @@ -36,9 +44,6 @@ class Plugin(object): """triggered when connection is up""" logger.debug("inside connection_made(), kwargs: %s" % kwargs) - # wait 5 secs before starting the loop to check for outgoing messages - self.bot.loop.call_later(settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS, self.bot.get_outgoing_messages) - ############################################################################################### ### decorated irc3 event methods @@ -48,16 +53,38 @@ class Plugin(object): """triggered when there is a join part or quit on a channel the bot is in""" logger.debug("inside on_join_part_quit(), kwargs: %s" % kwargs) + # TODO: on part or quit check if the bot is the only remaining member of a channel, + # if so, check if the channel should be managed, and if so, part and join the channel + # to gain @ and register with ChanServ + + + @irc3.event(irc3.rfc.JOIN) + def on_join(self, mask, channel, **kwargs): + """Triggered when a channel is joined by someone, including the bot itself""" + if mask.nick == self.bot.nick: + # the bot just joined a channel + if channel in self.get_managed_team_channels(): + logger.debug("Just joined a channel I am supposed to be managing, asking ChanServ for info about %s" % channel) + self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "info %s" % channel) + return + @irc3.event(irc3.rfc.PRIVMSG) def on_privmsg(self, **kwargs): """triggered when a privmsg is sent to the bot or to a channel the bot is in""" logger.debug("inside on_privmsg(), kwargs: %s" % kwargs) - # nickserv - if kwargs['mask'] == "NickServ!NickServ@services.baconsvin.org" and kwargs['event'] == "NOTICE" and kwargs['data'] == "This nickname is registered. Please choose a different nickname, or identify via \x02/msg NickServ identify \x02.": - logger.info("Nickserv identify needed, fixing...") - self.bot.privmsg("NickServ@services.baconsvin.org", "identify %s %s" % (settings.IRCBOT_NICK, settings.IRCBOT_NICKSERV_PASSWORD)) + # we only handle NOTICEs for now + if kwargs['event'] != "NOTICE": + return + + # check if this is a message from nickserv + if kwargs['mask'] == "NickServ!%s" % settings.IRCBOT_NICKSERV_MASK: + self.bot.handle_nickserv_privmsg(**kwargs) + + # check if this is a message from chanserv + if kwargs['mask'] == "ChanServ!%s" % settings.IRCBOT_CHANSERV_MASK: + self.bot.handle_chanserv_privmsg(**kwargs) @irc3.event(irc3.rfc.KICK) @@ -68,13 +95,28 @@ class Plugin(object): ############################################################################################### ### custom irc3 methods + @irc3.extend + def do_stuff(self): + """ + Main periodic method called every N seconds. + """ + #logger.debug("inside do_stuff()") + + # call the methods we need to + self.bot.check_irc_channels() + self.bot.fix_missing_acls() + self.bot.get_outgoing_messages() + + # schedule a call of this function again in N seconds + self.bot.loop.call_later(settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS, self.bot.do_stuff) + + @irc3.extend def get_outgoing_messages(self): """ This method gets unprocessed OutgoingIrcMessage objects and attempts to send them to the target channel. Messages are skipped if the bot is not in the channel. """ - #logger.debug("inside get_outgoing_messages()") for msg in OutgoingIrcMessage.objects.filter(processed=False).order_by('created'): logger.info("processing irc message to %s: %s" % (msg.target, msg.message)) # if this message expired mark it as expired and processed without doing anything @@ -99,7 +141,198 @@ class Plugin(object): else: logger.warning("skipping message to %s" % msg.target) - # call this function again in X seconds - self.bot.loop.call_later(settings.IRCBOT_CHECK_MESSAGE_INTERVAL_SECONDS, self.bot.get_outgoing_messages) + + ############################################################################################### + ### irc channel methods + + @irc3.extend + def check_irc_channels(self): + """ + Compare the list of IRC channels the bot is currently in with the list of IRC channels the bot is supposed to be in. + Join or part channels as needed. + """ + desired_channel_list = list(set(list(self.get_managed_team_channels()) + list(self.get_unmanaged_team_channels()) + [settings.IRCBOT_PUBLIC_CHANNEL])) + #logger.debug("Inside check_irc_channels(), desired_channel_list is: %s and self.bot.channels is: %s" % (desired_channel_list, self.bot.channels.keys())) + + # loop over desired_channel_list, join as needed + for channel in desired_channel_list: + if channel not in self.bot.channels: + logger.debug("I should be in %s but I am not, attempting to join..." % channel) + self.bot.join(channel) + + # loop over self.bot.channels, part as needed + for channel in self.bot.channels: + if channel not in desired_channel_list: + logger.debug("I am in %s but I shouldn't be, parting..." % channel) + self.bot.part(channel, "I am no longer needed here") + @irc3.extend + def get_managed_team_channels(self): + """ + Return a unique list of team IRC channels which the bot is supposed to be managing. + """ + return Team.objects.filter( + irc_channel=True, + irc_channel_managed=True + ).values_list("irc_channel_name", flat=True) + + + @irc3.extend + def get_unmanaged_team_channels(self): + """ + Return a unique list of team IRC channels which the bot is not supposed to be managing. + """ + return Team.objects.filter( + irc_channel=True, + irc_channel_managed=False + ).values_list("irc_channel_name", flat=True) + + + @irc3.extend + def setup_private_channel(self, team): + """ + Configures a private team IRC channel by setting modes and adding all members to ACL + """ + # basic private channel modes + self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s mlock +inpst" % team.irc_channel_name) + self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s SECURE on" % team.irc_channel_name) + self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s RESTRICTED on" % team.irc_channel_name) + + # add the bot to the ACL + self.bot.add_user_to_team_channel_acl( + username=settings.IRCBOT_NICK, + channel=team.irc_channel_name + ) + + # add all members to the acl + for membership in team.memberships.all(): + if membership.approved and membership.user.profile.nickserv_username: + self.bot.add_user_to_team_channel_acl( + username=membership.user.profile.nickserv_username, + channel=membership.team.irc_channel_name, + ) + + # mark membership as irc_channel_acl_ok=True and save + membership.irc_channel_acl_ok=True + membership.save() + + + @irc3.extend + def add_user_to_team_channel_acl(self, username, channel): + """ + Add user to team IRC channel ACL + """ + # set autoop for this username + self.bot.privmsg( + settings.IRCBOT_CHANSERV_MASK, + "flags %(channel)s %(user)s +oO" % { + 'channel': channel, + 'user': username, + }, + ) + + # also add autoinvite for this username + self.bot.mode(channel, '+I', '$a:%s' % username) + + + @irc3.extend + def fix_missing_acls(self): + """ + Called periodically by do_stuff() + Loops over TeamMember objects and adds and removes ACL entries as needed + """ + missing_acls = TeamMember.objects.filter( + team__irc_channel=True, + team__irc_channel_managed=True, + team__irc_channel_private=True, + irc_channel_acl_ok=False + ).exclude( + user__profile__nickserv_username='' + ) + + if not missing_acls: + return + + logger.debug("Found %s memberships which need IRC ACL fixing.." % missing_acls.count()) + for membership in missing_acls: + self.bot.add_user_to_team_channel_acl( + username=membership.user.profile.nickserv_username, + channel=membership.team.irc_channel_name, + ) + # mark membership as irc_channel_acl_ok=True and save + membership.irc_channel_acl_ok=True + membership.save() + + + ############################################################################################### + ### services (ChanServ & NickServ) methods + + @irc3.extend + def handle_chanserv_privmsg(self, **kwargs): + """ + Handle messages from ChanServ on networks with Services. + """ + logger.debug("Got a message from ChanServ") + + ############################################### + # handle "Channel \x02#example\x02 is not registered." message + ############################################### + match = re.compile("Channel (#[a-zA-Z0-9-]+) is not registered.").match(kwargs['data'].replace("\x02", "")) + if match: + # the irc channel is not registered + channel = match.group(1) + # get a list of the channels we are supposed to be managing + if channel in self.bot.get_managed_team_channels(): + # we want to register this channel! but we can only do so if we have a @ in the channel + if self.bot.nick in self.bot.channels[channel].modes['@']: + logger.debug("ChanServ says channel %s is not registered, bot is supposed to be managing this channel, registering it with chanserv" % channel) + self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "register %s" % channel) + else: + logger.debug("ChanServ says channel %s is not registered, bot is supposed to be managing this channel, but the bot cannot register without @ in the channel" % channel) + self.bot.privmsg(channel, "I need @ before I can register this channel with ChanServ") + return + + ############################################### + # handle "\x02#example\x02 is now registered to \x02tykbhdev\x02" message + ############################################### + match = re.compile("(#[a-zA-Z0-9-]+) is now registered to ([a-zA-Z0-9-]+)\\.").match(kwargs['data'].replace("\x02", "")) + if match: + # the irc channel is now registered + channel = match.group(1) + botnick = match.group(2) + logger.debug("Channel %s was registered with ChanServ, looking up Team..." % channel) + + # if this channel is a private team IRC channel set modes and add initial ACL + try: + team = Team.objects.get(irc_channel_name=channel) + except Team.DoesNotExist: + logger.debug("Unable to find Team matching IRC channel %s" % channel) + return + + if not team.irc_channel_private: + # this channel is not private, no mode change and ACL needed + return + + # set channel modes and ACL + self.bot.setup_private_channel(team) + return + + logger.debug("Unhandled ChanServ message: %s" % kwargs['data']) + + + @irc3.extend + def handle_nickserv_privmsg(self, **kwargs): + """th + Handles messages from NickServ on networks with Services. + """ + logger.debug("Got a message from NickServ") + + # handle "\x02botnick\x02 is not a registered nickname." message + if kwargs['data'] == '\x02%s\x02 is not a registered nickname.' % self.bot.nick: + # the bots nickname is not registered, register new account with nickserv + self.bot.privmsg(settings.IRCBOT_NICKSERV_MASK, "register %s %s" % (settings.IRCBOT_NICKSERV_PASSWORD, settings.IRCBOT_NICKSERV_EMAIL)) + return + + logger.debug("Unhandled NickServ message: %s" % kwargs['data']) + diff --git a/src/ircbot/ircworker.py b/src/ircbot/ircworker.py index b0afd363..f3864d8d 100644 --- a/src/ircbot/ircworker.py +++ b/src/ircbot/ircworker.py @@ -1,6 +1,7 @@ from django.conf import settings import logging import irc3 +from events.models import Routing logging.basicConfig(level=logging.INFO) logger = logging.getLogger('bornhack.%s' % __name__) @@ -9,9 +10,13 @@ def do_work(): """ Run irc3 module code, wait for events on IRC and wait for messages in OutgoingIrcMessage """ + if hasattr(settings, 'IRCBOT_CHANNELS'): + logger.error("settings.IRCBOT_CHANNELS is deprecated. Please define settings.IRCBOT_PUBLIC_CHANNEL and use team channels for the rest.") + return False + config = { 'nick': settings.IRCBOT_NICK, - 'autojoins': list(set(settings.IRCBOT_CHANNELS.values())), + 'autojoins': [], 'host': settings.IRCBOT_SERVER_HOSTNAME, 'port': settings.IRCBOT_SERVER_PORT, 'ssl': settings.IRCBOT_SERVER_USETLS, diff --git a/src/ircbot/utils.py b/src/ircbot/utils.py new file mode 100644 index 00000000..dfb27b69 --- /dev/null +++ b/src/ircbot/utils.py @@ -0,0 +1,21 @@ +from django.conf import settings +from django.utils import timezone +from datetime import timedelta +import logging +logger = logging.getLogger("bornhack.%s" % __name__) + + +def add_irc_message(target, message, timeout=10): + """ + Convenience function for adding OutgoingIrcMessage objects. + Defaults to a message timeout of 10 minutes + """ + from .models import OutgoingIrcMessage + OutgoingIrcMessage.objects.create( + target=target, + message=message, + timeout=timezone.now()+timedelta(minutes=timeout), + ) + + + diff --git a/src/people/templates/people.html b/src/people/templates/people.html index aaa2e70c..076b59bd 100644 --- a/src/people/templates/people.html +++ b/src/people/templates/people.html @@ -21,6 +21,7 @@ People | {{ block.super }}

    + @@ -31,19 +32,20 @@ People | {{ block.super }} {{ team.name }} Team + diff --git a/src/profiles/__init__.py b/src/profiles/__init__.py index e69de29b..562016c4 100644 --- a/src/profiles/__init__.py +++ b/src/profiles/__init__.py @@ -0,0 +1,2 @@ +default_app_config = 'profiles.apps.ProfilesConfig' + diff --git a/src/profiles/admin.py b/src/profiles/admin.py index 012a4199..795ccad4 100644 --- a/src/profiles/admin.py +++ b/src/profiles/admin.py @@ -14,6 +14,10 @@ class OrderAdmin(admin.ModelAdmin): 'public_credit_name_approved', ] + list_filter = [ + 'public_credit_name_approved', + ] + def approve_public_credit_names(self, request, queryset): for profile in queryset.filter(public_credit_name_approved=False): profile.approve_public_credit_name() diff --git a/src/profiles/apps.py b/src/profiles/apps.py new file mode 100644 index 00000000..307b5f7c --- /dev/null +++ b/src/profiles/apps.py @@ -0,0 +1,16 @@ +from django.apps import AppConfig +from django.db.models.signals import pre_save, post_save +from .signal_handlers import create_profile, profile_pre_save +import logging +logger = logging.getLogger("bornhack.%s" % __name__) + + +class ProfilesConfig(AppConfig): + name = 'profiles' + + def ready(self): + # remember to include a dispatch_uid to prevent signals being called multiple times in certain corner cases + from django.contrib.auth.models import User + post_save.connect(create_profile, sender=User, dispatch_uid='user_post_save_signal') + pre_save.connect(profile_pre_save, sender='profiles.Profile', dispatch_uid='profile_pre_save_signal') + diff --git a/src/profiles/migrations/0008_auto_20180325_2022.py b/src/profiles/migrations/0008_auto_20180325_2022.py new file mode 100644 index 00000000..efe72731 --- /dev/null +++ b/src/profiles/migrations/0008_auto_20180325_2022.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-25 18:22 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('profiles', '0007_auto_20170711_2025'), + ] + + operations = [ + migrations.AlterField( + model_name='profile', + name='public_credit_name', + field=models.CharField(blank=True, help_text='The name you want to appear on in the credits section of the public website (on Team and People pages). Leave this empty if you want your name hidden on the public webpages.', max_length=100), + ), + ] diff --git a/src/profiles/migrations/0009_profile_nickserv_username.py b/src/profiles/migrations/0009_profile_nickserv_username.py new file mode 100644 index 00000000..0b5bca3c --- /dev/null +++ b/src/profiles/migrations/0009_profile_nickserv_username.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-03 00:01 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('profiles', '0008_auto_20180325_2022'), + ] + + operations = [ + migrations.AddField( + model_name='profile', + name='nickserv_username', + field=models.CharField(blank=True, help_text='Your NickServ username is used to manage team IRC channel access lists.', max_length=50), + ), + ] diff --git a/src/profiles/models.py b/src/profiles/models.py index c7fcb2ec..e4e8f068 100644 --- a/src/profiles/models.py +++ b/src/profiles/models.py @@ -1,9 +1,5 @@ from django.contrib.auth.models import User from django.db import models -from django.db.models.signals import ( - post_save, - pre_save -) from django.conf import settings from django.utils import timezone from django.dispatch import receiver @@ -11,7 +7,6 @@ from django.utils.translation import ugettext_lazy as _ from datetime import timedelta -from ircbot.models import OutgoingIrcMessage from utils.models import UUIDModel, CreatedUpdatedModel @@ -42,7 +37,7 @@ class Profile(CreatedUpdatedModel, UUIDModel): public_credit_name = models.CharField( blank=True, max_length=100, - help_text='The name you want to appear on in the credits section of the public website (the People pages). Leave empty if you want no public credit.' + help_text='The name you want to appear on in the credits section of the public website (on Team and People pages). Leave this empty if you want your name hidden on the public webpages.' ) public_credit_name_approved = models.BooleanField( @@ -50,6 +45,12 @@ class Profile(CreatedUpdatedModel, UUIDModel): help_text='Check this box to approve this users public_credit_name. This will be unchecked automatically when the user edits public_credit_name' ) + nickserv_username = models.CharField( + blank=True, + max_length=50, + help_text='Your NickServ username is used to manage team IRC channel access lists.', + ) + @property def email(self): return self.user.email @@ -58,37 +59,21 @@ class Profile(CreatedUpdatedModel, UUIDModel): return self.user.username def approve_public_credit_name(self): + """ + This method just sets profile.public_credit_name_approved=True and calls save() + It is used in an admin action + """ self.public_credit_name_approved = True self.save() @property - def approved_public_credit_name(self): + def get_public_credit_name(self): + """ + Convenience method to return profile.public_credit_name if it is approved, + and the string "Unnamed" otherwise + """ if self.public_credit_name_approved: return self.public_credit_name else: - return False + return "Unnamed" - -@receiver(post_save, sender=User) -def create_profile(sender, created, instance, **kwargs): - if created: - Profile.objects.create(user=instance) - - -@receiver(pre_save, sender=Profile) -def changed_public_credit_name(sender, instance, **kwargs): - try: - original = sender.objects.get(pk=instance.pk) - except sender.DoesNotExist: - # newly created object, just pass - pass - else: - if not original.public_credit_name == instance.public_credit_name: - OutgoingIrcMessage.objects.create( - target=settings.IRCBOT_CHANNELS['orga'] if 'orga' in settings.IRCBOT_CHANNELS else settings.IRCBOT_CHANNELS['default'], - message='User {username} changed public credit name. please review and act accordingly: https://bornhack.dk/admin/profiles/profile/{uuid}/change/'.format( - username=instance.name, - uuid=instance.uuid - ), - timeout=timezone.now()+timedelta(minutes=60) - ) diff --git a/src/profiles/signal_handlers.py b/src/profiles/signal_handlers.py new file mode 100644 index 00000000..5fb38c6d --- /dev/null +++ b/src/profiles/signal_handlers.py @@ -0,0 +1,81 @@ +from django.db.models.signals import ( + post_save, + pre_save +) +from events.handler import handle_team_event +import logging +logger = logging.getLogger("bornhack.%s" % __name__) + + +def create_profile(sender, created, instance, **kwargs): + """ + Signal handler called after a User object is saved. + Creates a Profile object when the User object was just created. + """ + from .models import Profile + if created: + Profile.objects.create(user=instance) + + +def profile_pre_save(sender, instance, **kwargs): + """ + Signal handler called before a Profile object is saved. + """ + try: + original = sender.objects.get(pk=instance.pk) + except sender.DoesNotExist: + original = None + logger.debug("inside profile_pre_save with instance.nickserv_username=%s and original.nickserv_username=%s" % (instance.nickserv_username, original.nickserv_username)) + + public_credit_name_changed(instance, original) + nickserv_username_changed(instance, original) + + +def public_credit_name_changed(instance, original): + """ + Checks if a users public_credit_name has been changed, and triggers a public_credit_name_changed event if so + """ + if original.public_credit_name == instance.public_credit_name: + # public_credit_name has not been changed + return + + if original.public_credit_name and not original.public_credit_name_approved: + # the original.public_credit_name was not approved, no need to notify again + return + + # put the message together + message='User {username} changed public credit name. please review and act accordingly: https://bornhack.dk/admin/profiles/profile/{uuid}/change/'.format( + username=instance.name, + uuid=instance.uuid + ) + + # trigger the event + handle_team_event( + eventtype='public_credit_name_changed', + irc_message=message, + ) + + +def nickserv_username_changed(instance, original): + """ + Check if profile.nickserv_username was changed, and uncheck irc_channel_acl_ok if so + This will be picked up by the IRC bot and fixed as needed + """ + if instance.nickserv_username and instance.nickserv_username != original.nickserv_username: + logger.debug("profile.nickserv_username changed for user %s, setting irc_channel_acl_ok=False" % instance.user.username) + + # find team memberships for this user + from teams.models import TeamMember + memberships = TeamMember.objects.filter( + user=instance.user, + approved=True, + team__irc_channel=True, + team__irc_channel_managed=True, + team__irc_channel_private=True, + ) + + # loop over memberships + for membership in memberships: + membership.irc_channel_acl_ok = False + membership.save() + diff --git a/src/profiles/templates/profile_detail.html b/src/profiles/templates/profile_detail.html index eca56d17..84ba1938 100644 --- a/src/profiles/templates/profile_detail.html +++ b/src/profiles/templates/profile_detail.html @@ -14,9 +14,13 @@ - + + + + +
    TicketUserEmailNameTicket UUIDTicket TypeOrder IDOrder UserOrder EmailTicket NameTicket Email Product
    {{ ticket }}{{ ticket.uuid }}{{ ticket.shortname }}{{ ticket.order.id }} {{ ticket.order.user }} {{ ticket.order.user.email }} {{ ticket.name }}{{ ticket.email }}{{ ticket.product }}
    Team NameTeam Responsible Team Members
    - {% if team.anoncount == 0 and team.approvedmembers.count == 0 %} - No team member(s) - {% elif team.approvedmembers.count == team.anoncount %} - {{ team.anoncount }} anonymous member(s) - {% endif %} - - {% for member in team.approvedmembers.all %} - {% if member.user.profile.approved_public_credit_name %} - {{ member.user.profile.approved_public_credit_name }}{% if member in team.responsible.all %} (responsible){% endif %}
    - {% endif %} + {% for resp in team.responsible_members.all %} + {{ resp.profile.get_public_credit_name }}
    {% endfor %} - {% if team.anoncount and team.anoncount != team.approvedmembers.count %} - plus {{ team.anoncount }} anonymous member(s). +     		+ {% for member in team.regular_members.all %} + {% if member.profile.get_public_credit_name != "Unnamed" %} + {{ member.profile.get_public_credit_name }}
    + {% endif %} + {% empty %} + No team members + {% endfor %} + {% if team.unnamed_members %} + {% if team.unnamed_members.count < team.regular_members.count %}Plus {% endif %}{{ team.unnamed_members.count }} anonymous member(s). {% endif %}
    {{ profile.description|default:"N/A" }}
    Public Credit Name (visible to the public, leave empty if you want no credits)Public Credit Name (visible to the public, leave empty if you want no credits on this website) {{ profile.public_credit_name|default:"N/A" }} {% if profile.public_credit_name %}({% if profile.public_credit_name_approved %}approved{% else %}pending approval{% endif %}){% endif %}
    NickServ username (visible to the public on IRC, used to handle team channel ACLs){{ profile.nickserv_username|default:"N/A" }}
    Edit Profile {% endblock profile_content %} diff --git a/src/profiles/views.py b/src/profiles/views.py index 79ae29bb..4c991aff 100644 --- a/src/profiles/views.py +++ b/src/profiles/views.py @@ -16,7 +16,7 @@ class ProfileDetail(LoginRequiredMixin, DetailView): class ProfileUpdate(LoginRequiredMixin, UpdateView): model = models.Profile - fields = ['name', 'description', 'public_credit_name'] + fields = ['name', 'description', 'public_credit_name', 'nickserv_username'] success_url = reverse_lazy('profiles:detail') template_name = 'profile_form.html' @@ -28,6 +28,6 @@ class ProfileUpdate(LoginRequiredMixin, UpdateView): # user changed the name (to something non blank) form.instance.public_credit_name_approved = False form.instance.save() - messages.info(self.request, 'Your profile has been updated.') + messages.success(self.request, 'Your profile has been updated.') return super().form_valid(form, **kwargs) diff --git a/src/program/apps.py b/src/program/apps.py index a7ec74a0..8a5ef090 100644 --- a/src/program/apps.py +++ b/src/program/apps.py @@ -14,12 +14,10 @@ class ProgramConfig(AppConfig): from .signal_handlers import ( check_speaker_event_camp_consistency, check_speaker_camp_change, - notify_proposal_submitted ) m2m_changed.connect( check_speaker_event_camp_consistency, sender=Speaker.events.through ) pre_save.connect(check_speaker_camp_change, sender=Speaker) - pre_save.connect(notify_proposal_submitted, sender=SpeakerProposal) - pre_save.connect(notify_proposal_submitted, sender=EventProposal) + diff --git a/src/program/signal_handlers.py b/src/program/signal_handlers.py index 08fbb4d5..55434053 100644 --- a/src/program/signal_handlers.py +++ b/src/program/signal_handlers.py @@ -8,7 +8,6 @@ from django.conf import settings from .email import add_new_speakerproposal_email, add_new_eventproposal_email from .models import EventProposal, SpeakerProposal -from ircbot.models import OutgoingIrcMessage logger = logging.getLogger("bornhack.%s" % __name__) @@ -37,42 +36,3 @@ def check_speaker_camp_change(sender, instance, **kwargs): if event.camp != instance.camp: raise ValidationError({'camp': 'You cannot change the camp a speaker belongs to if the speaker is associated with one or more events.'}) - -# pre_save signal that notifies if a proposal changes status from draft to -# pending i.e. is submitted. -def notify_proposal_submitted(sender, instance, **kwargs): - try: - original = sender.objects.get(pk=instance.pk) - except sender.DoesNotExist: - return False - - target = settings.IRCBOT_CHANNELS['orga'] if 'orga' in settings.IRCBOT_CHANNELS else settings.IRCBOT_CHANNELS['default'] - - if original.proposal_status == 'draft' and instance.proposal_status == 'pending': - if isinstance(instance, EventProposal): - if not add_new_eventproposal_email(instance): - logger.error( - 'Error adding event proposal email to outgoing queue for {}'.format(instance) - ) - OutgoingIrcMessage.objects.create( - target=target, - message="New event proposal: {} - https://bornhack.dk/admin/program/eventproposal/{}/change/".format( - instance.title, - instance.uuid - ), - timeout=timezone.now()+timedelta(minutes=10) - ) - - if isinstance(instance, SpeakerProposal): - if not add_new_speakerproposal_email(instance): - logger.error( - 'Error adding speaker proposal email to outgoing queue for {}'.format(instance) - ) - OutgoingIrcMessage.objects.create( - target=target, - message="New speaker proposal: {} - https://bornhack.dk/admin/program/speakerproposal/{}/change/".format( - instance.name, - instance.uuid - ), - timeout=timezone.now()+timedelta(minutes=10) - ) diff --git a/src/teams/admin.py b/src/teams/admin.py index e479c0cc..139d214d 100644 --- a/src/teams/admin.py +++ b/src/teams/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from .models import Team, TeamArea, TeamMember, TeamTask +from .models import Team, TeamMember, TeamTask from .email import add_added_membership_email, add_removed_membership_email from camps.utils import CampPropertyListFilter @@ -17,12 +17,12 @@ class TeamTaskAdmin(admin.ModelAdmin): @admin.register(Team) class TeamAdmin(admin.ModelAdmin): def get_responsible(self, obj): - return ", ".join([resp.get_full_name() for resp in obj.responsible]) + return ", ".join([resp.profile.public_credit_name for resp in obj.responsible_members.all()]) get_responsible.short_description = 'Responsible' list_display = [ 'name', - 'area', + 'camp', 'get_responsible', 'needs_members', ] @@ -78,9 +78,3 @@ class TeamMemberAdmin(admin.ModelAdmin): ) remove_member.description = 'Remove a user from the team.' - -@admin.register(TeamArea) -class TeamAreaAdmin(admin.ModelAdmin): - list_filter = [ - 'camp' - ] diff --git a/src/teams/apps.py b/src/teams/apps.py index 17954d66..3dd023c4 100644 --- a/src/teams/apps.py +++ b/src/teams/apps.py @@ -1,5 +1,13 @@ from django.apps import AppConfig +from django.db.models.signals import post_save, post_delete +from .signal_handlers import teammember_saved, teammember_deleted class TeamsConfig(AppConfig): name = 'teams' + + def ready(self): + # connect the post_save signal, always including a dispatch_uid to prevent it being called multiple times in corner cases + post_save.connect(teammember_saved, sender='teams.TeamMember', dispatch_uid='teammember_save_signal') + post_delete.connect(teammember_deleted, sender='teams.TeamMember', dispatch_uid='teammember_save_signal') + diff --git a/src/teams/email.py b/src/teams/email.py index 62d997db..944f0edb 100644 --- a/src/teams/email.py +++ b/src/teams/email.py @@ -49,10 +49,11 @@ def add_new_membership_email(membership): return add_outgoing_email( text_template='emails/new_membership_email.txt', html_template='emails/new_membership_email.html', - to_recipients=[resp.email for resp in membership.team.responsible], + to_recipients=[resp.email for resp in membership.team.responsible_members.all()], formatdict=formatdict, subject='New membership request for {} at {}'.format( membership.team.name, membership.team.camp.title ) ) + diff --git a/src/teams/forms.py b/src/teams/forms.py deleted file mode 100644 index dab9796c..00000000 --- a/src/teams/forms.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.forms import ModelForm -from .models import Team - - -class ManageTeamForm(ModelForm): - class Meta: - model = Team - fields = ['description', 'needs_members'] diff --git a/src/teams/migrations/0022_auto_20180318_1135.py b/src/teams/migrations/0022_auto_20180318_1135.py new file mode 100644 index 00000000..d2707376 --- /dev/null +++ b/src/teams/migrations/0022_auto_20180318_1135.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 10:35 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0021_auto_20180318_0906'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='irc_channel', + field=models.BooleanField(default=False, help_text='Check to make the IRC bot join the team IRC channel. Leave unchecked to disable IRC bot functionality for this team entirely.'), + ), + migrations.AddField( + model_name='team', + name='irc_channel_managed', + field=models.BooleanField(default=True, help_text='Check to make the bot manage the team IRC channel. The bot will register the channel with ChanServ if possible, and manage ACLs as needed.'), + ), + migrations.AddField( + model_name='team', + name='irc_channel_name', + field=models.TextField(blank=True, default='', help_text='Team IRC channel. Leave blank to generate channel name automatically, based on camp slug and team slug.'), + ), + migrations.AddField( + model_name='team', + name='irc_channel_private', + field=models.BooleanField(default=True, help_text='Check to make the IRC channel private for team members only, also sets +s. Leave unchecked to make the IRC channel public and open for everyone.'), + ), + ] diff --git a/src/teams/migrations/0023_auto_20180318_1256.py b/src/teams/migrations/0023_auto_20180318_1256.py new file mode 100644 index 00000000..3a8983cd --- /dev/null +++ b/src/teams/migrations/0023_auto_20180318_1256.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 11:56 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0022_auto_20180318_1135'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='shortslug', + field=models.SlugField(blank=True, help_text='Abbreviated version of the slug. Used in places like IRC channel names where space is limited'), + ), + migrations.AlterField( + model_name='team', + name='name', + field=models.CharField(help_text='The team name', max_length=255), + ), + migrations.AlterField( + model_name='team', + name='slug', + field=models.SlugField(blank=True, help_text='Url slug for this team. Leave blank to generate based on team name', max_length=255), + ), + ] diff --git a/src/teams/migrations/0024_populate_shortslugs.py b/src/teams/migrations/0024_populate_shortslugs.py new file mode 100644 index 00000000..4babd51e --- /dev/null +++ b/src/teams/migrations/0024_populate_shortslugs.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 11:45 +from __future__ import unicode_literals + +from django.db import migrations + +def populate_team_shortslugs(apps, schema_editor): + Team = apps.get_model('teams', 'Team') + for team in Team.objects.all(): + if not team.shortslug: + team.shortslug = team.slug + team.save() + +class Migration(migrations.Migration): + dependencies = [ + ('teams', '0023_auto_20180318_1256'), + ] + + operations = [ + migrations.RunPython(populate_team_shortslugs), + ] + diff --git a/src/teams/migrations/0025_auto_20180318_1318.py b/src/teams/migrations/0025_auto_20180318_1318.py new file mode 100644 index 00000000..2ad4a528 --- /dev/null +++ b/src/teams/migrations/0025_auto_20180318_1318.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-18 12:18 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0024_populate_shortslugs'), + ] + + operations = [ + migrations.AlterField( + model_name='team', + name='shortslug', + field=models.SlugField(help_text='Abbreviated version of the slug. Used in places like IRC channel names where space is limited'), + ), + ] diff --git a/src/teams/migrations/0026_team_camp.py b/src/teams/migrations/0026_team_camp.py new file mode 100644 index 00000000..577bdd71 --- /dev/null +++ b/src/teams/migrations/0026_team_camp.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-25 13:45 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('camps', '0025_auto_20180318_1250'), + ('teams', '0025_auto_20180318_1318'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='camp', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='teams', to='camps.Camp'), + ), + ] diff --git a/src/teams/migrations/0027_fixup_teams.py b/src/teams/migrations/0027_fixup_teams.py new file mode 100644 index 00000000..879090e0 --- /dev/null +++ b/src/teams/migrations/0027_fixup_teams.py @@ -0,0 +1,60 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-25 13:45 +from __future__ import unicode_literals + +from django.db import migrations + +def add_team_camp(apps, schema_editor): + Team = apps.get_model('teams', 'Team') + TeamArea = apps.get_model('teams', 'TeamArea') + TeamMember = apps.get_model('teams', 'TeamMember') + + for team in Team.objects.all(): + print("camp processing team %s..." % team.name) + team.camp = team.area.camp + team.save() + print("set camp %s for team %s" % (team.camp.slug, team.name)) + +def add_missing_team_responsibles(apps, schema_editor): + Team = apps.get_model('teams', 'Team') + TeamArea = apps.get_model('teams', 'TeamArea') + TeamMember = apps.get_model('teams', 'TeamMember') + + for team in Team.objects.all(): + print("responsible processing team %s..." % team.name) + responsibles = TeamMember.objects.filter(team=team, responsible=True) + if not responsibles: + # get the area responsibles instead + responsibles = team.area.responsible.all() + for responsible in responsibles: + if isinstance(responsible, TeamMember): + # we need User objects instead of TeamMember objects + responsible = responsible.user + try: + membership = TeamMember.objects.get(team=team, user=responsible) + if not membership.responsible: + # already a member of the team, but not responsible + membership.responsible=True + membership.save() + print("%s is now marked as responsible" % membership.user.username) + except TeamMember.DoesNotExist: + # add the responsible as a member of the team + membership = TeamMember.objects.create( + team=team, + user=responsible, + responsible=True, + approved=True + ) + print("new membership has been created for team %s" % team.name) + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0026_team_camp'), + ] + + operations = [ + migrations.RunPython(add_team_camp), + migrations.RunPython(add_missing_team_responsibles), + ] + diff --git a/src/teams/migrations/0028_auto_20180331_1416.py b/src/teams/migrations/0028_auto_20180331_1416.py new file mode 100644 index 00000000..919fe0cf --- /dev/null +++ b/src/teams/migrations/0028_auto_20180331_1416.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-31 12:16 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0027_fixup_teams'), + ] + + operations = [ + migrations.AlterField( + model_name='team', + name='area', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='teams', to='teams.TeamArea'), + ), + ] diff --git a/src/teams/migrations/0029_remove_team_area.py b/src/teams/migrations/0029_remove_team_area.py new file mode 100644 index 00000000..1d86f49e --- /dev/null +++ b/src/teams/migrations/0029_remove_team_area.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-03-31 12:31 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0028_auto_20180331_1416'), + ] + + operations = [ + migrations.RemoveField( + model_name='team', + name='area', + ), + ] diff --git a/src/teams/migrations/0030_auto_20180402_1514.py b/src/teams/migrations/0030_auto_20180402_1514.py new file mode 100644 index 00000000..b7abdabd --- /dev/null +++ b/src/teams/migrations/0030_auto_20180402_1514.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 13:14 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0029_remove_team_area'), + ] + + operations = [ + migrations.AlterField( + model_name='team', + name='irc_channel_name', + field=models.TextField(blank=True, default='', help_text='Team IRC channel. Leave blank to generate channel name automatically, based on camp shortslug and team shortslug.'), + ), + migrations.AlterField( + model_name='team', + name='irc_channel_private', + field=models.BooleanField(default=True, help_text='Check to make the IRC channel secret and +i (private for team members only using an ACL). Leave unchecked to make the IRC channel public and open for everyone.'), + ), + migrations.AlterField( + model_name='team', + name='needs_members', + field=models.BooleanField(default=True, help_text='Check to indicate that this team needs more members'), + ), + ] diff --git a/src/teams/migrations/0031_auto_20180402_2146.py b/src/teams/migrations/0031_auto_20180402_2146.py new file mode 100644 index 00000000..22cef6cb --- /dev/null +++ b/src/teams/migrations/0031_auto_20180402_2146.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 19:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0030_auto_20180402_1514'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='mailing_list_archive_public', + field=models.BooleanField(default=False, help_text='Check if the mailing list archive is public'), + ), + migrations.AddField( + model_name='team', + name='mailing_list_nonmember_posts', + field=models.BooleanField(default=False, help_text='Check if the mailinglist allows non-list-members to post'), + ), + ] diff --git a/src/teams/migrations/0032_auto_20180402_2148.py b/src/teams/migrations/0032_auto_20180402_2148.py new file mode 100644 index 00000000..421e6683 --- /dev/null +++ b/src/teams/migrations/0032_auto_20180402_2148.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 19:48 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0031_auto_20180402_2146'), + ] + + operations = [ + migrations.AlterField( + model_name='team', + name='camp', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='teams', to='camps.Camp'), + ), + ] diff --git a/src/teams/migrations/0033_auto_20180402_2204.py b/src/teams/migrations/0033_auto_20180402_2204.py new file mode 100644 index 00000000..338cc17c --- /dev/null +++ b/src/teams/migrations/0033_auto_20180402_2204.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 20:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0032_auto_20180402_2148'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='teamarea', + unique_together=set([]), + ), + migrations.RemoveField( + model_name='teamarea', + name='camp', + ), + migrations.RemoveField( + model_name='teamarea', + name='responsible', + ), + migrations.DeleteModel( + name='TeamArea', + ), + ] diff --git a/src/teams/migrations/0034_auto_20180402_2334.py b/src/teams/migrations/0034_auto_20180402_2334.py new file mode 100644 index 00000000..eb4a7718 --- /dev/null +++ b/src/teams/migrations/0034_auto_20180402_2334.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 21:34 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0033_auto_20180402_2204'), + ] + + operations = [ + migrations.AlterModelOptions( + name='teammember', + options={'ordering': ['-responsible', 'approved']}, + ), + ] diff --git a/src/teams/migrations/0035_auto_20180402_2344.py b/src/teams/migrations/0035_auto_20180402_2344.py new file mode 100644 index 00000000..78ea2a64 --- /dev/null +++ b/src/teams/migrations/0035_auto_20180402_2344.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-02 21:44 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0034_auto_20180402_2334'), + ] + + operations = [ + migrations.AlterModelOptions( + name='teammember', + options={'ordering': ['-responsible', '-approved']}, + ), + ] diff --git a/src/teams/migrations/0036_auto_20180403_0201.py b/src/teams/migrations/0036_auto_20180403_0201.py new file mode 100644 index 00000000..ad6bede4 --- /dev/null +++ b/src/teams/migrations/0036_auto_20180403_0201.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-03 00:01 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('camps', '0025_auto_20180318_1250'), + ('teams', '0035_auto_20180402_2344'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='team', + unique_together=set([('slug', 'camp'), ('name', 'camp')]), + ), + ] diff --git a/src/teams/migrations/0037_auto_20180408_1416.py b/src/teams/migrations/0037_auto_20180408_1416.py new file mode 100644 index 00000000..6f7f30c9 --- /dev/null +++ b/src/teams/migrations/0037_auto_20180408_1416.py @@ -0,0 +1,42 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2018-04-08 12:16 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0036_auto_20180403_0201'), + ] + + operations = [ + migrations.AddField( + model_name='teammember', + name='irc_channel_acl_ok', + field=models.BooleanField(default=False, help_text='Maintained by the IRC bot, do not edit manually. True if the teammembers NickServ username has been added to the Team IRC channels ACL.'), + ), + migrations.AlterField( + model_name='teammember', + name='approved', + field=models.BooleanField(default=False, help_text='True if this membership is approved. False if not.'), + ), + migrations.AlterField( + model_name='teammember', + name='responsible', + field=models.BooleanField(default=False, help_text='True if this teammember is responsible for this Team. False if not.'), + ), + migrations.AlterField( + model_name='teammember', + name='team', + field=models.ForeignKey(help_text='The Team this membership relates to', on_delete=django.db.models.deletion.PROTECT, to='teams.Team'), + ), + migrations.AlterField( + model_name='teammember', + name='user', + field=models.ForeignKey(help_text='The User object this team membership relates to', on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/src/teams/models.py b/src/teams/models.py index 5599f27a..aaaa550b 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -3,7 +3,6 @@ from django.db.models.signals import post_save from django.dispatch import receiver from django.utils.text import slugify from utils.models import CampRelatedModel -from .email import add_new_membership_email from django.core.exceptions import ValidationError from django.contrib.auth.models import User from django.core.urlresolvers import reverse_lazy @@ -11,123 +10,219 @@ import logging logger = logging.getLogger("bornhack.%s" % __name__) -class TeamArea(CampRelatedModel): - class Meta: - ordering = ['name'] - unique_together = ('name', 'camp') - - name = models.CharField(max_length=255) - description = models.TextField(default='') - camp = models.ForeignKey('camps.Camp', related_name="teamareas", on_delete=models.PROTECT) - responsible = models.ManyToManyField( - 'auth.User', - related_name='responsible_team_areas' - ) - - def __str__(self): - return '{} ({})'.format(self.name, self.camp) - - class Team(CampRelatedModel): - name = models.CharField(max_length=255) - slug = models.SlugField(max_length=255, blank=True) - area = models.ForeignKey( - 'teams.TeamArea', - related_name='teams', - on_delete=models.PROTECT + camp = models.ForeignKey( + 'camps.Camp', + related_name="teams", + on_delete=models.PROTECT, ) + + name = models.CharField( + max_length=255, + help_text='The team name', + ) + + slug = models.SlugField( + max_length=255, + blank=True, + help_text='Url slug for this team. Leave blank to generate based on team name', + ) + + shortslug = models.SlugField( + help_text='Abbreviated version of the slug. Used in places like IRC channel names where space is limited', + ) + description = models.TextField() - needs_members = models.BooleanField(default=True) + + needs_members = models.BooleanField( + default=True, + help_text='Check to indicate that this team needs more members', + ) + members = models.ManyToManyField( 'auth.User', related_name='teams', through='teams.TeamMember' ) - mailing_list = models.EmailField(blank=True) + + # mailing list related fields + mailing_list = models.EmailField( + blank=True + ) + + mailing_list_archive_public = models.BooleanField( + default=False, + help_text='Check if the mailing list archive is public' + ) + + mailing_list_nonmember_posts = models.BooleanField( + default=False, + help_text='Check if the mailinglist allows non-list-members to post' + ) + + # IRC related fields + irc_channel = models.BooleanField( + default=False, + help_text='Check to make the IRC bot join the team IRC channel. Leave unchecked to disable IRC bot functionality for this team entirely.', + ) + + irc_channel_name = models.TextField( + default='', + blank=True, + help_text='Team IRC channel. Leave blank to generate channel name automatically, based on camp shortslug and team shortslug.', + ) + + irc_channel_managed = models.BooleanField( + default=True, + help_text='Check to make the bot manage the team IRC channel. The bot will register the channel with ChanServ if possible, and manage ACLs as needed.', + ) + + irc_channel_private = models.BooleanField( + default=True, + help_text='Check to make the IRC channel secret and +i (private for team members only using an ACL). Leave unchecked to make the IRC channel public and open for everyone.' + ) class Meta: ordering = ['name'] + unique_together = (('name', 'camp'), ('slug', 'camp')) def __str__(self): return '{} ({})'.format(self.name, self.camp) - def validate_unique(self, exclude): - """ - We cannot use unique_together with the camp field because it is a property, - so check uniqueness of team name and slug here instead - """ - # check if this team name is in use under this camp - if self.camp.teams.filter(name=self.name).exists(): - raise ValidationError("This Team name already exists for this Camp") - if self.camp.teams.filter(slug=self.slug).exists(): - raise ValidationError("This Team slug already exists for this Camp") - return True - - @property - def camp(self): - return self.area.camp - def save(self, **kwargs): - if ( - not self.pk or - not self.slug - ): + # generate slug if needed + if not self.pk or not self.slug: slug = slugify(self.name) self.slug = slug + if not self.shortslug: + self.shortslug = self.slug + + # generate IRC channel name if needed + if self.irc_channel and not self.irc_channel_name: + self.irc_channel_name = "#%s-%s" % (self.camp.shortslug, self.shortslug) + super().save(**kwargs) - def memberstatus(self, member): - if member not in self.members.all(): - return "Not member" - else: - if TeamMember.objects.get(team=self, user=member).approved: - return "Member" - else: - return "Membership Pending" + def clean(self): + # make sure the irc channel name is prefixed with a # if it is set + if self.irc_channel_name and self.irc_channel_name[0] != "#": + self.irc_channel_name = "#%s" % self.irc_channel_name + + if self.irc_channel_name: + if Team.objects.filter(irc_channel_name=self.irc_channel_name).exclude(pk=self.pk).exists(): + raise ValidationError("This IRC channel name is already in use") @property - def responsible(self): - if TeamMember.objects.filter(team=self, responsible=True).exists(): - return User.objects.filter( - teammember__team=self, - teammember__responsible=True - ) - else: - return self.area.responsible.all() + def memberships(self): + """ + Returns all TeamMember objects for this team. + Use self.members.all() to get User objects for all members, + or use self.memberships.all() to get TeamMember objects for all members. + """ + return TeamMember.objects.filter( + team=self + ) @property - def anoncount(self): - return self.approvedmembers.filter(user__profile__public_credit_name_approved=False).count() + def approved_members(self): + """ + Returns only approved members (returns User objects, not TeamMember objects) + """ + return self.members.filter( + teammember__approved=True + ) @property - def approvedmembers(self): - return TeamMember.objects.filter(team=self, approved=True) + def unapproved_members(self): + """ + Returns only unapproved members (returns User objects, not TeamMember objects) + """ + return self.members.filter( + teammember__approved=False + ) + + @property + def responsible_members(self): + """ + Return only approved and responsible members + Used to handle permissions for team management + """ + return self.members.filter( + teammember__approved=True, + teammember__responsible=True + ) + + @property + def regular_members(self): + """ + Return only approved and not responsible members with + an approved public_credit_name. + Used on the people pages. + """ + return self.members.filter( + teammember__approved=True, + teammember__responsible=False, + ) + + @property + def unnamed_members(self): + """ + Returns only approved and not responsible members, + without an approved public_credit_name. + """ + return self.members.filter( + teammember__approved=True, + teammember__responsible=False, + profile__public_credit_name_approved=False + ) class TeamMember(CampRelatedModel): - user = models.ForeignKey('auth.User', on_delete=models.PROTECT) - team = models.ForeignKey('teams.Team', on_delete=models.PROTECT) - approved = models.BooleanField(default=False) - responsible = models.BooleanField(default=False) + user = models.ForeignKey( + 'auth.User', + on_delete=models.PROTECT, + help_text="The User object this team membership relates to", + ) + + team = models.ForeignKey( + 'teams.Team', + on_delete=models.PROTECT, + help_text="The Team this membership relates to" + ) + + approved = models.BooleanField( + default=False, + help_text="True if this membership is approved. False if not." + ) + + responsible = models.BooleanField( + default=False, + help_text="True if this teammember is responsible for this Team. False if not." + ) + + irc_channel_acl_ok = models.BooleanField( + default=False, + help_text="Maintained by the IRC bot, do not edit manually. True if the teammembers NickServ username has been added to the Team IRC channels ACL.", + ) + + class Meta: + ordering = ['-responsible', '-approved'] def __str__(self): - return '{} is {} member of team {}'.format( - self.user, '' if self.approved else 'an unapproved', self.team + return '{} is {} {} member of team {}'.format( + self.user, + '' if self.approved else 'an unapproved', + '' if not self.responsible else 'a responsible', + self.team ) @property def camp(self): + """ All CampRelatedModels must have a camp FK or a camp property """ return self.team.camp -@receiver(post_save, sender=TeamMember) -def add_responsible_email(sender, instance, created, **kwargs): - if created: - if not add_new_membership_email(instance): - logger.error('Error adding email to outgoing queue') - - class TeamTask(CampRelatedModel): team = models.ForeignKey( 'teams.Team', @@ -157,14 +252,12 @@ class TeamTask(CampRelatedModel): @property def camp(self): + """ All CampRelatedModels must have a camp FK or a camp property """ return self.team.camp def save(self, **kwargs): + # generate slug if needed if not self.slug: self.slug = slugify(self.name) super().save(**kwargs) - @property - def responsible(self): - return self.team.responsible.all() - diff --git a/src/teams/signal_handlers.py b/src/teams/signal_handlers.py new file mode 100644 index 00000000..c55a2af7 --- /dev/null +++ b/src/teams/signal_handlers.py @@ -0,0 +1,31 @@ +from .email import add_new_membership_email +from ircbot.utils import add_irc_message +from django.conf import settings +import logging +logger = logging.getLogger("bornhack.%s" % __name__) + + +def teammember_saved(sender, instance, created, **kwargs): + """ + This signal handler is called whenever a TeamMember instance is saved + """ + # if this is a new unapproved teammember send a mail to team responsibles + if created and not instance.approved: + # call the mail sending function + if not add_new_membership_email(instance): + logger.error('Error adding email to outgoing queue') + + # if this team has a private and bot-managed IRC channel check if we need to add this member to ACL + if instance.team.irc_channel and instance.team.irc_channel_managed and instance.team.irc_channel_private: + # if this membership is approved and the member has entered a nickserv_username which not yet been added to the ACL + if instance.approved and instance.user.profile.nickserv_username and not instance.irc_channel_acl_ok: + add_team_channel_acl(instance) + +def teammember_deleted(sender, instance, **kwargs): + """ + This signal handler is called whenever a TeamMember instance is deleted + """ + if instance.irc_channel_acl_ok and instance.team.irc_channel and instance.team.irc_channel_managed and instance.team.irc_channel_private: + # TODO: we have an ACL entry that needs to be deleted but the bot does not handle it automatically + add_irc_message(instance.team.irc_channel_name, "Teammember %s removed from team. Please remove NickServ user %s from IRC channel ACL manually!" % (instance.user.get_public_credit_name, instance.user.profile.nickserv_username)) + diff --git a/src/teams/templates/team_detail.html b/src/teams/templates/team_detail.html index 44972367..690dca3b 100644 --- a/src/teams/templates/team_detail.html +++ b/src/teams/templates/team_detail.html @@ -1,27 +1,47 @@ {% extends 'base.html' %} {% load commonmark %} -{% load teams_tags %} {% load bootstrap3 %} +{% load teams_tags %} {% block title %} Team: {{ team.name }} | {{ block.super }} {% endblock %} {% block content %} -
    -

    {{ team.name }} Team

    +

    {{ team.name }} Team Details

    {{ team.description|unsafecommonmark }} - {% if request.user in team.responsible.all %} - Manage Team + +
    + +

    {{ team.name }} Team Communications

    + {{ team.camp.title }} teams primarily use mailing lists and IRC to communicate. The {{ team.name }} team can be contacted in the following ways:

    + +
    Mailing List
    + {% if team.mailing_list and request.user in team.approved_members.all %} +

    The {{ team.name }} Team mailinglist is {{ team.mailing_list }}{% if team.mailing_list_archive_public %}, and the archives are publicly available{% endif %}. You should sign up for the list if you haven't already.

    + {% elif team.mailing_list and team.mailinglist_nonmember_posts %} +

    The {{ team.name }} Team mailinglist is {{ team.mailing_list }}{% if team.mailing_list_archive_public %}, and the archives are publicly available{% endif %}. You do not need to be a member of the list to post to it.

    + {% else %} +

    The {{ team.name }} Team does not have a public mailing list, but it can be contacted through our main email info@bornhack.dk. + {% endif %} + +

    IRC Channel
    + {% if team.irc_channel and request.user in team.approved_members.all %} +

    The {{ team.name }} Team IRC channel is {{ team.irc_channel_name }} on {{ IRCBOT_SERVER_HOSTNAME }}. + {% if team.irc_channel_private %}The channel is not open to the public. Enter your nickserv username in your Profile to get access.{% else %}The IRC channel is open for everyone to join.{% endif %}

    + {% elif team.irc_channel and not team.irc_channel_private %} +

    The {{ team.name }} Team IRC channel is {{ team.irc_channel_name }} on {{ IRCBOT_SERVER_HOSTNAME }} and it is open for everyone to join.

    + {% else %} +

    The {{ team.name }} Team does not have a public IRC channel, but it can be reached through our main IRC channel {{ IRCBOT_PUBLIC_CHANNEL }} on {{ IRCBOT_SERVER_HOSTNAME }}.

    {% endif %}
    -

    Members

    -

    The following {{ team.approvedmembers.count }} people are members of the {{ team.name }} team:

    - +

    {{ team.name }} Team Members

    +

    The following {{ team.approved_members.count }} people {% if team.unapproved_members.count %}(and {{ team.unapproved_members.count }} pending){% endif %} are members of the {{ team.name }} Team:

    +
    - {% for teammember in team.approvedmembers.all %} + {% for teammember in team.memberships.all %} {% endfor %}
    @@ -33,40 +53,39 @@ Team: {{ team.name }} | {{ block.super }}
    - {% if teammember.user.profile.approved_public_credit_name %} - {{ teammember.user.profile.approved_public_credit_name }} - {% else %} - anonymous - {% endif %} + {{ teammember.user.profile.get_public_credit_name }} {% if teammember.user == request.user %}(this is you!){% endif %} - {% if teammember.responsible %}Team Responsible{% else %}Team Member{% endif %} + Team {% if teammember.responsible %}Responsible{% else %}Member{% endif %} + {% if not teammember.approved %}(pending approval){% endif %}
    - {% if request.user in team.members.all %} -

    Your membership status: {% membershipstatus request.user team %}

    - {% endif %} +

    Your membership status: {% membershipstatus user team %}

    {% if request.user in team.members.all %} - Leave Team + Leave Team {% else %} {% if team.needs_members %} - This team is looking for members! Join Team + This team is looking for members! Join Team {% endif %} {% endif %} + {% if request.user in team.responsible_members.all %} + Manage Team + {% endif %} +
    -

    Tasks

    -

    This team is responsible for the following tasks

    - +

    {{ team.name }} Team Tasks

    +

    The {{ team.name }} Team is responsible for the following tasks

    +
    @@ -80,17 +99,17 @@ Team: {{ team.name }} | {{ block.super }} {% endfor %}
    Name{{ task.name }} {{ task.description }} - Details - {% if request.user in team.responsible.all %} - Edit Task + Details + {% if request.user in team.responsible_members.all %} + Edit Task {% endif %}
    - {% if request.user in team.responsible.all %} - Create Task + {% if request.user in team.responsible_members.all %} + Create Task {% endif %}
    diff --git a/src/teams/templates/team_join.html b/src/teams/templates/team_join.html index ac4e8fd0..021bfdd8 100644 --- a/src/teams/templates/team_join.html +++ b/src/teams/templates/team_join.html @@ -7,12 +7,17 @@ Join Team: {{ team.name }} | {{ block.super }} {% block content %} -

    {{ team.name }} Team

    -

    Really join the {{ team.name }} team? You will receive a message when your membership has been approved.

    +

    Really join the {{ team.name }} Team for {{ team.camp.title }}?

    + +

    Your membership will need to be approved by a team responsible. You will receive an email when your membership request has been processed.

    + +

    {% csrf_token %} {{ form }} Cancel
    +

    + {% endblock %} diff --git a/src/teams/templates/team_list.html b/src/teams/templates/team_list.html index c72df85d..d5be8eb2 100644 --- a/src/teams/templates/team_list.html +++ b/src/teams/templates/team_list.html @@ -12,7 +12,7 @@ Teams | {{ block.super }}

    This is a list of the teams for {{ camp.title }}. To join a team just press the Join button, but please put some info in your profile first, so the team responsible has some idea who you are.

    You can also leave a team of course, but please let the team responsible know why :)

    Team memberships need to be approved by a team responsible. You will receive a message when your membership has been approved.

    -

    At {{ camp.title }} all organisers and volunteers buy full tickets like everyone else. In the future our budget may allow for discounts or free tickets for volunteers, but not this year. However: Please let us know if you can't afford a ticket - we will figure something out!

    +

    At {{ camp.title }} all organisers and volunteers buy full tickets like everyone else. At future events our budget may allow for discounts or free tickets for volunteers, but currently it does not.

    We currently have {{ teams.count }} teams for {{ camp.title }}:

    {% if teams %} @@ -42,13 +42,13 @@ Teams | {{ block.super }} @@ -58,30 +58,23 @@ Teams | {{ block.super }} {% if request.user.is_authenticated %} diff --git a/src/teams/templates/team_manage.html b/src/teams/templates/team_manage.html index 57c80348..99002cc0 100644 --- a/src/teams/templates/team_manage.html +++ b/src/teams/templates/team_manage.html @@ -1,6 +1,5 @@ {% extends 'base.html' %} {% load commonmark %} -{% load teams_tags %} {% load bootstrap3 %} {% block title %} @@ -8,81 +7,92 @@ Manage Team: {{ team.name }} | {{ block.super }} {% endblock %} {% block content %} -

    Manage {{ team.name }} Team

    - - {% csrf_token %} +
    +

    Manage {{ team.name }} Team

    +
    +
    + + {% csrf_token %} - {% bootstrap_form form %} + {% bootstrap_form form %} + {% buttons %} + + Cancel  + {% endbuttons %} + +
    +
    +
    - {% buttons %} - - {% endbuttons %} - - -

    {{ team.name }} Team Members

    -{% if team.teammember_set.exists %} -
    - {% for resp in team.responsible.all %} - {{ resp.profile.approved_public_credit_name|default:"Unnamed" }}{% if not forloop.last %},{% endif %}
    + {% for resp in team.responsible_members.all %} + {{ resp.profile.get_public_credit_name }}{% if not forloop.last %},{% endif %}
    {% endfor %}     		- {{ team.approvedmembers.count }}
    + {{ team.members.count }}
    {% if team.needs_members %}(more needed){% endif %}     		- {% membershipstatus request.user team as membership_status %} - {% if membership_status == 'Membership Pending' %} - - {% else %} - {% if membership_status == 'Member' %} - - {% else %} - - {% endif %} - {% endif %} + {% membershipstatus request.user team True %} - {% if request.user in team.members.all %} - Leave - {% else %} - {% if team.needs_members %} - Join - {% endif %} - {% endif %} - - {% if request.user in team.responsible.all %} +
    + Details + {% if request.user in team.responsible_members.all %} Manage {% endif %} + {% if request.user in team.members.all %} + Leave + {% else %} + {% if team.needs_members %} + Join + {% endif %} + {% endif %} +
    {% endif %}
    - - - - - - - - - - - - - {% for membership in team.teammember_set.all %} - - - - - - - - - - {% endfor %} - -
    - Profile - - Name - - Email - - Description - - Public Credit Name - - Membership - - Action -
    - {{ membership.user }} - - {{ membership.user.profile.name }} - - {{ membership.user.profile.email }} - - {{ membership.user.profile.description }} - - {{ membership.user.profile.public_credit_name|default:"N/A" }} - - {% if membership.approved %}member{% else %}pending{% endif %} - - {% if membership.approved %} - Remove - {% else %} - Remove - Approve - {% endif %} -
    -{% else %} -

    No members found!

    -{% endif %} +
    +

    Manage {{ team.name }} Team Members

    +
    + {% if team.teammember_set.exists %} + + + + + + + + + + + + + + {% for membership in team.teammember_set.all %} + + + + + + + + + + {% endfor %} + +
    + Username + + Name + + Email + + Description + + Public Credit Name + + Membership + + Action +
    + {{ membership.user }} + + {{ membership.user.profile.name }} + + {{ membership.user.profile.email }} + + {{ membership.user.profile.description }} + + {{ membership.user.profile.public_credit_name|default:"N/A" }} + {% if membership.user.profile.public_credit_name and not membership.user.profile.public_credit_name_approved %}(name not approved){% endif %} + + {% if membership.approved %}member{% else %}pending{% endif %} + +
    + Remove Member + {% if not membership.approved %} + Approve Member + {% endif %} +
    +
    + {% else %} +

    No members found!

    + {% endif %} +
    +
    {% endblock %} diff --git a/src/teams/templatetags/teams_tags.py b/src/teams/templatetags/teams_tags.py index 090d3d66..47c5d262 100644 --- a/src/teams/templatetags/teams_tags.py +++ b/src/teams/templatetags/teams_tags.py @@ -1,8 +1,24 @@ from django import template - +from django.utils.safestring import mark_safe register = template.Library() - @register.simple_tag -def membershipstatus(user, team): - return team.memberstatus(user) +def membershipstatus(user, team, showicon=False): + if user in team.responsible_members.all(): + text = "Responsible" + icon = "fa-star" + elif user in team.approved_members.all(): + text = "Member" + icon = "fa-thumbs-o-up" + elif user in team.unapproved_members.all(): + text = "Membership pending approval" + icon = "fa-clock-o" + else: + text = "Not member" + icon = "fa-times" + + if showicon: + return mark_safe("" % (icon, text)) + else: + return text + diff --git a/src/teams/views.py b/src/teams/views.py index a5056af8..b16ed10b 100644 --- a/src/teams/views.py +++ b/src/teams/views.py @@ -9,6 +9,7 @@ from django.contrib import messages from django.http import HttpResponseRedirect from django.views.generic.detail import SingleObjectMixin from django.core.urlresolvers import reverse_lazy +from django.conf import settings from profiles.models import Profile @@ -17,9 +18,12 @@ logger = logging.getLogger("bornhack.%s" % __name__) class EnsureTeamResponsibleMixin(object): + """ + Use to make sure request.user is responsible for the team specified by kwargs['team_slug'] + """ def dispatch(self, request, *args, **kwargs): self.team = Team.objects.get(slug=kwargs['team_slug'], camp=self.camp) - if request.user not in self.team.responsible.all(): + if request.user not in self.team.responsible_members.all(): messages.error(request, 'No thanks') return redirect('teams:detail', camp_slug=self.camp.slug, team_slug=self.team.slug) @@ -28,6 +32,22 @@ class EnsureTeamResponsibleMixin(object): ) +class EnsureTeamMemberResponsibleMixin(SingleObjectMixin): + """ + Use to make sure request.user is responsible for the team which TeamMember belongs to + """ + model = TeamMember + + def dispatch(self, request, *args, **kwargs): + if request.user not in self.get_object().team.responsible_members.all(): + messages.error(request, 'No thanks') + return redirect('teams:detail', camp_slug=self.get_object().team.camp.slug, team_slug=self.get_object().team.slug) + + return super().dispatch( + request, *args, **kwargs + ) + + class TeamListView(CampViewMixin, ListView): template_name = "team_list.html" model = Team @@ -40,16 +60,26 @@ class TeamDetailView(CampViewMixin, DetailView): model = Team slug_url_kwarg = 'team_slug' + def get_context_data(self, **kwargs): + context = super(TeamDetailView, self).get_context_data(**kwargs) + context['IRCBOT_SERVER_HOSTNAME'] = settings.IRCBOT_SERVER_HOSTNAME + context['IRCBOT_PUBLIC_CHANNEL'] = settings.IRCBOT_PUBLIC_CHANNEL + return context + class TeamManageView(CampViewMixin, EnsureTeamResponsibleMixin, UpdateView): model = Team template_name = "team_manage.html" - fields = ['description', 'needs_members'] + fields = ['description', 'needs_members', 'irc_channel', 'irc_channel_name', 'irc_channel_managed', 'irc_channel_private'] slug_url_kwarg = 'team_slug' def get_success_url(self): return reverse_lazy('teams:detail', kwargs={'camp_slug': self.camp.slug, 'team_slug': self.get_object().slug}) + def form_valid(self, form): + messages.success(self.request, "Team has been saved") + return super().form_valid(form) + class TeamJoinView(LoginRequiredMixin, CampViewMixin, UpdateView): template_name = "team_join.html" @@ -100,18 +130,6 @@ class TeamLeaveView(LoginRequiredMixin, CampViewMixin, UpdateView): return redirect('teams:list', camp_slug=self.get_object().camp.slug) -class EnsureTeamMemberResponsibleMixin(SingleObjectMixin): - model = TeamMember - - def dispatch(self, request, *args, **kwargs): - if request.user not in self.get_object().team.responsible.all(): - messages.error(request, 'No thanks') - return redirect('teams:detail', camp_slug=self.get_object().team.camp.slug, team_slug=self.get_object().team.slug) - - return super().dispatch( - request, *args, **kwargs - ) - class TeamMemberRemoveView(LoginRequiredMixin, CampViewMixin, EnsureTeamMemberResponsibleMixin, UpdateView): template_name = "teammember_remove.html" diff --git a/src/tickets/signals.py b/src/tickets/signals.py index c7fec0c2..136923c9 100644 --- a/src/tickets/signals.py +++ b/src/tickets/signals.py @@ -5,21 +5,20 @@ from datetime import ( ) from django.db.models import Count from django.utils import timezone +from events.handler import handle_team_event def ticket_changed(sender, instance, created, **kwargs): """ This signal is called every time a ShopTicket is saved """ - # only queue an IRC message when a new ticket is created + # only trigger an event when a new ticket is created if not created: return - # queue an IRC message to the orga channel if defined, - # otherwise for the default channel - target = settings.IRCBOT_CHANNELS['orga'] if 'orga' in settings.IRCBOT_CHANNELS else settings.IRCBOT_CHANNELS['default'] - # get ticket stats from .models import ShopTicket + + # TODO: this is nasty, get the prefix some other way ticket_prefix = "BornHack {}".format(datetime.now().year) stats = ", ".join( @@ -50,19 +49,17 @@ def ticket_changed(sender, instance, created, **kwargs): ).count() # queue the messages - from ircbot.models import OutgoingIrcMessage - OutgoingIrcMessage.objects.create( - target=target, - message="%s sold!" % instance.product.name, - timeout=timezone.now()+timedelta(minutes=10) + handle_team_event( + eventtype='ticket_created', + irc_message="%s sold!" % instance.product.name ) - OutgoingIrcMessage.objects.create( - target=target, - message="Totals: {}, 1day: {}, 1day child: {}".format( + # limit this one to a length of 200 because IRC is nice + handle_team_event( + eventtype='ticket_created', + irc_message="Totals: {}, 1day: {}, 1day child: {}".format( stats, onedaystats, onedaychildstats - )[:200], - timeout=timezone.now()+timedelta(minutes=10) + )[:200] ) diff --git a/src/utils/management/commands/bootstrap-devsite.py b/src/utils/management/commands/bootstrap-devsite.py index 040274de..a3370a3d 100644 --- a/src/utils/management/commands/bootstrap-devsite.py +++ b/src/utils/management/commands/bootstrap-devsite.py @@ -23,9 +23,12 @@ from tickets.models import ( from teams.models import ( Team, TeamTask, - TeamArea, TeamMember ) +from events.models import ( + Type, + Routing +) from django.contrib.auth.models import User from allauth.account.models import EmailAddress from django.utils.text import slugify @@ -44,6 +47,7 @@ class Command(BaseCommand): title='BornHack 2016', tagline='Initial Commit', slug='bornhack-2016', + shortslug='bh2016', buildup=( timezone.datetime(2016, 8, 25, 12, 0, tzinfo=timezone.utc), timezone.datetime(2016, 8, 27, 11, 59, tzinfo=timezone.utc), @@ -63,6 +67,7 @@ class Command(BaseCommand): title='BornHack 2017', tagline='Make Tradition', slug='bornhack-2017', + shortslug='bh2017', buildup=( timezone.datetime(2017, 8, 25, 12, 0, tzinfo=timezone.utc), timezone.datetime(2017, 8, 27, 11, 59, tzinfo=timezone.utc), @@ -82,6 +87,7 @@ class Command(BaseCommand): title='BornHack 2018', tagline='Undecided', slug='bornhack-2018', + shortslug='bh2018', buildup=( timezone.datetime(2018, 8, 25, 12, 0, tzinfo=timezone.utc), timezone.datetime(2018, 8, 27, 11, 59, tzinfo=timezone.utc), @@ -104,6 +110,8 @@ class Command(BaseCommand): ) user1.profile.name = 'John Doe' user1.profile.description = 'one that once was' + user1.profile.public_credit_name = 'PublicDoe' + user1.profile.public_credit_name_approved = True user1.profile.save() email = EmailAddress.objects.create( user=user1, @@ -112,6 +120,7 @@ class Command(BaseCommand): verified=True ) email.set_as_primary() + user2 = User.objects.create_user( username='user2', password='user2', @@ -127,6 +136,7 @@ class Command(BaseCommand): verified=True ) email.set_as_primary() + user3 = User.objects.create_user( username='user3', password='user3', @@ -134,6 +144,7 @@ class Command(BaseCommand): ) user3.profile.name = 'Lorem Ipsum' user3.profile.description = 'just a user' + user3.profile.public_credit_name = 'Lorem Ipsum' user3.profile.save() email = EmailAddress.objects.create( user=user3, @@ -142,6 +153,7 @@ class Command(BaseCommand): verified=True ) email.set_as_primary() + user4 = User.objects.create_user( username='user4', password='user4', @@ -149,6 +161,8 @@ class Command(BaseCommand): ) user4.profile.name = 'Ethe Reum' user4.profile.description = 'I prefer doge' + user4.profile.public_credit_name = 'Dogefan' + user4.profile.public_credit_name_approved = True user4.profile.save() email = EmailAddress.objects.create( user=user4, @@ -157,6 +171,96 @@ class Command(BaseCommand): verified=True ) email.set_as_primary() + + user5 = User.objects.create_user( + username='user5', + password='user5', + is_staff=True + ) + user5.profile.name = 'Pyra Mid' + user5.profile.description = 'This is not a scam' + user5.profile.public_credit_name = 'Ponziarne' + user5.profile.public_credit_name_approved = True + user5.profile.save() + email = EmailAddress.objects.create( + user=user5, + email='user5@example.com', + primary=False, + verified=True + ) + email.set_as_primary() + + user6 = User.objects.create_user( + username='user6', + password='user6', + is_staff=True + ) + user6.profile.name = 'User Number 6' + user6.profile.description = 'some description' + user6.profile.public_credit_name = 'bruger 6' + user6.profile.public_credit_name_approved = True + user6.profile.save() + email = EmailAddress.objects.create( + user=user6, + email='user6@example.com', + primary=False, + verified=True + ) + email.set_as_primary() + + user7 = User.objects.create_user( + username='user7', + password='user7', + is_staff=True + ) + user7.profile.name = 'Assembly Hacker' + user7.profile.description = 'Low level is best level' + user7.profile.public_credit_name = 'asm' + user7.profile.public_credit_name_approved = True + user7.profile.save() + email = EmailAddress.objects.create( + user=user7, + email='user7@example.com', + primary=False, + verified=True + ) + email.set_as_primary() + + user8 = User.objects.create_user( + username='user8', + password='user8', + is_staff=True + ) + user8.profile.name = 'TCL' + user8.profile.description = 'Expect me' + user8.profile.public_credit_name = 'TCL lover' + user8.profile.public_credit_name_approved = True + user8.profile.save() + email = EmailAddress.objects.create( + user=user8, + email='user8@example.com', + primary=False, + verified=True + ) + email.set_as_primary() + + user9 = User.objects.create_user( + username='user9', + password='user9', + is_staff=True + ) + user9.profile.name = 'John Windows' + user9.profile.description = 'Microsoft is best soft' + user9.profile.public_credit_name = 'msboy' + user9.profile.save() + email = EmailAddress.objects.create( + user=user9, + email='user9@example.com', + primary=False, + verified=True + ) + email.set_as_primary() + admin = User.objects.create_superuser( username='admin', email='admin@example.com', @@ -1373,44 +1477,21 @@ Please note that sleeping in the parking lot is not permitted. If you want to sl description='This village is representing TheCamp.dk, an annual danish tech camp held in July. The official subjects for this event is open source software, network and security. In reality we are interested in anything from computers to illumination soap bubbles and irish coffee' ) - self.output("Creating team areas for {}...".format(year)) - pr_area = TeamArea.objects.create( - name='PR', - description="The Public Relations area covers website, social media and marketing related tasks.", - camp=camp - ) - content_area = TeamArea.objects.create( - name='Content', - description="The Content area handles talks, A/V and photos.", - camp=camp - ) - infrastructure_area = TeamArea.objects.create( - name='Infrastructure', - description="The Infrastructure area covers network/NOC, power, villages, CERT, logistics.", - camp=camp - ) - bar_area = TeamArea.objects.create( - name='Bar', - description="The Bar area covers building and running the IRL bar, DJ booth and related tasks.", - camp=camp - ) - - self.output("Setting teamarea responsibles for {}...".format(year)) - pr_area.responsible.add(user2) - content_area.responsible.add(user2, user3) - infrastructure_area.responsible.add(user3, user4) - bar_area.responsible.add(user4) - self.output("Creating teams for {}...".format(year)) + orga_team = Team.objects.create( + name="Orga", + description="The Orga team are the main organisers. All tasks are Orga responsibility until they are delegated to another team", + camp=camp + ) noc_team = Team.objects.create( name="NOC", - description="The NOC team is in charge of establishing and running a network onsite.".format(year), - area=infrastructure_area, + description="The NOC team is in charge of establishing and running a network onsite.", + camp=camp ) bar_team = Team.objects.create( name="Bar", description="The Bar team plans, builds and run the IRL bar!", - area=bar_area + camp=camp ) self.output("Creating TeamTasks for {}...".format(year)) @@ -1461,29 +1542,93 @@ Please note that sleeping in the parking lot is not permitted. If you want to sl ) self.output("Setting team members for {}...".format(year)) + # noc team TeamMember.objects.create( team=noc_team, user=user4, - approved=True + approved=True, + responsible=True ) TeamMember.objects.create( team=noc_team, - user=user1 + user=user1, + approved=True, ) + TeamMember.objects.create( + team=noc_team, + user=user5, + approved=True, + ) + TeamMember.objects.create( + team=noc_team, + user=user6, + ) + + # bar team TeamMember.objects.create( team=bar_team, user=user1, - approved=True + approved=True, + responsible=True ) TeamMember.objects.create( team=bar_team, user=user3, - approved=True + approved=True, + responsible=True ) TeamMember.objects.create( team=bar_team, - user=user2 + user=user2, + approved=True, ) + TeamMember.objects.create( + team=bar_team, + user=user7, + approved=True, + ) + TeamMember.objects.create( + team=bar_team, + user=user8, + ) + + # orga team + TeamMember.objects.create( + team=orga_team, + user=user1, + approved=True, + responsible=True + ) + TeamMember.objects.create( + team=orga_team, + user=user3, + approved=True, + responsible=True + ) + TeamMember.objects.create( + team=orga_team, + user=user8, + approved=True, + ) + TeamMember.objects.create( + team=orga_team, + user=user9, + approved=True, + ) + TeamMember.objects.create( + team=orga_team, + user=user4, + ) + + self.output("Adding event routing...") + Routing.objects.create( + team=orga_team, + eventtype=Type.objects.get(name="public_credit_name_changed") + ) + Routing.objects.create( + team=orga_team, + eventtype=Type.objects.get(name="ticket_created") + ) self.output("marking 2016 as read_only...") From 9b8e72a3c0435335bb62ac8706b71b9c2857dfbc Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Mon, 9 Apr 2018 23:24:36 +0200 Subject: [PATCH 062/351] remove debug print and handle creation cases in signal handler --- src/profiles/signal_handlers.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/profiles/signal_handlers.py b/src/profiles/signal_handlers.py index 5fb38c6d..67802844 100644 --- a/src/profiles/signal_handlers.py +++ b/src/profiles/signal_handlers.py @@ -25,7 +25,6 @@ def profile_pre_save(sender, instance, **kwargs): original = sender.objects.get(pk=instance.pk) except sender.DoesNotExist: original = None - logger.debug("inside profile_pre_save with instance.nickserv_username=%s and original.nickserv_username=%s" % (instance.nickserv_username, original.nickserv_username)) public_credit_name_changed(instance, original) nickserv_username_changed(instance, original) @@ -35,11 +34,11 @@ def public_credit_name_changed(instance, original): """ Checks if a users public_credit_name has been changed, and triggers a public_credit_name_changed event if so """ - if original.public_credit_name == instance.public_credit_name: + if original and original.public_credit_name == instance.public_credit_name: # public_credit_name has not been changed return - if original.public_credit_name and not original.public_credit_name_approved: + if original and original.public_credit_name and not original.public_credit_name_approved: # the original.public_credit_name was not approved, no need to notify again return @@ -61,7 +60,7 @@ def nickserv_username_changed(instance, original): Check if profile.nickserv_username was changed, and uncheck irc_channel_acl_ok if so This will be picked up by the IRC bot and fixed as needed """ - if instance.nickserv_username and instance.nickserv_username != original.nickserv_username: + if instance.nickserv_username and original and instance.nickserv_username != original.nickserv_username: logger.debug("profile.nickserv_username changed for user %s, setting irc_channel_acl_ok=False" % instance.user.username) # find team memberships for this user From 9f4df30b50f562be0ced7188b400288be6175c15 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Tue, 10 Apr 2018 17:27:44 +0200 Subject: [PATCH 063/351] tell the user to register nickserv account before entering it here --- src/profiles/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/profiles/models.py b/src/profiles/models.py index e4e8f068..1d95e769 100644 --- a/src/profiles/models.py +++ b/src/profiles/models.py @@ -48,7 +48,7 @@ class Profile(CreatedUpdatedModel, UUIDModel): nickserv_username = models.CharField( blank=True, max_length=50, - help_text='Your NickServ username is used to manage team IRC channel access lists.', + help_text='Your NickServ username is used to manage team IRC channel access lists. Make sure you register with NickServ _before_ you enter the username here!', ) @property From 2ed19d22dc4d83a1a88beb223bc180169d7a6328 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Tue, 10 Apr 2018 17:31:22 +0200 Subject: [PATCH 064/351] add method to setup a non-private channel, to be used later when we handle switching channels between private and public --- src/ircbot/irc3module.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ircbot/irc3module.py b/src/ircbot/irc3module.py index e8c461a3..d8b421a0 100644 --- a/src/ircbot/irc3module.py +++ b/src/ircbot/irc3module.py @@ -218,6 +218,17 @@ class Plugin(object): membership.save() + @irc3.extend + def setup_public_channel(self, team): + """ + Configures a public team IRC channel (by unsetting SECURE and RESTRICTED modes used by private channels and setting mlock back to the default +nt-lk) + """ + # basic private channel modes + self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s mlock +nt-lk" % team.irc_channel_name) + self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s SECURE off" % team.irc_channel_name) + self.bot.privmsg(settings.IRCBOT_CHANSERV_MASK, "SET %s RESTRICTED off" % team.irc_channel_name) + + @irc3.extend def add_user_to_team_channel_acl(self, username, channel): """ From 547b594c8d24a8d6f529c35c07f9ad87e336ce45 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Wed, 11 Apr 2018 10:21:09 +0200 Subject: [PATCH 065/351] add a Django Admin link to the menu if the logged-in user is staff --- src/templates/base.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/templates/base.html b/src/templates/base.html index adb2d321..e6639542 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -74,6 +74,7 @@
  • People
    • {% if user.is_authenticated and user.is_staff %}
  • Backoffice
    • +
  • Django Admin
    • {% endif %} @@ -91,20 +91,10 @@ {% if camp %}
    - {{ camp.title }} - Info - Program - Villages - Sponsors - Teams + {% include 'includes/menuitems.html' %}

    diff --git a/src/templates/includes/menuitems.html b/src/templates/includes/menuitems.html new file mode 100644 index 00000000..49dd27fd --- /dev/null +++ b/src/templates/includes/menuitems.html @@ -0,0 +1,8 @@ +{% load menubutton %} + {{ camp.title }} + Info + Program + Villages + Sponsors + Teams + diff --git a/src/utils/mixins.py b/src/utils/mixins.py new file mode 100644 index 00000000..592c343b --- /dev/null +++ b/src/utils/mixins.py @@ -0,0 +1,17 @@ +from django.contrib import messages +from django.http import HttpResponseForbidden + + +class StaffMemberRequiredMixin(object): + """ + A CBV mixin for when a view should only be permitted for staff users + """ + def dispatch(self, request, *args, **kwargs): + # only permit staff users + if not request.user.is_staff: + messages.error(request, "No thanks") + return HttpResponseForbidden() + + # continue with the request + return super().dispatch(request, *args, **kwargs) + diff --git a/src/utils/templatetags/bornhack.py b/src/utils/templatetags/bornhack.py new file mode 100644 index 00000000..b2503f6c --- /dev/null +++ b/src/utils/templatetags/bornhack.py @@ -0,0 +1,16 @@ +from decimal import Decimal + +from django import template +from django.utils.safestring import mark_safe + +register = template.Library() + + +@register.filter() +def truefalseicon(value): + """ A templatetag to show a green checkbox or red x depending on True/False value """ + if value: + return mark_safe("") + else: + return mark_safe("") + diff --git a/src/utils/templatetags/commonmark.py b/src/utils/templatetags/commonmark.py index f2410bf4..0379a60b 100644 --- a/src/utils/templatetags/commonmark.py +++ b/src/utils/templatetags/commonmark.py @@ -9,8 +9,8 @@ register = template.Library() @register.filter @stringfilter -def commonmark(value): - """Returns HTML given some CommonMark Markdown. Does not clean HTML, not for use with untrusted input.""" +def trustedcommonmark(value): + """Returns HTML given some CommonMark Markdown. Also allows real HTML, so do not use this with untrusted input.""" parser = CommonMark.Parser() renderer = CommonMark.HtmlRenderer() ast = parser.parse(value) @@ -18,8 +18,8 @@ def commonmark(value): @register.filter @stringfilter -def unsafecommonmark(value): - """Returns HTML given some CommonMark Markdown. Cleans HTML from input using bleach, suitable for use with untrusted input.""" +def untrustedcommonmark(value): + """Returns HTML given some CommonMark Markdown. Cleans actual HTML from input using bleach, suitable for use with untrusted input.""" parser = CommonMark.Parser() renderer = CommonMark.HtmlRenderer() ast = parser.parse(bleach.clean(value)) diff --git a/src/villages/templates/village_detail.html b/src/villages/templates/village_detail.html index 0a49e09e..d7453b46 100644 --- a/src/villages/templates/village_detail.html +++ b/src/villages/templates/village_detail.html @@ -9,7 +9,7 @@ Village: {{ village.name }} | {{ block.super }}

    {{ village.name }}

    -{{ village.description|unsafecommonmark }} +{{ village.description|untrustedcommonmark }} {% if user == village.contact %}
    diff --git a/src/villages/templates/village_list.html b/src/villages/templates/village_list.html index fcdda927..b8e93c1c 100644 --- a/src/villages/templates/village_list.html +++ b/src/villages/templates/village_list.html @@ -39,7 +39,7 @@ Villages | {{ block.super }} - {{ village.description|unsafecommonmark|truncatewords:50 }} + {{ village.description|untrustedcommonmark|truncatewords:50 }} From bff5bb292e2001bd54627a7c93148c181b97c73d Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 3 Jun 2018 16:29:28 +0200 Subject: [PATCH 144/351] add debate as eventtype in bootstrap-devsite, and fix commonmark templatefilter a few places I missed --- src/info/templates/info.html | 2 +- src/news/templates/news_detail.html | 2 +- src/news/templates/news_index.html | 2 +- src/program/templates/schedule_event_detail.html | 2 +- src/program/templates/speaker_detail.html | 4 ++-- src/shop/templates/product_detail.html | 2 +- src/teams/templates/task_detail.html | 2 +- src/utils/management/commands/bootstrap-devsite.py | 11 +++++++++++ 8 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/info/templates/info.html b/src/info/templates/info.html index 4441db43..baab8900 100644 --- a/src/info/templates/info.html +++ b/src/info/templates/info.html @@ -57,7 +57,7 @@ Info | {{ block.super }}
    -

    {{ item.body|commonmark }}

    +

    {{ item.body|untrustedcommonmark }}

    {% endfor %} diff --git a/src/news/templates/news_detail.html b/src/news/templates/news_detail.html index 8cc0c953..3f800508 100644 --- a/src/news/templates/news_detail.html +++ b/src/news/templates/news_detail.html @@ -14,5 +14,5 @@ {% endif %}

    {{ news_item.title }} {{ news_item.published_at|date:"Y-m-d" }}

    - {{ news_item.content|commonmark }} + {{ news_item.content|trustedcommonmark }} {% endblock %} diff --git a/src/news/templates/news_index.html b/src/news/templates/news_index.html index 6b2760bb..2a7db69b 100644 --- a/src/news/templates/news_index.html +++ b/src/news/templates/news_index.html @@ -13,7 +13,7 @@ News | {{ block.super }}

    {{ item.title }} {{ item.published_at|date:"Y-m-d" }}

    - {{ item.content|commonmark }} + {{ item.content|trustedcommonmark }} {% if not forloop.last %}
    {% endif %} diff --git a/src/program/templates/schedule_event_detail.html b/src/program/templates/schedule_event_detail.html index dd580e80..09f68709 100644 --- a/src/program/templates/schedule_event_detail.html +++ b/src/program/templates/schedule_event_detail.html @@ -17,7 +17,7 @@
    {{ event.event_type.name }} {{ event.title }}

    - {{ event.abstract|commonmark }} + {{ event.abstract|untrustedcommonmark }}

    diff --git a/src/program/templates/speaker_detail.html b/src/program/templates/speaker_detail.html index 5c9798a6..18447a81 100644 --- a/src/program/templates/speaker_detail.html +++ b/src/program/templates/speaker_detail.html @@ -7,7 +7,7 @@
    -{{ speaker.biography|commonmark }} +{{ speaker.biography|untrustedcommonmark }}
    @@ -21,7 +21,7 @@ {{ event.title }} - {{ event.abstract|commonmark }} + {{ event.abstract|untrustedcommonmark }}

    Instances

      diff --git a/src/shop/templates/product_detail.html b/src/shop/templates/product_detail.html index e73081c4..a92f7516 100644 --- a/src/shop/templates/product_detail.html +++ b/src/shop/templates/product_detail.html @@ -13,7 +13,7 @@

      {{ product.name }}

      - {{ product.description|commonmark }} + {{ product.description|untrustedcommonmark }}
      diff --git a/src/teams/templates/task_detail.html b/src/teams/templates/task_detail.html index 5ac2b2b7..69525bbe 100644 --- a/src/teams/templates/task_detail.html +++ b/src/teams/templates/task_detail.html @@ -8,7 +8,7 @@ {% block content %}

      Task: {{ task.name }}

      -
      {{ task.description|commonmark }}
      +
      {{ task.description|untrustedcommonmark }}
      This task belongs to the {{ task.team.name }} Team
      diff --git a/src/utils/management/commands/bootstrap-devsite.py b/src/utils/management/commands/bootstrap-devsite.py index 2c4bbbd6..59c43321 100644 --- a/src/utils/management/commands/bootstrap-devsite.py +++ b/src/utils/management/commands/bootstrap-devsite.py @@ -326,6 +326,17 @@ class Command(BaseCommand): host_title='Speaker', ) + debate = EventType.objects.create( + name='Debate', + slug='debate', + color='#F734C3', + light_text=True, + description='A panel debate with invited guests', + icon='users', + host_title='Guest', + public=True, + ) + facility = EventType.objects.create( name='Facilities', slug='facilities', From 64f4eebac3d653b92def15343279e1b00e3033e6 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 3 Jun 2018 17:16:00 +0200 Subject: [PATCH 145/351] handle cached_property as well as regular properties in our camp filtering on @property in CampViewMixin --- src/camps/mixins.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/camps/mixins.py b/src/camps/mixins.py index 59503c90..b35066d5 100644 --- a/src/camps/mixins.py +++ b/src/camps/mixins.py @@ -1,5 +1,6 @@ from camps.models import Camp from django.shortcuts import get_object_or_404 +from django.utils.functional import cached_property class CampViewMixin(object): @@ -20,8 +21,8 @@ class CampViewMixin(object): if field.name == "camp" and field.related_model._meta.label == "camps.Camp": return queryset.filter(camp=self.camp) - # check if we have a camp property, filter if so - if hasattr(queryset[0], 'camp') and isinstance(getattr(type(queryset[0]), 'camp', None), property): + # check if we have a camp property or cached_property, filter if so + if hasattr(queryset[0], 'camp') and (isinstance(getattr(type(queryset[0]), 'camp', None), property) or isinstance(getattr(type(queryset[0]), 'camp', None), cached_property)): for item in queryset: if item.camp != self.camp: queryset = queryset.exclude(pk=item.pk) From 3fb2f44e940e1bbe3585c9a3f26d28ab625aaccd Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 3 Jun 2018 17:16:35 +0200 Subject: [PATCH 146/351] add eventtype icons to event list and event detail views in program --- src/program/models.py | 2 +- src/program/templates/event_list.html | 6 +++--- src/program/templates/schedule_event_detail.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/program/models.py b/src/program/models.py index 5917e014..c67fe224 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -2,8 +2,8 @@ import uuid import os import icalendar import logging - from datetime import timedelta + from django.contrib.postgres.fields import DateTimeRangeField, ArrayField from django.contrib import messages from django.db import models diff --git a/src/program/templates/event_list.html b/src/program/templates/event_list.html index fdec3328..d8f90eb6 100644 --- a/src/program/templates/event_list.html +++ b/src/program/templates/event_list.html @@ -20,9 +20,9 @@ {% for event in event_list %} {% if event.event_type.include_in_event_list %} - - - {{ event.event_type.name }} + + + {{ event.event_type.name }} diff --git a/src/program/templates/schedule_event_detail.html b/src/program/templates/schedule_event_detail.html index 09f68709..11f05a80 100644 --- a/src/program/templates/schedule_event_detail.html +++ b/src/program/templates/schedule_event_detail.html @@ -14,7 +14,7 @@
      -
      {{ event.event_type.name }} {{ event.title }}
      +
      {{ event.title }}

      {{ event.abstract|untrustedcommonmark }} From 9c9edff4f709baa15630a074a5a5db6e6c8a93c2 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 3 Jun 2018 17:20:45 +0200 Subject: [PATCH 147/351] check for empty duration when cleaning duration field --- src/program/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/program/forms.py b/src/program/forms.py index e13d28be..e5d8af16 100644 --- a/src/program/forms.py +++ b/src/program/forms.py @@ -29,7 +29,7 @@ class BaseEventProposalForm(forms.ModelForm): def clean_duration(self): duration = self.cleaned_data['duration'] - if duration < 60 or duration > 180: + if not duration or duration < 60 or duration > 180: raise forms.ValidationError("Please keep duration between 60 and 180 minutes.") return duration From 3180ec457d93058e7d423c33306aff6efe6f22dc Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 3 Jun 2018 18:33:51 +0200 Subject: [PATCH 148/351] switch backoffice to use the regular CampViewMixin --- src/backoffice/mixins.py | 29 ++++----------- src/backoffice/templates/badge_handout.html | 2 +- .../templates/{camp_index.html => index.html} | 10 +++--- .../templates/manage_eventproposal.html | 4 +-- .../templates/manage_proposals.html | 4 +-- .../templates/manage_speakerproposal.html | 4 +-- src/backoffice/templates/product_handout.html | 2 +- src/backoffice/templates/ticket_checkin.html | 2 +- src/backoffice/urls.py | 21 +++++------ src/backoffice/views.py | 35 ++++--------------- src/bornhack/urls.py | 9 +++-- src/templates/base.html | 3 +- src/templates/includes/menuitems.html | 3 ++ 13 files changed, 44 insertions(+), 84 deletions(-) rename src/backoffice/templates/{camp_index.html => index.html} (71%) diff --git a/src/backoffice/mixins.py b/src/backoffice/mixins.py index 1cef5314..6ad36dfd 100644 --- a/src/backoffice/mixins.py +++ b/src/backoffice/mixins.py @@ -1,25 +1,10 @@ -from django.http import HttpResponseForbidden -from django.shortcuts import get_object_or_404 -from django.contrib import messages -from camps.models import Camp +from camps.mixins import CampViewMixin +from utils.mixins import StaffMemberRequiredMixin -class BackofficeViewMixin(object): - def dispatch(self, request, *args, **kwargs): - # only permit staff users - if not request.user.is_staff: - messages.error(request, "No thanks") - return HttpResponseForbidden() - - # get camp from url kwarg - self.bocamp = get_object_or_404(Camp, slug=kwargs['bocamp_slug']) - - # continue with the request - return super().dispatch(request, *args, **kwargs) - - def get_context_data(self, **kwargs): - """ Add Camp to template context """ - context = super().get_context_data(**kwargs) - context['bocamp'] = self.bocamp - return context +class BackofficeViewMixin(CampViewMixin, StaffMemberRequiredMixin): + """ + Mixin used by all backoffice views. For now just uses CampViewMixin and StaffMemberRequiredMixin. + """ + pass diff --git a/src/backoffice/templates/badge_handout.html b/src/backoffice/templates/badge_handout.html index 3954bd47..27d6be4f 100644 --- a/src/backoffice/templates/badge_handout.html +++ b/src/backoffice/templates/badge_handout.html @@ -10,7 +10,7 @@

      Hand Out Badges

      - Use this view to hand out badges to participants. Use the search field to search for username, email, products, order ID, ticket UUID, etc. To check in participants go to the Ticket Checkin view instead. To hand out merchandise and other products go to the Hand Out Products view instead. + Use this view to hand out badges to participants. Use the search field to search for username, email, products, order ID, ticket UUID, etc. To check in participants go to the Ticket Checkin view instead. To hand out merchandise and other products go to the Hand Out Products view instead.
      This table shows all (Shop|Discount|Sponsor)Tickets which are badge_handed_out=False. Tickets must be checked in before they are shown in this list. diff --git a/src/backoffice/templates/camp_index.html b/src/backoffice/templates/index.html similarity index 71% rename from src/backoffice/templates/camp_index.html rename to src/backoffice/templates/index.html index 2afc6ff7..bc9710cc 100644 --- a/src/backoffice/templates/camp_index.html +++ b/src/backoffice/templates/index.html @@ -14,23 +14,23 @@

      - +

      Hand Out Products

      Use this view to mark products such as merchandise, cabins, fridges and so on as handed out.

       - +

      Check-In Tickets

      Use this view to check-in tickets when participants arrive.

       - +

      Hand Out Badges

      Use this view to mark badges as handed out.

       - +

      Approve Public Credit Names

      Use this view to check and approve users Public Credit Names

       - +

      Manage Proposals

      Use this view to manage SpeakerProposals and EventProposals

       diff --git a/src/backoffice/templates/manage_eventproposal.html b/src/backoffice/templates/manage_eventproposal.html index 47690152..4fcb51b7 100644 --- a/src/backoffice/templates/manage_eventproposal.html +++ b/src/backoffice/templates/manage_eventproposal.html @@ -3,13 +3,13 @@ {% block content %}

      Manage {{ form.instance.event_type.name }} Proposal

      -{% include 'includes/eventproposal_detail.html' with camp=bocamp %} +{% include 'includes/eventproposal_detail.html' with camp=camp %}
      {% csrf_token %} {% bootstrap_form form %} {% bootstrap_button " Approve" button_type="submit" button_class="btn-success" name="approve" %} {% bootstrap_button " Reject" button_type="submit" button_class="btn-danger" name="reject" %} - Cancel + Cancel
      {% endblock content %} diff --git a/src/backoffice/templates/manage_proposals.html b/src/backoffice/templates/manage_proposals.html index fbb81470..4c28b64d 100644 --- a/src/backoffice/templates/manage_proposals.html +++ b/src/backoffice/templates/manage_proposals.html @@ -35,7 +35,7 @@ {{ proposal.needs_oneday_ticket|truefalseicon }} {{ proposal.event|truefalseicon }} {{ proposal.user }} - Manage + Manage {% endfor %} @@ -63,7 +63,7 @@ {% for speaker in proposal.speakers.all %} {% endfor %} {{ proposal.speaker|truefalseicon }} {{ proposal.user }} - Manage + Manage {% endfor %} diff --git a/src/backoffice/templates/manage_speakerproposal.html b/src/backoffice/templates/manage_speakerproposal.html index 89f9e0a8..ab545463 100644 --- a/src/backoffice/templates/manage_speakerproposal.html +++ b/src/backoffice/templates/manage_speakerproposal.html @@ -3,13 +3,13 @@ {% block content %}

      Manage Speaker Proposal

      -{% include 'includes/speakerproposal_detail.html' with camp=bocamp %} +{% include 'includes/speakerproposal_detail.html' with camp=camp %}
      {% csrf_token %} {% bootstrap_form form %} {% bootstrap_button " Approve" button_type="submit" button_class="btn-success" name="approve" %} {% bootstrap_button " Reject" button_type="submit" button_class="btn-danger" name="reject" %} - Cancel + Cancel
      {% endblock content %} diff --git a/src/backoffice/templates/product_handout.html b/src/backoffice/templates/product_handout.html index 875c5a80..8496a8a5 100644 --- a/src/backoffice/templates/product_handout.html +++ b/src/backoffice/templates/product_handout.html @@ -10,7 +10,7 @@

      Hand Out Products

      - Use this view to hand out products to participants. Use the search field to search for username, email, products, order ID etc. To check in participants go to the Ticket Checkin view instead. To hand out badges go to the Badge Handout view instead. + Use this view to hand out products to participants. Use the search field to search for username, email, products, order ID etc. To check in participants go to the Ticket Checkin view instead. To hand out badges go to the Badge Handout view instead.
      This table shows all OrderProductRelations which are handed_out=False (not including unpaid, cancelled and refunded orders). The table is initally sorted by order ID but the sorting can be changed by clicking the column headlines (if javascript is enabled). diff --git a/src/backoffice/templates/ticket_checkin.html b/src/backoffice/templates/ticket_checkin.html index 5f6cfc37..177f7c1b 100644 --- a/src/backoffice/templates/ticket_checkin.html +++ b/src/backoffice/templates/ticket_checkin.html @@ -10,7 +10,7 @@

      Ticket Check-In

      - Use this view to check in participants. Use the search field to search for username, email, products, order ID, ticket UUID, etc. To hand out badges go to the Badge Handout view instead. To hand out other products go to the Hand Out Products view instead. + Use this view to check in participants. Use the search field to search for username, email, products, order ID, ticket UUID, etc. To hand out badges go to the Badge Handout view instead. To hand out other products go to the Hand Out Products view instead.
      This table shows all (Shop|Discount|Sponsor)Tickets which are checked_in=False. diff --git a/src/backoffice/urls.py b/src/backoffice/urls.py index 2361a240..58da109d 100644 --- a/src/backoffice/urls.py +++ b/src/backoffice/urls.py @@ -5,18 +5,15 @@ from .views import * app_name = 'backoffice' urlpatterns = [ - path('', CampSelectView.as_view(), name='camp_select'), - path('/', include([ - path('', CampIndexView.as_view(), name='camp_index'), - path('product_handout/', ProductHandoutView.as_view(), name='product_handout'), - path('badge_handout/', BadgeHandoutView.as_view(), name='badge_handout'), - path('ticket_checkin/', TicketCheckinView.as_view(), name='ticket_checkin'), - path('public_credit_names/', ApproveNamesView.as_view(), name='public_credit_names'), - path('manage_proposals/', include([ - path('', ManageProposalsView.as_view(), name='manage_proposals'), - path('speakers//', SpeakerProposalManageView.as_view(), name='speakerproposal_manage'), - path('events//', EventProposalManageView.as_view(), name='eventproposal_manage'), - ])), + path('', BackofficeIndexView.as_view(), name='index'), + path('product_handout/', ProductHandoutView.as_view(), name='product_handout'), + path('badge_handout/', BadgeHandoutView.as_view(), name='badge_handout'), + path('ticket_checkin/', TicketCheckinView.as_view(), name='ticket_checkin'), + path('public_credit_names/', ApproveNamesView.as_view(), name='public_credit_names'), + path('manage_proposals/', include([ + path('', ManageProposalsView.as_view(), name='manage_proposals'), + path('speakers//', SpeakerProposalManageView.as_view(), name='speakerproposal_manage'), + path('events//', EventProposalManageView.as_view(), name='eventproposal_manage'), ])), ] diff --git a/src/backoffice/views.py b/src/backoffice/views.py index 2ac2efc3..7f057728 100644 --- a/src/backoffice/views.py +++ b/src/backoffice/views.py @@ -12,7 +12,7 @@ from shop.models import OrderProductRelation from tickets.models import ShopTicket, SponsorTicket, DiscountTicket from profiles.models import Profile from camps.models import Camp -from utils.mixins import StaffMemberRequiredMixin +from camps.mixins import CampViewMixin from program.models import SpeakerProposal, EventProposal from .mixins import BackofficeViewMixin @@ -20,31 +20,8 @@ from .mixins import BackofficeViewMixin logger = logging.getLogger("bornhack.%s" % __name__) -class CampSelectView(StaffMemberRequiredMixin, ListView): - model = Camp - template_name = "camp_select.html" - - def get_queryset(self): - """ - Filter away camps that are not writeable, since they are not interesting from a backoffice perspective - """ - return super().get_queryset().filter(read_only=False) - - def get(self, request, *args, **kwargs): - """ - If we only have one writable Camp redirect directly to it rather than show a 1 item list - """ - if self.get_queryset().count() == 1: - return redirect( - reverse('backoffice:camp_index', kwargs={ - 'bocamp_slug': self.get_queryset().first().slug - }) - ) - return super().get(request, *args, **kwargs) - - -class CampIndexView(BackofficeViewMixin, TemplateView): - template_name = "camp_index.html" +class BackofficeIndexView(BackofficeViewMixin, TemplateView): + template_name = "index.html" class ProductHandoutView(BackofficeViewMixin, ListView): @@ -96,14 +73,14 @@ class ManageProposalsView(BackofficeViewMixin, ListView): def get_queryset(self, **kwargs): return SpeakerProposal.objects.filter( - camp=self.bocamp, + camp=self.camp, proposal_status=SpeakerProposal.PROPOSAL_PENDING ) def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context['eventproposals'] = EventProposal.objects.filter( - track__camp=self.bocamp, + track__camp=self.camp, proposal_status=EventProposal.PROPOSAL_PENDING ) return context @@ -128,7 +105,7 @@ class ProposalManageView(BackofficeViewMixin, UpdateView): form.instance.mark_as_rejected(self.request) else: messages.error(self.request, "Unknown submit action") - return redirect(reverse('backoffice:manage_proposals', kwargs={'bocamp_slug': self.bocamp.slug})) + return redirect(reverse('backoffice:manage_proposals', kwargs={'camp_slug': self.camp.slug})) class SpeakerProposalManageView(ProposalManageView): diff --git a/src/bornhack/urls.py b/src/bornhack/urls.py index 3bbbe0fe..6c8f2ec9 100644 --- a/src/bornhack/urls.py +++ b/src/bornhack/urls.py @@ -113,11 +113,6 @@ urlpatterns = [ name='people', ), - path( - 'backoffice/', - include('backoffice.urls', namespace='backoffice') - ), - # camp specific urls below here path( @@ -187,6 +182,10 @@ urlpatterns = [ include('teams.urls', namespace='teams') ), + path( + 'backoffice/', + include('backoffice.urls', namespace='backoffice') + ), ]) ) diff --git a/src/templates/base.html b/src/templates/base.html index 1fb91fd5..4766b709 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -73,8 +73,7 @@
    • Contact
    • People
      • - {% if user.is_authenticated and user.is_staff %} -
    • Backoffice
      • + {% if request.user.is_staff %}
    • Django Admin
      • {% endif %}
    diff --git a/src/templates/includes/menuitems.html b/src/templates/includes/menuitems.html index 49dd27fd..9b021d07 100644 --- a/src/templates/includes/menuitems.html +++ b/src/templates/includes/menuitems.html @@ -5,4 +5,7 @@ Villages Sponsors Teams + {% if request.user.is_staff %} + Backoffice + {% endif %} From 02a7af6303ea1927e37e933a911b1d7749a464bc Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 3 Jun 2018 19:41:49 +0200 Subject: [PATCH 149/351] Make content submission form stuff much nicer. More DRY and more nice. Use one class with a form __init__ kwargs which sets eventtype --- src/program/forms.py | 397 ++++++++++++++++++++----------------------- src/program/utils.py | 38 ----- src/program/views.py | 109 ++++++------ 3 files changed, 248 insertions(+), 296 deletions(-) delete mode 100644 src/program/utils.py diff --git a/src/program/forms.py b/src/program/forms.py index e5d8af16..19c7f65b 100644 --- a/src/program/forms.py +++ b/src/program/forms.py @@ -1,27 +1,132 @@ -from django import forms +import logging from betterforms.multiform import MultiModelForm from collections import OrderedDict -from .models import SpeakerProposal, EventProposal, EventTrack + +from django import forms from django.forms.widgets import TextInput from django.utils.dateparse import parse_duration -import logging + +from .models import SpeakerProposal, EventProposal, EventTrack + logger = logging.getLogger("bornhack.%s" % __name__) -class BaseSpeakerProposalForm(forms.ModelForm): +class SpeakerProposalForm(forms.ModelForm): """ - The BaseSpeakerProposalForm is not used directly. - It is subclassed for each eventtype, where fields are removed or get new labels and help_text as needed + The SpeakerProposalForm. Takes an EventType in __init__ and changes fields accordingly. """ class Meta: model = SpeakerProposal fields = ['name', 'biography', 'needs_oneday_ticket', 'submission_notes'] + def __init__(self, camp, eventtype=None, *args, **kwargs): + # initialise the form + super().__init__(*args, **kwargs) -class BaseEventProposalForm(forms.ModelForm): + # adapt form based on EventType? + if not eventtype: + return + + if eventtype.name == 'Debate': + # fix label and help_text for the name field + self.fields['name'].label = 'Guest Name' + self.fields['name'].help_text = 'The name of a debate guest. Can be a real name or an alias.' + + # fix label and help_text for the biograpy field + self.fields['biography'].label = 'Guest Biography' + self.fields['biography'].help_text = 'The biography of the guest.' + + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Guest Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this guest. Only visible to yourself and the BornHack organisers.' + + # no free tickets for workshops + del(self.fields['needs_oneday_ticket']) + + elif eventtype.name == 'Lightning Talk': + # fix label and help_text for the name field + self.fields['name'].label = 'Speaker Name' + self.fields['name'].help_text = 'The name of the speaker. Can be a real name or an alias.' + + # fix label and help_text for the biograpy field + self.fields['biography'].label = 'Speaker Biography' + self.fields['biography'].help_text = 'The biography of the speaker.' + + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Speaker Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this speaker. Only visible to yourself and the BornHack organisers.' + + # no free tickets for lightning talks + del(self.fields['needs_oneday_ticket']) + + elif eventtype.name == 'Music Act': + # fix label and help_text for the name field + self.fields['name'].label = 'Artist Name' + self.fields['name'].help_text = 'The name of the artist. Can be a real name or artist alias.' + + # fix label and help_text for the biograpy field + self.fields['biography'].label = 'Artist Description' + self.fields['biography'].help_text = 'The description of the artist.' + + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Artist Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this artist. Only visible to yourself and the BornHack organisers.' + + # no oneday tickets for music acts + del(self.fields['needs_oneday_ticket']) + + elif eventtype.name == 'Recreational Event': + # fix label and help_text for the name field + self.fields['name'].label = 'Host Name' + self.fields['name'].help_text = 'The name of the event host. Can be a real name or an alias.' + + # fix label and help_text for the biograpy field + self.fields['biography'].label = 'Host Biography' + self.fields['biography'].help_text = 'The biography of the host.' + + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Host Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this host. Only visible to yourself and the BornHack organisers.' + + # no oneday tickets for music acts + del(self.fields['needs_oneday_ticket']) + + elif eventtype.name == 'Talk': + # fix label and help_text for the name field + self.fields['name'].label = 'Speaker Name' + self.fields['name'].help_text = 'The name of the speaker. Can be a real name or an alias.' + + # fix label and help_text for the biograpy field + self.fields['biography'].label = 'Speaker Biography' + self.fields['biography'].help_text = 'The biography of the speaker.' + + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Speaker Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this speaker. Only visible to yourself and the BornHack organisers.' + + elif eventtype.name == 'Workshop': + # fix label and help_text for the name field + self.fields['name'].label = 'Host Name' + self.fields['name'].help_text = 'The name of the workshop host. Can be a real name or an alias.' + + # fix label and help_text for the biograpy field + self.fields['biography'].label = 'Host Biography' + self.fields['biography'].help_text = 'The biography of the host.' + + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Host Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this host. Only visible to yourself and the BornHack organisers.' + + # no free tickets for workshops + del(self.fields['needs_oneday_ticket']) + + else: + raise ImproperlyConfigured("Unsupported event type, don't know which form class to use") + + +class EventProposalForm(forms.ModelForm): """ - The BaseEventProposalForm is not used directly. - It is subclassed for each eventtype, where fields are removed or get new labels and help_text as needed + The EventProposalForm. Takes an EventType in __init__ and changes fields accordingly. """ class Meta: model = EventProposal @@ -38,234 +143,108 @@ class BaseEventProposalForm(forms.ModelForm): # TODO: make sure the track is part of the current camp, needs camp as form kwarg to verify return track - def __init__(self, *args, **kwargs): + def __init__(self, camp, eventtype=None, *args, **kwargs): + # initialise form super().__init__(*args, **kwargs) + # disable the empty_label for the track select box self.fields['track'].empty_label = None + self.fields['track'].queryset = EventTrack.objects.filter(camp=camp) # make sure video_recording checkbox defaults to checked self.fields['allow_video_recording'].initial = True + if eventtype.name == 'Debate': + # fix label and help_text for the title field + self.fields['title'].label = 'Title of debate' + self.fields['title'].help_text = 'The title of this debate' -################################ EventType "Talk" ################################################ + # fix label and help_text for the abstract field + self.fields['abstract'].label = 'Description' + self.fields['abstract'].help_text = 'The description of this debate' + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Debate Act Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this debate. Only visible to yourself and the BornHack organisers.' -class TalkEventProposalForm(BaseEventProposalForm): - """ - EventProposalForm with field names and help_text adapted to talk submissions - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) + # better placeholder text for duration field + self.fields['duration'].widget.attrs['placeholder'] = 'Debate Duration (minutes)' - # fix label and help_text for the title field - self.fields['title'].label = 'Title of Talk' - self.fields['title'].help_text = 'The title of this talk/presentation.' + elif eventtype.name == 'Music Act': + # fix label and help_text for the title field + self.fields['title'].label = 'Title of music act' + self.fields['title'].help_text = 'The title of this music act/concert/set.' - # fix label and help_text for the abstract field - self.fields['abstract'].label = 'Abstract of Talk' - self.fields['abstract'].help_text = 'The description/abstract of this talk/presentation. Explain what the audience will experience.' + # fix label and help_text for the abstract field + self.fields['abstract'].label = 'Description' + self.fields['abstract'].help_text = 'The description of this music act' - # fix label and help_text for the submission_notes field - self.fields['submission_notes'].label = 'Talk Notes' - self.fields['submission_notes'].help_text = 'Private notes regarding this talk. Only visible to yourself and the BornHack organisers.' + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Music Act Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this music act. Only visible to yourself and the BornHack organisers.' - # no duration for talks - del(self.fields['duration']) + # no video recording for music acts + del(self.fields['allow_video_recording']) + # better placeholder text for duration field + self.fields['duration'].widget.attrs['placeholder'] = 'Duration (minutes)' -class TalkSpeakerProposalForm(BaseSpeakerProposalForm): - """ - SpeakerProposalForm with field labels and help_text adapted for talk submissions - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) + elif eventtype.name == 'Recreational Event': + # fix label and help_text for the title field + self.fields['title'].label = 'Event Title' + self.fields['title'].help_text = 'The title of this recreational event' - # fix label and help_text for the name field - self.fields['name'].label = 'Speaker Name' - self.fields['name'].help_text = 'The name of the speaker. Can be a real name or an alias.' + # fix label and help_text for the abstract field + self.fields['abstract'].label = 'Event Abstract' + self.fields['abstract'].help_text = 'The description/abstract of this recreational event.' - # fix label and help_text for the biograpy field - self.fields['biography'].label = 'Speaker Biography' - self.fields['biography'].help_text = 'The biography of the speaker.' + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Event Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this recreational event. Only visible to yourself and the BornHack organisers.' - # fix label and help_text for the submission_notes field - self.fields['submission_notes'].label = 'Speaker Notes' - self.fields['submission_notes'].help_text = 'Private notes regarding this speaker. Only visible to yourself and the BornHack organisers.' + # no video recording for music acts + del(self.fields['allow_video_recording']) + # better placeholder text for duration field + self.fields['duration'].label = 'Event Duration' + self.fields['duration'].widget.attrs['placeholder'] = 'Duration (minutes)' -################################ EventType "Lightning Talk" ################################################ + elif eventtype.name == 'Talk' or eventtype.name == 'Lightning Talk': + # fix label and help_text for the title field + self.fields['title'].label = 'Title of Talk' + self.fields['title'].help_text = 'The title of this talk/presentation.' + # fix label and help_text for the abstract field + self.fields['abstract'].label = 'Abstract of Talk' + self.fields['abstract'].help_text = 'The description/abstract of this talk/presentation. Explain what the audience will experience.' -class LightningTalkEventProposalForm(TalkEventProposalForm): - """ - LightningTalkEventProposalForm is identical to TalkEventProposalForm for now. Keeping the class here for easy customisation later. - """ - pass + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Talk Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this talk. Only visible to yourself and the BornHack organisers.' -class LightningTalkSpeakerProposalForm(TalkSpeakerProposalForm): - """ - LightningTalkSpeakerProposalForm is identical to TalkSpeakerProposalForm except for no free tickets - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) + # no duration for talks + del(self.fields['duration']) - # no free tickets for lightning talks - del(self.fields['needs_oneday_ticket']) + elif eventtype.name == 'Workshop': + # fix label and help_text for the title field + self.fields['title'].label = 'Workshop Title' + self.fields['title'].help_text = 'The title of this workshop.' + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Workshop Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this workshop. Only visible to yourself and the BornHack organisers.' -################################ EventType "Workshop" ################################################ + # fix label and help_text for the abstract field + self.fields['abstract'].label = 'Workshop Abstract' + self.fields['abstract'].help_text = 'The description/abstract of this workshop. Explain what the participants will learn.' + # no video recording for workshops + del(self.fields['allow_video_recording']) -class WorkshopEventProposalForm(BaseEventProposalForm): - """ - EventProposalForm with field names and help_text adapted for workshop submissions - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) + # duration field + self.fields['duration'].label = 'Workshop Duration' + self.fields['duration'].help_text = 'How much time (in minutes) should we set aside for this workshop? Please keep it between 60 and 180 minutes (1-3 hours).' - # fix label and help_text for the title field - self.fields['title'].label = 'Workshop Title' - self.fields['title'].help_text = 'The title of this workshop.' - - # fix label and help_text for the submission_notes field - self.fields['submission_notes'].label = 'Workshop Notes' - self.fields['submission_notes'].help_text = 'Private notes regarding this workshop. Only visible to yourself and the BornHack organisers.' - - # fix label and help_text for the abstract field - self.fields['abstract'].label = 'Workshop Abstract' - self.fields['abstract'].help_text = 'The description/abstract of this workshop. Explain what the participants will learn.' - - # no video recording for workshops - del(self.fields['allow_video_recording']) - - # duration field - self.fields['duration'].label = 'Workshop Duration' - self.fields['duration'].help_text = 'How much time (in minutes) should we set aside for this workshop? Please keep it between 60 and 180 minutes (1-3 hours).' - -class WorkshopSpeakerProposalForm(BaseSpeakerProposalForm): - """ - SpeakerProposalForm with field labels and help_text adapted for workshop submissions - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - # fix label and help_text for the name field - self.fields['name'].label = 'Host Name' - self.fields['name'].help_text = 'The name of the workshop host. Can be a real name or an alias.' - - # fix label and help_text for the biograpy field - self.fields['biography'].label = 'Host Biography' - self.fields['biography'].help_text = 'The biography of the host.' - - # fix label and help_text for the submission_notes field - self.fields['submission_notes'].label = 'Host Notes' - self.fields['submission_notes'].help_text = 'Private notes regarding this host. Only visible to yourself and the BornHack organisers.' - - # no free tickets for workshops - del(self.fields['needs_oneday_ticket']) - - -################################ EventType "Music" ################################################ - - -class MusicEventProposalForm(BaseEventProposalForm): - """ - EventProposalForm with field names and help_text adapted to music submissions - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - # fix label and help_text for the title field - self.fields['title'].label = 'Title of music act' - self.fields['title'].help_text = 'The title of this music act/concert/set.' - - # fix label and help_text for the abstract field - self.fields['abstract'].label = 'Description' - self.fields['abstract'].help_text = 'The description of this music act' - - # fix label and help_text for the submission_notes field - self.fields['submission_notes'].label = 'Music Act Notes' - self.fields['submission_notes'].help_text = 'Private notes regarding this music act. Only visible to yourself and the BornHack organisers.' - - # no video recording for music acts - del(self.fields['allow_video_recording']) - - # better placeholder text for duration field - self.fields['duration'].widget.attrs['placeholder'] = 'Duration (minutes)' - - -class MusicSpeakerProposalForm(BaseSpeakerProposalForm): - """ - SpeakerProposalForm with field labels and help_text adapted for music submissions - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - # fix label and help_text for the name field - self.fields['name'].label = 'Artist Name' - self.fields['name'].help_text = 'The name of the artist. Can be a real name or artist alias.' - - # fix label and help_text for the biograpy field - self.fields['biography'].label = 'Artist Description' - self.fields['biography'].help_text = 'The description of the artist.' - - # fix label and help_text for the submission_notes field - self.fields['submission_notes'].label = 'Artist Notes' - self.fields['submission_notes'].help_text = 'Private notes regarding this artist. Only visible to yourself and the BornHack organisers.' - - # no oneday tickets for music acts - del(self.fields['needs_oneday_ticket']) - - -################################ EventType "Slacking Off" ################################################ - - -class SlackEventProposalForm(BaseEventProposalForm): - """ - EventProposalForm with field names and help_text adapted to slacking off submissions - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - # fix label and help_text for the title field - self.fields['title'].label = 'Event Title' - self.fields['title'].help_text = 'The title of this recreational event' - - # fix label and help_text for the abstract field - self.fields['abstract'].label = 'Event Abstract' - self.fields['abstract'].help_text = 'The description/abstract of this recreational event.' - - # fix label and help_text for the submission_notes field - self.fields['submission_notes'].label = 'Event Notes' - self.fields['submission_notes'].help_text = 'Private notes regarding this recreational event. Only visible to yourself and the BornHack organisers.' - - # no video recording for music acts - del(self.fields['allow_video_recording']) - - # better placeholder text for duration field - self.fields['duration'].label = 'Event Duration' - self.fields['duration'].widget.attrs['placeholder'] = 'Duration (minutes)' - - -class SlackSpeakerProposalForm(BaseSpeakerProposalForm): - """ - SpeakerProposalForm with field labels and help_text adapted for recreational events - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - - # fix label and help_text for the name field - self.fields['name'].label = 'Host Name' - self.fields['name'].help_text = 'The name of the event host. Can be a real name or an alias.' - - # fix label and help_text for the biograpy field - self.fields['biography'].label = 'Host Biography' - self.fields['biography'].help_text = 'The biography of the host.' - - # fix label and help_text for the submission_notes field - self.fields['submission_notes'].label = 'Host Notes' - self.fields['submission_notes'].help_text = 'Private notes regarding this host. Only visible to yourself and the BornHack organisers.' - - # no oneday tickets for music acts - del(self.fields['needs_oneday_ticket']) + else: + raise ImproperlyConfigured("Unsupported event type, don't know which form class to use") diff --git a/src/program/utils.py b/src/program/utils.py deleted file mode 100644 index cb480d32..00000000 --- a/src/program/utils.py +++ /dev/null @@ -1,38 +0,0 @@ -from django.core.exceptions import ImproperlyConfigured -from .forms import * - -def get_speakerproposal_form_class(eventtype): - """ - Return a SpeakerProposal form class suitable for the provided EventType - """ - if eventtype.name == 'Music Act': - return MusicSpeakerProposalForm - elif eventtype.name == 'Talk': - return TalkSpeakerProposalForm - elif eventtype.name == 'Workshop': - return WorkshopSpeakerProposalForm - elif eventtype.name == 'Lightning Talk': - return LightningTalkSpeakerProposalForm - elif eventtype.name == 'Recreational Event': - return SlackSpeakerProposalForm - else: - raise ImproperlyConfigured("Unsupported event type, don't know which form class to use") - - -def get_eventproposal_form_class(eventtype): - """ - Return an EventProposal form class suitable for the provided EventType - """ - if eventtype.name == 'Music Act': - return MusicEventProposalForm - elif eventtype.name == 'Talk': - return TalkEventProposalForm - elif eventtype.name == 'Workshop': - return WorkshopEventProposalForm - elif eventtype.name == 'Lightning Talk': - return LightningTalkEventProposalForm - elif eventtype.name == 'Recreational Event': - return SlackEventProposalForm - else: - raise ImproperlyConfigured("Unsupported event type, don't know which form class to use") - diff --git a/src/program/views.py b/src/program/views.py index a0a8e318..49a9ea73 100644 --- a/src/program/views.py +++ b/src/program/views.py @@ -34,8 +34,7 @@ from .email import ( add_eventproposal_updated_email ) from . import models -from .utils import get_speakerproposal_form_class, get_eventproposal_form_class -from .forms import BaseSpeakerProposalForm +from .forms import SpeakerProposalForm, EventProposalForm logger = logging.getLogger("bornhack.%s" % __name__) @@ -129,6 +128,7 @@ class SpeakerProposalCreateView(LoginRequiredMixin, CampViewMixin, EnsureWritabl """ This view allows a user to create a new SpeakerProposal linked to an existing EventProposal """ model = models.SpeakerProposal template_name = 'speakerproposal_form.html' + form_class = SpeakerProposalForm def dispatch(self, request, *args, **kwargs): """ Get the eventproposal object """ @@ -138,8 +138,16 @@ class SpeakerProposalCreateView(LoginRequiredMixin, CampViewMixin, EnsureWritabl def get_success_url(self): return reverse('program:proposal_list', kwargs={'camp_slug': self.camp.slug}) - def get_form_class(self): - return get_speakerproposal_form_class(eventtype=self.eventproposal.event_type) + def get_form_kwargs(self): + """ + Set camp and eventtype for the form + """ + kwargs = super().get_form_kwargs() + kwargs.update({ + 'camp': self.camp, + 'eventtype': self.eventproposal.event_type + }) + return kwargs def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -170,22 +178,34 @@ class SpeakerProposalUpdateView(LoginRequiredMixin, CampViewMixin, EnsureWritabl """ model = models.SpeakerProposal template_name = 'speakerproposal_form.html' + form_class = SpeakerProposalForm - - def get_form_class(self): - """ Get the appropriate form class based on the eventtype """ + def get_form_kwargs(self): + """ + Set camp and eventtype for the form + """ + kwargs = super().get_form_kwargs() if self.get_object().eventproposals.count() == 1: # determine which form to use based on the type of event associated with the proposal - return get_speakerproposal_form_class(self.get_object().eventproposals.get().event_type) + eventtype = self.get_object().eventproposals.get().event_type else: # more than one eventproposal. If all events are the same type we can still show a non-generic form here eventtypes = set() for ep in self.get_object().eventproposals.all(): eventtypes.add(ep.event_type) if len(eventtypes) == 1: - return get_speakerproposal_form_class(ep.event_type) - # more than one type of event for this person, return the generic speakerproposal form - return BaseSpeakerProposalForm + eventtype = self.get_object().eventproposals.get().event_type + else: + # more than one type of event for this person, return the generic speakerproposal form + eventtype = None + + # add camp and eventtype to form kwargs + kwargs.update({ + 'camp': self.camp, + 'eventtype': eventtype + }) + + return kwargs def form_valid(self, form): """ @@ -365,10 +385,7 @@ class EventProposalCreateView(LoginRequiredMixin, CampViewMixin, EnsureWritableC """ model = models.EventProposal template_name = 'eventproposal_form.html' - - def get_form_class(self): - """ Get the appropriate form class based on the eventtype """ - return get_eventproposal_form_class(self.event_type) + form_class = EventProposalForm def dispatch(self, request, *args, **kwargs): """ Get the speakerproposal object """ @@ -383,16 +400,16 @@ class EventProposalCreateView(LoginRequiredMixin, CampViewMixin, EnsureWritableC context['event_type'] = self.event_type return context - def get_form(self): + def get_form_kwargs(self): """ - Override get_form() method so we can set the queryset for the track selector. - Usually this kind of thing would go into get_initial() but that does not work for some reason, so we do it here instead. + Set camp and eventtype for the form """ - form_class = self.get_form_class() - form = form_class(**self.get_form_kwargs()) - form.fields['track'].queryset = models.EventTrack.objects.filter(camp=self.camp) - return form - + kwargs = super().get_form_kwargs() + kwargs.update({ + 'camp': self.camp, + 'eventtype': self.event_type + }) + return kwargs def form_valid(self, form): # set camp and user for this eventproposal @@ -418,11 +435,18 @@ class EventProposalCreateView(LoginRequiredMixin, CampViewMixin, EnsureWritableC class EventProposalUpdateView(LoginRequiredMixin, CampViewMixin, EnsureWritableCampMixin, EnsureUserOwnsProposalMixin, EnsureCFPOpenMixin, UpdateView): model = models.EventProposal template_name = 'eventproposal_form.html' + form_class = EventProposalForm - def get_form_class(self): - """ Get the appropriate form class based on the eventtype """ - return get_eventproposal_form_class(self.get_object().event_type) - + def get_form_kwargs(self): + """ + Set camp and eventtype for the form + """ + kwargs = super().get_form_kwargs() + kwargs.update({ + 'camp': self.camp, + 'eventtype': self.get_object().event_type + }) + return kwargs def get_context_data(self, *args, **kwargs): """ Make speakerproposal and eventtype objects available in the template """ @@ -430,16 +454,6 @@ class EventProposalUpdateView(LoginRequiredMixin, CampViewMixin, EnsureWritableC context['event_type'] = self.get_object().event_type return context - def get_form(self): - """ - Override get_form() method so we can set the queryset for the track selector. - Usually this kind of thing would go into get_initial() but that does not work for some reason, so we do it here instead. - """ - form_class = self.get_form_class() - form = form_class(**self.get_form_kwargs()) - form.fields['track'].queryset = models.EventTrack.objects.filter(camp=self.camp) - return form - def form_valid(self, form): # set status to pending and save eventproposal form.instance.proposal_status = models.EventProposal.PROPOSAL_PENDING @@ -588,11 +602,7 @@ class CombinedProposalSubmitView(LoginRequiredMixin, CampViewMixin, CreateView): """ if hasattr(self, 'speakerproposal'): # we already have a speakerproposal, just show an eventproposal form - return get_eventproposal_form_class(eventtype=self.eventtype) - - # get the two forms we need to build the MultiModelForm - SpeakerProposalForm = get_speakerproposal_form_class(eventtype=self.eventtype) - EventProposalForm = get_eventproposal_form_class(eventtype=self.eventtype) + return EventProposalForm # build our MultiModelForm class CombinedProposalSubmitForm(MultiModelForm): @@ -604,15 +614,16 @@ class CombinedProposalSubmitView(LoginRequiredMixin, CampViewMixin, CreateView): # return the form class return CombinedProposalSubmitForm - def get_form(self): + def get_form_kwargs(self): """ - Override get_form() method so we can set the queryset for the track selector. - Usually this kind of thing would go into get_initial() but that does not work for some reason, so we do it here instead. + Set camp and eventtype for the form """ - form_class = self.get_form_class() - form = form_class(**self.get_form_kwargs()) - form.forms['eventproposal'].fields['track'].queryset = models.EventTrack.objects.filter(camp=self.camp) - return form + kwargs = super().get_form_kwargs() + kwargs.update({ + 'camp': self.camp, + 'eventtype': self.eventtype + }) + return kwargs ################################################################################################### From a7a9a24c6cad2de1ed329b12f1bdc50827850a77 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 3 Jun 2018 22:39:05 +0200 Subject: [PATCH 150/351] move debug logging so channel messages are not logged, the bot doesn't handle any channel messages anyway and we dont want the data --- src/ircbot/irc3module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ircbot/irc3module.py b/src/ircbot/irc3module.py index d2c67d83..d6b2367a 100644 --- a/src/ircbot/irc3module.py +++ b/src/ircbot/irc3module.py @@ -74,12 +74,12 @@ class Plugin(object): @irc3.event(irc3.rfc.PRIVMSG) def on_privmsg(self, **kwargs): """triggered when a privmsg is sent to the bot or to a channel the bot is in""" - logger.debug("inside on_privmsg(), kwargs: %s" % kwargs) - # we only handle NOTICEs for now if kwargs['event'] != "NOTICE": return + logger.debug("inside on_privmsg(), kwargs: %s" % kwargs) + # check if this is a message from nickserv if kwargs['mask'] == "NickServ!%s" % settings.IRCBOT_NICKSERV_MASK: self.bot.handle_nickserv_privmsg(**kwargs) From 23054164616a1a5bb294eb2b94601c5685c063a8 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 3 Jun 2018 23:24:50 +0200 Subject: [PATCH 151/351] only show tables when at least one proposal is found --- src/backoffice/templates/manage_proposals.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/backoffice/templates/manage_proposals.html b/src/backoffice/templates/manage_proposals.html index 4c28b64d..8ba2deb1 100644 --- a/src/backoffice/templates/manage_proposals.html +++ b/src/backoffice/templates/manage_proposals.html @@ -18,6 +18,9 @@

    SpeakerProposals

    + {% if not speakerproposals %} +

    No pending SpeakerProposals found

    + {% else %} @@ -40,8 +43,12 @@ {% endfor %}
    + {% endif %}

    EventProposals

    + {% if not eventproposals %} +

    No pending SpeakerProposals found

    + {% else %} @@ -68,7 +75,7 @@ {% endfor %}
    - + {% endif %}
    + +{% endblock extra_head %} +{% block content %} +
    +

    Merchandise To Order

    +
    + This is a list of merchandise to order from our supplier +
    +
    + This table shows all different merchandise that needs to be ordered +
    +
    +
    +
    + + + + + + + + + {% for key, val in merchandise.items %} + + + + + {% endfor %} + +
    Merchandise TypeQuantity
    {{ key }}{{ val }}
    +
    + + +{% endblock content %} diff --git a/src/backoffice/templates/orders_merchandise.html b/src/backoffice/templates/orders_merchandise.html new file mode 100644 index 00000000..dcaf94be --- /dev/null +++ b/src/backoffice/templates/orders_merchandise.html @@ -0,0 +1,51 @@ +{% extends 'base.html' %} +{% load commonmark %} +{% load static from staticfiles %} +{% load imageutils %} +{% block extra_head %} + + +{% endblock extra_head %} +{% block content %} +
    +

    Merchandise Orders

    +
    + Use this view to look at merchandise orders.
    +
    + This table shows all OrderProductRelations which are Merchandise (not including handed out, unpaid, cancelled and refunded orders). The table is initally sorted by order ID but the sorting can be changed by clicking the column headlines (if javascript is enabled). +
    +
    +
    +
    + + + + + + + + + + + + + {% for productrel in orderproductrelation_list %} + + + + + + + + + {% endfor %} + +
    OrderUserEmailOPR IdProductQuantity
    Order #{{ productrel.order.id }}{{ productrel.order.user }}{{ productrel.order.user.email }}{{ productrel.id }}{{ productrel.product.name }}{{ productrel.quantity }}
    +
    + + +{% endblock content %} diff --git a/src/backoffice/urls.py b/src/backoffice/urls.py index 58da109d..f48cced5 100644 --- a/src/backoffice/urls.py +++ b/src/backoffice/urls.py @@ -10,6 +10,8 @@ urlpatterns = [ path('badge_handout/', BadgeHandoutView.as_view(), name='badge_handout'), path('ticket_checkin/', TicketCheckinView.as_view(), name='ticket_checkin'), path('public_credit_names/', ApproveNamesView.as_view(), name='public_credit_names'), + path('merchandise_orders/', MerchandiseOrdersView.as_view(), name='merchandise_orders'), + path('merchandise_to_order/', MerchandiseToOrderView.as_view(), name='merchandise_to_order'), path('manage_proposals/', include([ path('', ManageProposalsView.as_view(), name='manage_proposals'), path('speakers//', SpeakerProposalManageView.as_view(), name='speakerproposal_manage'), diff --git a/src/backoffice/views.py b/src/backoffice/views.py index 2a9039dc..d0a83d53 100644 --- a/src/backoffice/views.py +++ b/src/backoffice/views.py @@ -1,5 +1,6 @@ import logging from itertools import chain +from datetime import datetime from django.views.generic import TemplateView, ListView from django.views.generic.edit import UpdateView @@ -122,3 +123,48 @@ class EventProposalManageView(ProposalManageView): model = EventProposal template_name = "manage_eventproposal.html" + +class MerchandiseOrdersView(BackofficeViewMixin, ListView): + template_name = "orders_merchandise.html" + + def get_queryset(self, **kwargs): + camp_prefix = 'BornHack {}'.format(datetime.now().strftime('%Y')) + + return OrderProductRelation.objects.filter( + handed_out=False, + order__paid=True, + order__refunded=False, + order__cancelled=False, + product__category__name='Merchandise', + ).filter( + product__name__startswith=camp_prefix + ).order_by('order') + + +class MerchandiseToOrderView(BackofficeViewMixin, TemplateView): + template_name = "merchandise_to_order.html" + + def get_context_data(self, **kwargs): + camp_prefix = 'BornHack {}'.format(datetime.now().strftime('%Y')) + + order_relations = OrderProductRelation.objects.filter( + handed_out=False, + order__paid=True, + order__refunded=False, + order__cancelled=False, + product__category__name='Merchandise', + ).filter( + product__name__startswith=camp_prefix + ) + + merchandise_orders = {} + for relation in order_relations: + try: + quantity = merchandise_orders[relation.product.name] + relation.quantity + merchandise_orders[relation.product.name] = quantity + except KeyError: + merchandise_orders[relation.product.name] = relation.quantity + + context = super().get_context_data(**kwargs) + context['merchandise'] = merchandise_orders + return context From d03af1c11e8338e80d122f48a4f4995846f626cc Mon Sep 17 00:00:00 2001 From: Stephan Telling Date: Wed, 1 Aug 2018 12:25:43 +0200 Subject: [PATCH 193/351] use django.utils timezone rather than datetime --- src/backoffice/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backoffice/views.py b/src/backoffice/views.py index d0a83d53..06af7073 100644 --- a/src/backoffice/views.py +++ b/src/backoffice/views.py @@ -1,12 +1,12 @@ import logging from itertools import chain -from datetime import datetime from django.views.generic import TemplateView, ListView from django.views.generic.edit import UpdateView from django.shortcuts import redirect from django.urls import reverse from django.contrib import messages +from django.utils import timezone from shop.models import OrderProductRelation from tickets.models import ShopTicket, SponsorTicket, DiscountTicket @@ -128,7 +128,7 @@ class MerchandiseOrdersView(BackofficeViewMixin, ListView): template_name = "orders_merchandise.html" def get_queryset(self, **kwargs): - camp_prefix = 'BornHack {}'.format(datetime.now().strftime('%Y')) + camp_prefix = 'BornHack {}'.format(timezone.now().year) return OrderProductRelation.objects.filter( handed_out=False, @@ -145,7 +145,7 @@ class MerchandiseToOrderView(BackofficeViewMixin, TemplateView): template_name = "merchandise_to_order.html" def get_context_data(self, **kwargs): - camp_prefix = 'BornHack {}'.format(datetime.now().strftime('%Y')) + camp_prefix = 'BornHack {}'.format(timezone.now().year) order_relations = OrderProductRelation.objects.filter( handed_out=False, From 456d9377a6361513d27de501c67d8046e165f384 Mon Sep 17 00:00:00 2001 From: Kasper Friis Christensen Date: Wed, 1 Aug 2018 21:15:43 +0200 Subject: [PATCH 194/351] Changed z-index of .sticky and added bootstrap z-indexes to bornhack.css as a comment --- src/static_src/css/bornhack.css | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/static_src/css/bornhack.css b/src/static_src/css/bornhack.css index a5797eaa..dbb6bb55 100644 --- a/src/static_src/css/bornhack.css +++ b/src/static_src/css/bornhack.css @@ -12,6 +12,37 @@ a, a:active, a:focus { outline: none; } +/* Z-index */ +/* Bootstrap values +.dropdown-backdrop { + z-index: 990; +} +.navbar-static-top, +.dropdown-menu { + z-index: 1000; +} +.navbar-fixed-top, +.navbar-fixed-bottom { + z-index: 1030; +} +.modal-backdrop { + z-index: 1040; +} +.modal { + z-index: 1050; +} +.popover { + z-index: 1060; +} +.tooltip { + z-index: 1070; +} + */ +/* Custom */ +.sticky { + z-index: 980; +} + @media (max-width: 520px) { #main { width: 100%; @@ -236,7 +267,6 @@ footer { .sticky { position: sticky; background-color: #fff; - z-index: 9999; } #daypicker { From a2b0d2980abd324e8b1a51ce10e982d144673d35 Mon Sep 17 00:00:00 2001 From: Kasper Friis Christensen Date: Wed, 1 Aug 2018 21:27:02 +0200 Subject: [PATCH 195/351] Minimized comment size --- src/static_src/css/bornhack.css | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/src/static_src/css/bornhack.css b/src/static_src/css/bornhack.css index dbb6bb55..44bc13bb 100644 --- a/src/static_src/css/bornhack.css +++ b/src/static_src/css/bornhack.css @@ -14,31 +14,14 @@ a, a:active, a:focus { /* Z-index */ /* Bootstrap values -.dropdown-backdrop { - z-index: 990; -} -.navbar-static-top, -.dropdown-menu { - z-index: 1000; -} -.navbar-fixed-top, -.navbar-fixed-bottom { - z-index: 1030; -} -.modal-backdrop { - z-index: 1040; -} -.modal { - z-index: 1050; -} -.popover { - z-index: 1060; -} -.tooltip { - z-index: 1070; -} +.dropdown-backdrop { z-index: 990; } +.navbar-static-top, .dropdown-menu { z-index: 1000; } +.navbar-fixed-top, .navbar-fixed-bottom { z-index: 1030; } +.modal-backdrop { z-index: 1040; } +.modal { z-index: 1050; } +.popover { z-index: 1060; } +.tooltip { z-index: 1070; } */ -/* Custom */ .sticky { z-index: 980; } From eeab018a778ee07fdc518ad6c42511061d81a953 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Thu, 2 Aug 2018 09:48:59 +0200 Subject: [PATCH 196/351] add dansk metal sponsor logo --- src/static_src/img/sponsors/DM_Logo_RGB.png | Bin 0 -> 7578 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/static_src/img/sponsors/DM_Logo_RGB.png diff --git a/src/static_src/img/sponsors/DM_Logo_RGB.png b/src/static_src/img/sponsors/DM_Logo_RGB.png new file mode 100644 index 0000000000000000000000000000000000000000..648699d0af2ab505987d4c4e5efe70865c009514 GIT binary patch literal 7578 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 literal 0 HcmV?d00001 From d08c299e8dbc46f67e5f5ab25d4544be9bed41b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 4 Aug 2018 13:27:05 +0200 Subject: [PATCH 197/351] Views can have an indirect relation to a team. --- src/teams/views/mixins.py | 6 +++++- src/teams/views/tasks.py | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/teams/views/mixins.py b/src/teams/views/mixins.py index 2b661827..34608b0e 100644 --- a/src/teams/views/mixins.py +++ b/src/teams/views/mixins.py @@ -37,7 +37,11 @@ class EnsureTeamMemberResponsibleMixin(SingleObjectMixin): class TeamViewMixin: + + def get_team(self): + return self.get_object().team + def get_context_data(self, *args, **kwargs): context = super().get_context_data(**kwargs) - context['team'] = self.get_object().team + context['team'] = self.get_team() return context diff --git a/src/teams/views/tasks.py b/src/teams/views/tasks.py index 27f0f574..d18c2465 100644 --- a/src/teams/views/tasks.py +++ b/src/teams/views/tasks.py @@ -25,6 +25,12 @@ class TaskCreateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTea template_name = "task_form.html" fields = ['name', 'description'] + def get_team(self): + return Team.objects.get( + camp__slug=self.kwargs['camp_slug'], + slug=self.kwargs['team_slug'] + ) + def form_valid(self, form): task = form.save(commit=False) task.team = self.team From da75660f0d3648332ae5ec808d48b36650596c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 4 Aug 2018 13:45:52 +0200 Subject: [PATCH 198/351] Final touches - I think. --- src/teams/templates/team_base.html | 24 ++++++--- src/teams/templates/team_info_categories.html | 4 -- ...tml => team_info_item_delete_confirm.html} | 4 +- ...tem_form.html => team_info_item_form.html} | 6 ++- src/teams/templates/team_members.html | 16 +++--- src/teams/urls.py | 41 +++++++++------ src/teams/views/base.py | 1 + src/teams/views/info.py | 51 +++++++++++++++++-- src/teams/views/members.py | 5 ++ src/teams/views/tasks.py | 4 ++ 10 files changed, 114 insertions(+), 42 deletions(-) rename src/teams/templates/{info_item_delete_confirm.html => team_info_item_delete_confirm.html} (93%) rename src/teams/templates/{info_item_form.html => team_info_item_form.html} (95%) diff --git a/src/teams/templates/team_base.html b/src/teams/templates/team_base.html index 1a56fa5d..8ef87216 100644 --- a/src/teams/templates/team_base.html +++ b/src/teams/templates/team_base.html @@ -16,19 +16,13 @@ Team: {{ team.name }} | {{ block.super }}
    diff --git a/src/teams/templates/team_info_categories.html b/src/teams/templates/team_info_categories.html index 0490b787..15f0900c 100644 --- a/src/teams/templates/team_info_categories.html +++ b/src/teams/templates/team_info_categories.html @@ -6,10 +6,6 @@ {% block team_content %} -{% if request.user in team.responsible_members.all and team.info_categories.exists %} -

    SHOULD NOT HAPPEN !!!

    -{% endif %} -

    Info Categories

    diff --git a/src/teams/templates/info_item_delete_confirm.html b/src/teams/templates/team_info_item_delete_confirm.html similarity index 93% rename from src/teams/templates/info_item_delete_confirm.html rename to src/teams/templates/team_info_item_delete_confirm.html index fe9f2403..18e6e28b 100644 --- a/src/teams/templates/info_item_delete_confirm.html +++ b/src/teams/templates/team_info_item_delete_confirm.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'team_base.html' %} {% load commonmark %} {% load bootstrap3 %} @@ -11,7 +11,7 @@ Create Info item in {{ form.instance.category.headline }} {% endblock %} -{% block content %} +{% block team_content %}

    diff --git a/src/teams/templates/info_item_form.html b/src/teams/templates/team_info_item_form.html similarity index 95% rename from src/teams/templates/info_item_form.html rename to src/teams/templates/team_info_item_form.html index 26327630..e062ae9d 100644 --- a/src/teams/templates/info_item_form.html +++ b/src/teams/templates/team_info_item_form.html @@ -5,10 +5,11 @@ {% block title %} {% if object %} Editing "{{ object.headline }}" +in "{{ form.instance.category.headline }}" {% else %} Create Info item +in "{{ category.headline }}" {% endif %} -in "{{ form.instance.category.headline }}" {% endblock %} {% block team_content %} @@ -17,10 +18,11 @@ in "{{ form.instance.category.headline }}"

    {% if object %} Editing "{{ object.headline }}" + in "{{ object.category.headline }}" {% else %} Create Info Item + in "{{ category.headline }}" {% endif %} - in "{{ object.category.headline }}"

    diff --git a/src/teams/templates/team_members.html b/src/teams/templates/team_members.html index 49a1e25a..b3fef15a 100644 --- a/src/teams/templates/team_members.html +++ b/src/teams/templates/team_members.html @@ -29,25 +29,26 @@ - {% for teammember in team.memberships.all %} + {% for member in team.memberships.all %} + {% if member.approved or not member.approved and request.user in team.responsible_members.all %} - {{ teammember.user.profile.get_public_credit_name }} {% if teammember.user == request.user %}(this is you!){% endif %} + {{ member.user.profile.get_public_credit_name }} {% if member.user == request.user %}(this is you!){% endif %} - Team {% if teammember.responsible %}Responsible{% else %}Member{% endif %} - {% if not teammember.approved %}(pending approval){% endif %} + Team {% if member.responsible %}Responsible{% else %}Member{% endif %} + {% if not member.approved %}(pending approval){% endif %} {% if request.user in team.responsible_members.all %}
    + href="{% url 'teams:member_remove' camp_slug=camp.slug team_slug=team.slug pk=member.id %}"> Remove - {% if not teammember.approved %} + {% if not member.approved %} + href="{% url 'teams:member_approve' camp_slug=camp.slug team_slug=team.slug pk=member.id %}"> Approve {% endif %} @@ -55,6 +56,7 @@ {% endif %} + {% endif %} {% empty %}

    No members found!

    {% endfor %} diff --git a/src/teams/urls.py b/src/teams/urls.py index 6c5adfd5..b4def544 100644 --- a/src/teams/urls.py +++ b/src/teams/urls.py @@ -16,6 +16,7 @@ from teams.views.members import ( ) from teams.views.info import ( + InfoCategoriesListView, InfoItemUpdateView, InfoItemCreateView, InfoItemDeleteView, @@ -73,12 +74,12 @@ urlpatterns = [ path( '/remove/', TeamMemberRemoveView.as_view(), - name='teammember_remove', + name='member_remove', ), path( '/approve/', TeamMemberApproveView.as_view(), - name='teammember_approve', + name='member_approve', ), ]), ), @@ -112,26 +113,36 @@ urlpatterns = [ ]), ), path( - 'info//', include([ + 'info/', + include([ path( - 'create/', - InfoItemCreateView.as_view(), - name='info_item_create', + '', + InfoCategoriesListView.as_view(), + name='info_categories' ), path( - '/', include([ + '/', include([ path( - 'update/', - InfoItemUpdateView.as_view(), - name='info_item_update', + 'create/', + InfoItemCreateView.as_view(), + name='info_item_create', ), path( - 'delete/', - InfoItemDeleteView.as_view(), - name='info_item_delete', + '/', include([ + path( + 'update/', + InfoItemUpdateView.as_view(), + name='info_item_update', + ), + path( + 'delete/', + InfoItemDeleteView.as_view(), + name='info_item_delete', + ), + ]), ), - ]), - ), + ]) + ) ]) ) ]), diff --git a/src/teams/views/base.py b/src/teams/views/base.py index 06c928e1..cce95e70 100644 --- a/src/teams/views/base.py +++ b/src/teams/views/base.py @@ -25,6 +25,7 @@ class TeamGeneralView(CampViewMixin, DetailView): context_object_name = 'team' model = Team slug_url_kwarg = 'team_slug' + active_menu = 'general' def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) diff --git a/src/teams/views/info.py b/src/teams/views/info.py index f2da0bcb..0d49162d 100644 --- a/src/teams/views/info.py +++ b/src/teams/views/info.py @@ -1,18 +1,39 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.http import HttpResponseRedirect -from django.views.generic import CreateView, UpdateView, DeleteView +from django.views.generic import CreateView, UpdateView, DeleteView, ListView from reversion.views import RevisionMixin from camps.mixins import CampViewMixin from info.models import InfoItem, InfoCategory +from ..models import Team from .mixins import EnsureTeamResponsibleMixin, TeamViewMixin +class InfoCategoriesListView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTeamResponsibleMixin, ListView): + model = InfoCategory + template_name = "team_info_categories.html" + slug_field = 'anchor' + active_menu = 'info_categories' + + def get_team(self): + return Team.objects.get( + camp__slug=self.kwargs['camp_slug'], + slug=self.kwargs['team_slug'] + ) + + class InfoItemCreateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTeamResponsibleMixin, CreateView): model = InfoItem - template_name = "info_item_form.html" + template_name = "team_info_item_form.html" fields = ['headline', 'body', 'anchor', 'weight'] slug_field = 'anchor' + active_menu = 'info_categories' + + def get_team(self): + return Team.objects.get( + camp__slug=self.kwargs['camp_slug'], + slug=self.kwargs['team_slug'] + ) def form_valid(self, form): info_item = form.save(commit=False) @@ -24,13 +45,28 @@ class InfoItemCreateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, Ensur def get_success_url(self): return self.team.get_absolute_url() + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['category'] = InfoCategory.objects.get( + team__camp__slug=self.kwargs['camp_slug'], + anchor=self.kwargs['category_anchor'] + ) + return context + class InfoItemUpdateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTeamResponsibleMixin, RevisionMixin, UpdateView): model = InfoItem - template_name = "info_item_form.html" + template_name = "team_info_item_form.html" fields = ['headline', 'body', 'anchor', 'weight'] slug_field = 'anchor' slug_url_kwarg = 'item_anchor' + active_menu = 'info_categories' + + def get_team(self): + return Team.objects.get( + camp__slug=self.kwargs['camp_slug'], + slug=self.kwargs['team_slug'] + ) def get_success_url(self): next = self.request.GET.get('next') @@ -41,9 +77,16 @@ class InfoItemUpdateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, Ensur class InfoItemDeleteView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTeamResponsibleMixin, RevisionMixin, DeleteView): model = InfoItem - template_name = "info_item_delete_confirm.html" + template_name = "team_info_item_delete_confirm.html" slug_field = 'anchor' slug_url_kwarg = 'item_anchor' + active_menu = 'info_categories' + + def get_team(self): + return Team.objects.get( + camp__slug=self.kwargs['camp_slug'], + slug=self.kwargs['team_slug'] + ) def get_success_url(self): next = self.request.GET.get('next') diff --git a/src/teams/views/members.py b/src/teams/views/members.py index cbd03e00..8d050504 100644 --- a/src/teams/views/members.py +++ b/src/teams/views/members.py @@ -20,6 +20,7 @@ class TeamMembersView(CampViewMixin, DetailView): context_object_name = 'team' model = Team slug_url_kwarg = 'team_slug' + active_menu = 'members' class TeamJoinView(LoginRequiredMixin, CampViewMixin, UpdateView): @@ -27,6 +28,7 @@ class TeamJoinView(LoginRequiredMixin, CampViewMixin, UpdateView): model = Team fields = [] slug_url_kwarg = 'team_slug' + active_menu = 'members' def get(self, request, *args, **kwargs): if not Profile.objects.get(user=request.user).description: @@ -57,6 +59,7 @@ class TeamLeaveView(LoginRequiredMixin, CampViewMixin, UpdateView): model = Team fields = [] slug_url_kwarg = 'team_slug' + active_menu = 'members' def get(self, request, *args, **kwargs): if request.user not in self.get_object().members.all(): @@ -75,6 +78,7 @@ class TeamMemberRemoveView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, Ens template_name = "teammember_remove.html" model = TeamMember fields = [] + active_menu = 'members' def form_valid(self, form): form.instance.delete() @@ -92,6 +96,7 @@ class TeamMemberApproveView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, En template_name = "teammember_approve.html" model = TeamMember fields = [] + active_menu = 'members' def form_valid(self, form): form.instance.approved = True diff --git a/src/teams/views/tasks.py b/src/teams/views/tasks.py index d18c2465..02b5ba29 100644 --- a/src/teams/views/tasks.py +++ b/src/teams/views/tasks.py @@ -12,18 +12,21 @@ class TeamTasksView(CampViewMixin, DetailView): context_object_name = 'team' model = Team slug_url_kwarg = 'team_slug' + active_menu = 'tasks' class TaskDetailView(CampViewMixin, TeamViewMixin, DetailView): template_name = "task_detail.html" context_object_name = "task" model = TeamTask + active_menu = 'tasks' class TaskCreateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTeamResponsibleMixin, CreateView): model = TeamTask template_name = "task_form.html" fields = ['name', 'description'] + active_menu = 'tasks' def get_team(self): return Team.objects.get( @@ -47,6 +50,7 @@ class TaskUpdateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTea model = TeamTask template_name = "task_form.html" fields = ['name', 'description'] + active_menu = 'tasks' def get_context_data(self, *args, **kwargs): context = super().get_context_data(**kwargs) From eb8e548c3f12400e075003ab7c7838b63122c55e Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sat, 4 Aug 2018 13:54:37 +0200 Subject: [PATCH 199/351] add Meetup eventtype in SpeakerProposalForm and EventProposalForm --- src/program/forms.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/program/forms.py b/src/program/forms.py index 7a1c1f05..bcd20b57 100644 --- a/src/program/forms.py +++ b/src/program/forms.py @@ -136,6 +136,22 @@ class SpeakerProposalForm(forms.ModelForm): # no free tickets for workshops del(self.fields['needs_oneday_ticket']) + elif eventtype.name == 'Meetup': + # fix label and help_text for the name field + self.fields['name'].label = 'Host Name' + self.fields['name'].help_text = 'The name of the meetup host. Can be a real name or an alias.' + + # fix label and help_text for the biograpy field + self.fields['biography'].label = 'Host Biography' + self.fields['biography'].help_text = 'The biography of the host.' + + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Host Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this host. Only visible to yourself and the BornHack organisers.' + + # no free tickets for workshops + del(self.fields['needs_oneday_ticket']) + else: raise ImproperlyConfigured("Unsupported event type, don't know which form class to use") @@ -281,6 +297,26 @@ class EventProposalForm(forms.ModelForm): self.fields['duration'].label = 'Event Duration' self.fields['duration'].help_text = 'How much time (in minutes) should we set aside for this event? Please keep it between 60 and 180 minutes (1-3 hours).' + elif eventtype.name == 'Meetup': + # fix label and help_text for the title field + self.fields['title'].label = 'Meetup Title' + self.fields['title'].help_text = 'The title of this meetup.' + + # fix label and help_text for the submission_notes field + self.fields['submission_notes'].label = 'Meetup Notes' + self.fields['submission_notes'].help_text = 'Private notes regarding this meetup. Only visible to yourself and the BornHack organisers.' + + # fix label and help_text for the abstract field + self.fields['abstract'].label = 'Meetup Abstract' + self.fields['abstract'].help_text = 'The description/abstract of this meetup. Explain what the meetup is about and who should attend.' + + # no video recording for meetups + del(self.fields['allow_video_recording']) + + # duration field + self.fields['duration'].label = 'Meetup Duration' + self.fields['duration'].help_text = 'How much time (in minutes) should we set aside for this meetup? Please keep it between 60 and 180 minutes (1-3 hours).' + else: raise ImproperlyConfigured("Unsupported event type, don't know which form class to use") From 73ec701b06de69ba42d2580c57105a47ab9e666b Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sat, 4 Aug 2018 17:38:09 +0200 Subject: [PATCH 200/351] add when and completed to teamtask model, move task list to an included file --- .../migrations/0043_auto_20180804_1641.py | 24 ++++++++++ src/teams/models.py | 10 +++++ src/teams/templates/includes/team_tasks.html | 44 +++++++++++++++++++ src/teams/templates/task_detail.html | 11 ++++- src/teams/templates/team_detail.html | 36 +-------------- src/teams/templates/team_manage.html | 4 ++ src/teams/views/tasks.py | 6 +-- 7 files changed, 95 insertions(+), 40 deletions(-) create mode 100644 src/teams/migrations/0043_auto_20180804_1641.py create mode 100644 src/teams/templates/includes/team_tasks.html diff --git a/src/teams/migrations/0043_auto_20180804_1641.py b/src/teams/migrations/0043_auto_20180804_1641.py new file mode 100644 index 00000000..e2460dc1 --- /dev/null +++ b/src/teams/migrations/0043_auto_20180804_1641.py @@ -0,0 +1,24 @@ +# Generated by Django 2.0.4 on 2018-08-04 14:41 + +import django.contrib.postgres.fields.ranges +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0042_auto_20180413_1933'), + ] + + operations = [ + migrations.AddField( + model_name='teamtask', + name='completed', + field=models.BooleanField(default=False, help_text='Check to mark this task as completed.'), + ), + migrations.AddField( + model_name='teamtask', + name='when', + field=django.contrib.postgres.fields.ranges.DateTimeRangeField(blank=True, help_text='When does this task need to be started and/or finished?', null=True), + ), + ] diff --git a/src/teams/models.py b/src/teams/models.py index b145c44b..e51320b5 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -4,6 +4,7 @@ from django.dispatch import receiver from django.utils.text import slugify from utils.models import CampRelatedModel from django.core.exceptions import ValidationError +from django.contrib.postgres.fields import DateTimeRangeField from django.contrib.auth.models import User from django.urls import reverse_lazy from django.conf import settings @@ -280,6 +281,15 @@ class TeamTask(CampRelatedModel): description = models.TextField( help_text='Description of the task. Markdown is supported.' ) + when = DateTimeRangeField( + blank=True, + null=True, + help_text='When does this task need to be started and/or finished?' + ) + completed = models.BooleanField( + help_text='Check to mark this task as completed.', + default=False + ) class Meta: ordering = ['name'] diff --git a/src/teams/templates/includes/team_tasks.html b/src/teams/templates/includes/team_tasks.html new file mode 100644 index 00000000..f285eef4 --- /dev/null +++ b/src/teams/templates/includes/team_tasks.html @@ -0,0 +1,44 @@ +
    +
    +

    Tasks

    +
    +
    +

    The {{ team.name }} Team is responsible for the following tasks

    + + + + + + + + + + + + {% for task in team.tasks.all %} + + + + + + + + {% endfor %} + +
    NameDescriptionWhenCompletedAction
    {{ task.name }}{{ task.description }} +
      +
    • Start: {{ task.when.lower|default:"N/A" }}
      +
    • Finish: {{ task.when.upper|default:"N/A" }}
      +
    +     		{{ task.completed }} + Details + {% if request.user in team.responsible_members.all %} + Edit Task + {% endif %} +
    + {% if request.user in team.responsible_members.all %} + Create Task + {% endif %} +
    +
    + diff --git a/src/teams/templates/task_detail.html b/src/teams/templates/task_detail.html index 69525bbe..d919d3d0 100644 --- a/src/teams/templates/task_detail.html +++ b/src/teams/templates/task_detail.html @@ -7,8 +7,15 @@ {% block content %}
    -

    Task: {{ task.name }}

    -
    {{ task.description|untrustedcommonmark }}
    +

    Task: {{ task.name }} ({% if not task.completed %}Not {% endif %}Completed)

    +
    + {{ task.description|untrustedcommonmark }} +
    +
      +
    • Start: {{ task.when.lower|default:"N/A" }}
      +
    • Finish: {{ task.when.upper|default:"N/A" }}
      +
    +
    This task belongs to the {{ task.team.name }} Team
    diff --git a/src/teams/templates/team_detail.html b/src/teams/templates/team_detail.html index 8c7c4096..2caa8544 100644 --- a/src/teams/templates/team_detail.html +++ b/src/teams/templates/team_detail.html @@ -53,41 +53,7 @@ Team: {{ team.name }} | {{ block.super }}
    -{# Team tasks #} -
    -
    -

    Tasks

    -
    -
    -

    The {{ team.name }} Team is responsible for the following tasks

    - - - - - - - - - - {% for task in team.tasks.all %} - - - - - - {% endfor %} - -
    NameDescriptionAction
    {{ task.name }}{{ task.description }} - Details - {% if request.user in team.responsible_members.all %} - Edit Task - {% endif %} -
    - {% if request.user in team.responsible_members.all %} - Create Task - {% endif %} -
    -
    +{% include 'includes/team_tasks.html' %} {# Team members #}
    diff --git a/src/teams/templates/team_manage.html b/src/teams/templates/team_manage.html index a1635c26..5e9b701b 100644 --- a/src/teams/templates/team_manage.html +++ b/src/teams/templates/team_manage.html @@ -94,5 +94,9 @@ Manage Team: {{ team.name }} | {{ block.super }} {% endif %}
    + +{% include 'includes/team_tasks.html' %} + {% endblock %} + diff --git a/src/teams/views/tasks.py b/src/teams/views/tasks.py index 5e661df0..ebd61398 100644 --- a/src/teams/views/tasks.py +++ b/src/teams/views/tasks.py @@ -16,7 +16,7 @@ class TaskDetailView(CampViewMixin, DetailView): class TaskCreateView(LoginRequiredMixin, CampViewMixin, EnsureTeamResponsibleMixin, CreateView): model = TeamTask template_name = "task_form.html" - fields = ['name', 'description'] + fields = ['name', 'description', 'when', 'completed'] def get_context_data(self, *args, **kwargs): context = super().get_context_data(**kwargs) @@ -38,7 +38,7 @@ class TaskCreateView(LoginRequiredMixin, CampViewMixin, EnsureTeamResponsibleMix class TaskUpdateView(LoginRequiredMixin, CampViewMixin, EnsureTeamResponsibleMixin, UpdateView): model = TeamTask template_name = "task_form.html" - fields = ['name', 'description'] + fields = ['name', 'description', 'when', 'completed'] def get_context_data(self, *args, **kwargs): context = super().get_context_data(**kwargs) @@ -54,4 +54,4 @@ class TaskUpdateView(LoginRequiredMixin, CampViewMixin, EnsureTeamResponsibleMix return HttpResponseRedirect(task.get_absolute_url()) def get_success_url(self): - return self.get_object().get_absolute_url() \ No newline at end of file + return self.get_object().get_absolute_url() From df3751ecb826745ed7a6106a4d80f022651bc612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 4 Aug 2018 18:13:51 +0200 Subject: [PATCH 201/351] Remove include since we have everything for tasks in one place now. --- src/teams/templates/includes/team_tasks.html | 44 -------------------- 1 file changed, 44 deletions(-) delete mode 100644 src/teams/templates/includes/team_tasks.html diff --git a/src/teams/templates/includes/team_tasks.html b/src/teams/templates/includes/team_tasks.html deleted file mode 100644 index f285eef4..00000000 --- a/src/teams/templates/includes/team_tasks.html +++ /dev/null @@ -1,44 +0,0 @@ -
    -
    -

    Tasks

    -
    -
    -

    The {{ team.name }} Team is responsible for the following tasks

    - - - - - - - - - - - - {% for task in team.tasks.all %} - - - - - - - - {% endfor %} - -
    NameDescriptionWhenCompletedAction
    {{ task.name }}{{ task.description }} -
      -
    • Start: {{ task.when.lower|default:"N/A" }}
      -
    • Finish: {{ task.when.upper|default:"N/A" }}
      -
    -     		{{ task.completed }} - Details - {% if request.user in team.responsible_members.all %} - Edit Task - {% endif %} -
    - {% if request.user in team.responsible_members.all %} - Create Task - {% endif %} -
    -
    - From ddd2d5d5dd201f134fd02f72d0c6932202139c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 4 Aug 2018 18:24:13 +0200 Subject: [PATCH 202/351] Forgot this for previous commit. --- src/teams/templates/team_tasks.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/teams/templates/team_tasks.html b/src/teams/templates/team_tasks.html index 3e71778b..30acae88 100644 --- a/src/teams/templates/team_tasks.html +++ b/src/teams/templates/team_tasks.html @@ -16,6 +16,8 @@ Name Description + When + Completed? Action @@ -24,6 +26,13 @@ {{ task.name }} {{ task.description }} + +
      +
    • Start: {{ task.when.lower|default:"N/A" }}
      +
    • Finish: {{ task.when.upper|default:"N/A" }}
      +
    + + {{ task.completed }} Details {% if request.user in team.responsible_members.all %} From 9d6f4d29028e8b58f61a5e4511a94b0236f08f78 Mon Sep 17 00:00:00 2001 From: Thomas Flummer Date: Sun, 5 Aug 2018 00:15:04 +0200 Subject: [PATCH 203/351] Give icons fixed width so that they are not crammed together --- schedule/src/Views/ScheduleOverview.elm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/schedule/src/Views/ScheduleOverview.elm b/schedule/src/Views/ScheduleOverview.elm index 8e1f7fe9..9333862f 100644 --- a/schedule/src/Views/ScheduleOverview.elm +++ b/schedule/src/Views/ScheduleOverview.elm @@ -80,25 +80,25 @@ dayEventInstanceIcons eventInstance = case eventInstance.videoState of "has-recording" -> [ i - [ classList [ ( "fa", True ), ( "fa-film", True ), ( "pull-right", True ) ] ] + [ classList [ ( "fa", True ), ( "fa-film", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] [] ] "to-be-recorded" -> [ i - [ classList [ ( "fa", True ), ( "fa-video-camera", True ), ( "pull-right", True ) ] ] + [ classList [ ( "fa", True ), ( "fa-video-camera", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] [] ] "not-to-be-recorded" -> [ i - [ classList [ ( "fa", True ), ( "fa-ban", True ), ( "pull-right", True ) ] ] + [ classList [ ( "fa", True ), ( "fa-ban", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] [] ] _ -> [] in - [ i [ classList [ ( "fa", True ), ( "fa-" ++ eventInstance.locationIcon, True ), ( "pull-right", True ) ] ] [] + [ i [ classList [ ( "fa", True ), ( "fa-" ++ eventInstance.locationIcon, True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] [] ] ++ videoIcon From d6a2151cdfad28ac6c615f96d16361afdc121e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 5 Aug 2018 00:18:51 +0200 Subject: [PATCH 204/351] Rename placeholder for DateTimeRangeField - it is not the most elegant API to work with. --- src/teams/views/tasks.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/teams/views/tasks.py b/src/teams/views/tasks.py index 2d8dac74..aaaed31b 100644 --- a/src/teams/views/tasks.py +++ b/src/teams/views/tasks.py @@ -1,6 +1,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.http import HttpResponseRedirect from django.views.generic import DetailView, CreateView, UpdateView +from django import forms from camps.mixins import CampViewMixin from ..models import Team, TeamTask @@ -22,10 +23,27 @@ class TaskDetailView(CampViewMixin, TeamViewMixin, DetailView): active_menu = 'tasks' +class TaskForm(forms.ModelForm): + class Meta: + model = TeamTask + fields = ['name', 'description', 'when', 'completed'] + + def __init__(self, **kwargs): + super().__init__(**kwargs) + self.fields['when'].widget.widgets = [ + forms.DateTimeInput( + attrs={"placeholder": "Start"} + ), + forms.DateTimeInput( + attrs={"placeholder": "End"} + ) + ] + + class TaskCreateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTeamResponsibleMixin, CreateView): model = TeamTask template_name = "task_form.html" - fields = ['name', 'description', 'when', 'completed'] + form_class = TaskForm active_menu = 'tasks' def get_team(self): @@ -49,7 +67,7 @@ class TaskCreateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTea class TaskUpdateView(LoginRequiredMixin, CampViewMixin, TeamViewMixin, EnsureTeamResponsibleMixin, UpdateView): model = TeamTask template_name = "task_form.html" - fields = ['name', 'description', 'when', 'completed'] + form_class = TaskForm active_menu = 'tasks' def get_context_data(self, *args, **kwargs): From 14c88cc9e4d448dd02cb9a50a35bd127b542395d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 5 Aug 2018 00:22:16 +0200 Subject: [PATCH 205/351] Update the compiled version of the scedule. --- src/program/static/js/elm_based_schedule.js | 24 +++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/program/static/js/elm_based_schedule.js b/src/program/static/js/elm_based_schedule.js index 588de4dc..c4174b68 100644 --- a/src/program/static/js/elm_based_schedule.js +++ b/src/program/static/js/elm_based_schedule.js @@ -16384,7 +16384,11 @@ var _user$project$Views_ScheduleOverview$dayEventInstanceIcons = function (event _1: { ctor: '::', _0: {ctor: '_Tuple2', _0: 'pull-right', _1: true}, - _1: {ctor: '[]'} + _1: { + ctor: '::', + _0: {ctor: '_Tuple2', _0: 'fa-fw', _1: true}, + _1: {ctor: '[]'} + } } } }), @@ -16410,7 +16414,11 @@ var _user$project$Views_ScheduleOverview$dayEventInstanceIcons = function (event _1: { ctor: '::', _0: {ctor: '_Tuple2', _0: 'pull-right', _1: true}, - _1: {ctor: '[]'} + _1: { + ctor: '::', + _0: {ctor: '_Tuple2', _0: 'fa-fw', _1: true}, + _1: {ctor: '[]'} + } } } }), @@ -16436,7 +16444,11 @@ var _user$project$Views_ScheduleOverview$dayEventInstanceIcons = function (event _1: { ctor: '::', _0: {ctor: '_Tuple2', _0: 'pull-right', _1: true}, - _1: {ctor: '[]'} + _1: { + ctor: '::', + _0: {ctor: '_Tuple2', _0: 'fa-fw', _1: true}, + _1: {ctor: '[]'} + } } } }), @@ -16471,7 +16483,11 @@ var _user$project$Views_ScheduleOverview$dayEventInstanceIcons = function (event _1: { ctor: '::', _0: {ctor: '_Tuple2', _0: 'pull-right', _1: true}, - _1: {ctor: '[]'} + _1: { + ctor: '::', + _0: {ctor: '_Tuple2', _0: 'fa-fw', _1: true}, + _1: {ctor: '[]'} + } } } }), From 458ce451982af67ceae6f0d64fb62dd0c907dc13 Mon Sep 17 00:00:00 2001 From: Thomas Steen Rasmussen Date: Sun, 5 Aug 2018 09:29:58 +0200 Subject: [PATCH 206/351] add village gear sections to backoffice --- src/backoffice/templates/index.html | 8 +++ src/backoffice/templates/orders_village.html | 51 +++++++++++++++++++ .../templates/village_to_order.html | 44 ++++++++++++++++ src/backoffice/urls.py | 2 + src/backoffice/views.py | 47 +++++++++++++++++ 5 files changed, 152 insertions(+) create mode 100644 src/backoffice/templates/orders_village.html create mode 100644 src/backoffice/templates/village_to_order.html diff --git a/src/backoffice/templates/index.html b/src/backoffice/templates/index.html index c121fe43..c8b94755 100644 --- a/src/backoffice/templates/index.html +++ b/src/backoffice/templates/index.html @@ -42,6 +42,14 @@

    Merchandise To Order

    Use this view to generate a list of merchandise that needs to be ordered

    + +

    Village Orders

    +

    Use this view to look at Village category OrderProductRelations

    +     + +

    Village Gear To Order

    +

    Use this view to generate a list of village gear that needs to be ordered

    +
    diff --git a/src/backoffice/templates/orders_village.html b/src/backoffice/templates/orders_village.html new file mode 100644 index 00000000..93ccbd3c --- /dev/null +++ b/src/backoffice/templates/orders_village.html @@ -0,0 +1,51 @@ +{% extends 'base.html' %} +{% load commonmark %} +{% load static from staticfiles %} +{% load imageutils %} +{% block extra_head %} + + +{% endblock extra_head %} +{% block content %} +
    +

    Village Orders

    +
    + Use this view to look at village orders.
    +
    + This table shows all OrderProductRelations which are in the Village category (not including handed out, unpaid, cancelled and refunded orders). The table is initally sorted by order ID but the sorting can be changed by clicking the column headlines (if javascript is enabled). +
    +
    +
    +
    + + + + + + + + + + + + + {% for productrel in orderproductrelation_list %} + + + + + + + + + {% endfor %} + +
    OrderUserEmailOPR IdProductQuantity
    Order #{{ productrel.order.id }}{{ productrel.order.user }}{{ productrel.order.user.email }}{{ productrel.id }}{{ productrel.product.name }}{{ productrel.quantity }}
    +
    + + +{% endblock content %} diff --git a/src/backoffice/templates/village_to_order.html b/src/backoffice/templates/village_to_order.html new file mode 100644 index 00000000..ae3501c0 --- /dev/null +++ b/src/backoffice/templates/village_to_order.html @@ -0,0 +1,44 @@ +{% extends 'base.html' %} +{% load commonmark %} +{% load static from staticfiles %} +{% load imageutils %} +{% block extra_head %} + + +{% endblock extra_head %} +{% block content %} +
    +

    Village Gear To Order

    +
    + This is a list of village gear to order from our supplier +
    +
    + This table shows all different village stuff that needs to be ordered +
    +
    +
    +
    + + + + + + + + + {% for key, val in village.items %} + + + + + {% endfor %} + +
    TypeQuantity
    {{ key }}{{ val }}
    +
    + + +{% endblock content %} diff --git a/src/backoffice/urls.py b/src/backoffice/urls.py index f48cced5..df740b38 100644 --- a/src/backoffice/urls.py +++ b/src/backoffice/urls.py @@ -17,5 +17,7 @@ urlpatterns = [ path('speakers//', SpeakerProposalManageView.as_view(), name='speakerproposal_manage'), path('events//', EventProposalManageView.as_view(), name='eventproposal_manage'), ])), + path('village_orders/', VillageOrdersView.as_view(), name='village_orders'), + path('village_to_order/', VillageToOrderView.as_view(), name='village_to_order'), ] diff --git a/src/backoffice/views.py b/src/backoffice/views.py index 06af7073..d75868f7 100644 --- a/src/backoffice/views.py +++ b/src/backoffice/views.py @@ -168,3 +168,50 @@ class MerchandiseToOrderView(BackofficeViewMixin, TemplateView): context = super().get_context_data(**kwargs) context['merchandise'] = merchandise_orders return context + + +class VillageOrdersView(BackofficeViewMixin, ListView): + template_name = "orders_village.html" + + def get_queryset(self, **kwargs): + camp_prefix = 'BornHack {}'.format(timezone.now().year) + + return OrderProductRelation.objects.filter( + handed_out=False, + order__paid=True, + order__refunded=False, + order__cancelled=False, + product__category__name='Villages', + ).filter( + product__name__startswith=camp_prefix + ).order_by('order') + + +class VillageToOrderView(BackofficeViewMixin, TemplateView): + template_name = "village_to_order.html" + + def get_context_data(self, **kwargs): + camp_prefix = 'BornHack {}'.format(timezone.now().year) + + order_relations = OrderProductRelation.objects.filter( + handed_out=False, + order__paid=True, + order__refunded=False, + order__cancelled=False, + product__category__name='Villages', + ).filter( + product__name__startswith=camp_prefix + ) + + village_orders = {} + for relation in order_relations: + try: + quantity = village_orders[relation.product.name] + relation.quantity + village_orders[relation.product.name] = quantity + except KeyError: + village_orders[relation.product.name] = relation.quantity + + context = super().get_context_data(**kwargs) + context['village'] = village_orders + return context + From 214026dfd7a2a9291deaf4a7b190925e77750f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 5 Aug 2018 12:18:10 +0200 Subject: [PATCH 207/351] Integrate into new teams structure. --- .../migrations/0045_merge_20180805_1131.py | 14 +++++++++++++ .../shifts/shift_confirm_delete.html | 16 --------------- src/teams/templates/team_base.html | 6 ++++++ .../templates/team_shift_confirm_delete.html | 10 ++++++++++ .../shift_form.html => team_shift_form.html} | 11 ++-------- .../shift_list.html => team_shift_list.html} | 11 ++-------- src/teams/urls.py | 2 +- src/teams/views/shifts.py | 20 +++++++++---------- 8 files changed, 45 insertions(+), 45 deletions(-) create mode 100644 src/teams/migrations/0045_merge_20180805_1131.py delete mode 100644 src/teams/templates/shifts/shift_confirm_delete.html create mode 100644 src/teams/templates/team_shift_confirm_delete.html rename src/teams/templates/{shifts/shift_form.html => team_shift_form.html} (55%) rename src/teams/templates/{shifts/shift_list.html => team_shift_list.html} (91%) diff --git a/src/teams/migrations/0045_merge_20180805_1131.py b/src/teams/migrations/0045_merge_20180805_1131.py new file mode 100644 index 00000000..5eb121ee --- /dev/null +++ b/src/teams/migrations/0045_merge_20180805_1131.py @@ -0,0 +1,14 @@ +# Generated by Django 2.0.4 on 2018-08-05 09:31 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0044_auto_20180702_1507'), + ('teams', '0043_auto_20180804_1641'), + ] + + operations = [ + ] diff --git a/src/teams/templates/shifts/shift_confirm_delete.html b/src/teams/templates/shifts/shift_confirm_delete.html deleted file mode 100644 index 57ee688b..00000000 --- a/src/teams/templates/shifts/shift_confirm_delete.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} - - Cancel - - -
    - -
    {% csrf_token %} -

    Are you sure you want to delete "{{ object }}"?

    - -
    - -{% endblock %} diff --git a/src/teams/templates/team_base.html b/src/teams/templates/team_base.html index 8ef87216..3b36ede8 100644 --- a/src/teams/templates/team_base.html +++ b/src/teams/templates/team_base.html @@ -37,6 +37,12 @@ Team: {{ team.name }} | {{ block.super }} +
  • + + Shifts + +
    • + {% if request.user in team.responsible_members.all %}
  • diff --git a/src/teams/templates/team_shift_confirm_delete.html b/src/teams/templates/team_shift_confirm_delete.html new file mode 100644 index 00000000..51b3992c --- /dev/null +++ b/src/teams/templates/team_shift_confirm_delete.html @@ -0,0 +1,10 @@ +{% extends 'team_base.html' %} + +{% block team_content %} + +
    {% csrf_token %} +

    Are you sure you want to delete "{{ object }}"?

    + +
    + +{% endblock %} diff --git a/src/teams/templates/shifts/shift_form.html b/src/teams/templates/team_shift_form.html similarity index 55% rename from src/teams/templates/shifts/shift_form.html rename to src/teams/templates/team_shift_form.html index 511ba5ce..a8f9da76 100644 --- a/src/teams/templates/shifts/shift_form.html +++ b/src/teams/templates/team_shift_form.html @@ -1,16 +1,9 @@ -{% extends 'base.html' %} +{% extends 'team_base.html' %} {% load commonmark %} {% load bootstrap3 %} -{% block content %} - -     - Cancel - - -
    +{% block team_content %}
    {% csrf_token %} diff --git a/src/teams/templates/shifts/shift_list.html b/src/teams/templates/team_shift_list.html similarity index 91% rename from src/teams/templates/shifts/shift_list.html rename to src/teams/templates/team_shift_list.html index c01710db..42f2ddb3 100644 --- a/src/teams/templates/shifts/shift_list.html +++ b/src/teams/templates/team_shift_list.html @@ -1,16 +1,9 @@ -{% extends 'base.html' %} +{% extends 'team_base.html' %} {% load commonmark %} {% load bootstrap3 %} -{% block content %} - - - Back to team detail - - -
    +{% block team_content %} {% if request.user in team.responsible_members.all %} Date: Sun, 5 Aug 2018 12:23:33 +0200 Subject: [PATCH 208/351] Show email for users when user is team responsible. --- src/teams/templates/team_members.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/teams/templates/team_members.html b/src/teams/templates/team_members.html index b3fef15a..bf55476d 100644 --- a/src/teams/templates/team_members.html +++ b/src/teams/templates/team_members.html @@ -22,6 +22,9 @@ Status {% if request.user in team.responsible_members.all %} + + Email + Action @@ -40,6 +43,9 @@ {% if not member.approved %}(pending approval){% endif %} {% if request.user in team.responsible_members.all %} + + {{ member.user.email }} +
    Date: Sun, 5 Aug 2018 12:42:18 +0200 Subject: [PATCH 209/351] Fixing video icon and using another icon for non-recording. --- schedule/src/Views/FilterView.elm | 4 ++-- schedule/src/Views/ScheduleOverview.elm | 4 ++-- src/program/static/js/elm_based_schedule.js | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/schedule/src/Views/FilterView.elm b/schedule/src/Views/FilterView.elm index 6cfd6093..4ba483d3 100644 --- a/schedule/src/Views/FilterView.elm +++ b/schedule/src/Views/FilterView.elm @@ -224,10 +224,10 @@ filterChoiceView filter currentFilters eventInstances slugLike = "film" "to-be-recorded" -> - "video-camera" + "video" "not-to-be-recorded" -> - "ban" + "video-slash" _ -> "" diff --git a/schedule/src/Views/ScheduleOverview.elm b/schedule/src/Views/ScheduleOverview.elm index 9333862f..95e533f1 100644 --- a/schedule/src/Views/ScheduleOverview.elm +++ b/schedule/src/Views/ScheduleOverview.elm @@ -86,13 +86,13 @@ dayEventInstanceIcons eventInstance = "to-be-recorded" -> [ i - [ classList [ ( "fa", True ), ( "fa-video-camera", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] + [ classList [ ( "fa", True ), ( "fa-video", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] [] ] "not-to-be-recorded" -> [ i - [ classList [ ( "fa", True ), ( "fa-ban", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] + [ classList [ ( "fa", True ), ( "fa-video-slash", True ), ( "pull-right", True ), ( "fa-fw", True ) ] ] [] ] diff --git a/src/program/static/js/elm_based_schedule.js b/src/program/static/js/elm_based_schedule.js index c4174b68..7adb6ddb 100644 --- a/src/program/static/js/elm_based_schedule.js +++ b/src/program/static/js/elm_based_schedule.js @@ -14453,9 +14453,9 @@ var _user$project$Views_FilterView$filterChoiceView = F4( case 'has-recording': return 'film'; case 'to-be-recorded': - return 'video-camera'; + return 'video'; case 'not-to-be-recorded': - return 'ban'; + return 'video-slash'; default: return ''; } @@ -16410,7 +16410,7 @@ var _user$project$Views_ScheduleOverview$dayEventInstanceIcons = function (event _0: {ctor: '_Tuple2', _0: 'fa', _1: true}, _1: { ctor: '::', - _0: {ctor: '_Tuple2', _0: 'fa-video-camera', _1: true}, + _0: {ctor: '_Tuple2', _0: 'fa-video', _1: true}, _1: { ctor: '::', _0: {ctor: '_Tuple2', _0: 'pull-right', _1: true}, @@ -16440,7 +16440,7 @@ var _user$project$Views_ScheduleOverview$dayEventInstanceIcons = function (event _0: {ctor: '_Tuple2', _0: 'fa', _1: true}, _1: { ctor: '::', - _0: {ctor: '_Tuple2', _0: 'fa-ban', _1: true}, + _0: {ctor: '_Tuple2', _0: 'fa-video-slash', _1: true}, _1: { ctor: '::', _0: {ctor: '_Tuple2', _0: 'pull-right', _1: true}, From a33e932858b9b80e529f2fcd4c727376bac432c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 5 Aug 2018 18:21:30 +0200 Subject: [PATCH 210/351] Small representation fix. --- src/teams/models.py | 7 +++++++ src/teams/templates/team_shift_confirm_delete.html | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/teams/models.py b/src/teams/models.py index 5200cd14..f376fc85 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -349,3 +349,10 @@ class TeamShift(CampRelatedModel): return self.team.camp camp_filter = 'team__camp' + + def __str__(self): + return "{} team shift from {} to {}".format( + self.team.name, + self.shift_range.lower, + self.shift_range.upper + ) diff --git a/src/teams/templates/team_shift_confirm_delete.html b/src/teams/templates/team_shift_confirm_delete.html index 51b3992c..16a9ece2 100644 --- a/src/teams/templates/team_shift_confirm_delete.html +++ b/src/teams/templates/team_shift_confirm_delete.html @@ -3,7 +3,7 @@ {% block team_content %} {% csrf_token %} -

    Are you sure you want to delete "{{ object }}"?

    +

    Are you sure you want to delete {{ object }}?

    From db5a2e1d92e478b808fb36d75fe4faa87a3adc9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 5 Aug 2018 18:31:43 +0200 Subject: [PATCH 211/351] Hide shifts for non-members. --- src/teams/templates/team_base.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/teams/templates/team_base.html b/src/teams/templates/team_base.html index 3b36ede8..2b1e84db 100644 --- a/src/teams/templates/team_base.html +++ b/src/teams/templates/team_base.html @@ -37,11 +37,13 @@ Team: {{ team.name }} | {{ block.super }}
    • + {% if request.user in team.members.all %}
  • Shifts
    • + {% endif %} {% if request.user in team.responsible_members.all %}
  • From 86ed7a82e89cebb2d1893730c87401968318459d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 5 Aug 2018 18:36:57 +0200 Subject: [PATCH 212/351] Forgot to mark shift views as shift views so the menu pick it up --- src/teams/views/shifts.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/teams/views/shifts.py b/src/teams/views/shifts.py index 29d47115..17d41bdd 100644 --- a/src/teams/views/shifts.py +++ b/src/teams/views/shifts.py @@ -28,6 +28,7 @@ class ShiftListView(LoginRequiredMixin, CampViewMixin, ListView): model = TeamShift template_name = "team_shift_list.html" context_object_name = "shifts" + active_menu = "shifts" def get_queryset(self): queryset = super().get_queryset() @@ -133,6 +134,7 @@ class ShiftCreateView(LoginRequiredMixin, CampViewMixin, CreateView): model = TeamShift template_name = "team_shift_form.html" form_class = ShiftForm + active_menu = "shifts" def get_form_kwargs(self): kwargs = super().get_form_kwargs() @@ -166,6 +168,7 @@ class ShiftUpdateView(LoginRequiredMixin, CampViewMixin, UpdateView): model = TeamShift template_name = "team_shift_form.html" form_class = ShiftForm + active_menu = "shifts" def get_form_kwargs(self): kwargs = super().get_form_kwargs() @@ -188,6 +191,7 @@ class ShiftUpdateView(LoginRequiredMixin, CampViewMixin, UpdateView): class ShiftDeleteView(LoginRequiredMixin, CampViewMixin, DeleteView): model = TeamShift template_name = "team_shift_confirm_delete.html" + active_menu = "shifts" def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -228,6 +232,7 @@ class MultipleShiftForm(forms.Form): class ShiftCreateMultipleView(LoginRequiredMixin, CampViewMixin, FormView): template_name = "team_shift_form.html" form_class = MultipleShiftForm + active_menu = "shifts" def get_form_kwargs(self): kwargs = super().get_form_kwargs() From 88152776e35f1b706ad2e2b4bd31e3a3281a84aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 5 Aug 2018 18:48:58 +0200 Subject: [PATCH 213/351] Include buildup and teardown in available shifts days. --- src/teams/views/shifts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/teams/views/shifts.py b/src/teams/views/shifts.py index 17d41bdd..0a3d3694 100644 --- a/src/teams/views/shifts.py +++ b/src/teams/views/shifts.py @@ -68,8 +68,8 @@ def date_choices(camp): choices = [] - current_date = camp.camp.lower.date() - while current_date != camp.camp.upper.date(): + current_date = camp.buildup.lower.date() + while current_date != camp.teardown.upper.date(): choices.append( ( current_date, From 2ac86d661c67de8dc503ee46545e85b3fd06c0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 6 Aug 2018 10:17:22 +0200 Subject: [PATCH 214/351] Forgot a spot. --- src/teams/templates/task_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/teams/templates/task_detail.html b/src/teams/templates/task_detail.html index f2938c71..6e346877 100644 --- a/src/teams/templates/task_detail.html +++ b/src/teams/templates/task_detail.html @@ -16,7 +16,7 @@
  • Finish: {{ task.when.upper|default:"N/A" }}
    • -
    This task belongs to the {{ task.team.name }} Team
    +
    This task belongs to the {{ task.team.name }} Team
    From 25f40b381b2402c8a0cdc2dbe7526fb6ae9be22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 6 Aug 2018 21:11:39 +0200 Subject: [PATCH 215/351] Fix filter in link to schedule from event list. --- src/program/templates/event_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/program/templates/event_list.html b/src/program/templates/event_list.html index d8f90eb6..3389fe50 100644 --- a/src/program/templates/event_list.html +++ b/src/program/templates/event_list.html @@ -21,7 +21,7 @@ {% if event.event_type.include_in_event_list %} - + {{ event.event_type.name }} From ca33f8c5eb0ff101ac266e4e96ae6a3558a46974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Wed, 8 Aug 2018 14:36:31 +0200 Subject: [PATCH 216/351] Make it possible to drop a shift. --- src/teams/models.py | 4 ++++ src/teams/templates/team_shift_list.html | 7 +++++- src/teams/urls.py | 6 ++++++ src/teams/views/shifts.py | 27 +++++++++++++++++++++++- 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/src/teams/models.py b/src/teams/models.py index f376fc85..f78aba71 100644 --- a/src/teams/models.py +++ b/src/teams/models.py @@ -356,3 +356,7 @@ class TeamShift(CampRelatedModel): self.shift_range.lower, self.shift_range.upper ) + + @property + def users(self): + return [member.user for member in self.team_members.all()] diff --git a/src/teams/templates/team_shift_list.html b/src/teams/templates/team_shift_list.html index 42f2ddb3..063cc077 100644 --- a/src/teams/templates/team_shift_list.html +++ b/src/teams/templates/team_shift_list.html @@ -63,7 +63,12 @@ Delete {% endif %} - {% if shift.people_required > shift.team_members.count %} + {% if user in shift.users %} + + Drop it! + + {% elif shift.people_required > shift.team_members.count %} Take it! diff --git a/src/teams/urls.py b/src/teams/urls.py index d2c116c2..37100380 100644 --- a/src/teams/urls.py +++ b/src/teams/urls.py @@ -36,6 +36,7 @@ from teams.views.shifts import ( ShiftUpdateView, ShiftDeleteView, MemberTakesShift, + MemberDropsShift, ) app_name = 'teams' @@ -186,6 +187,11 @@ urlpatterns = [ MemberTakesShift.as_view(), name="shift_member_take" ), + path( + 'drop', + MemberDropsShift.as_view(), + name="shift_member_drop" + ), ])), ])) ]), diff --git a/src/teams/views/shifts.py b/src/teams/views/shifts.py index 0a3d3694..cb4fe026 100644 --- a/src/teams/views/shifts.py +++ b/src/teams/views/shifts.py @@ -286,7 +286,7 @@ class ShiftCreateMultipleView(LoginRequiredMixin, CampViewMixin, FormView): return context -class MemberTakesShift(CampViewMixin, View): +class MemberTakesShift(LoginRequiredMixin, CampViewMixin, View): http_methods = ['get'] @@ -309,3 +309,28 @@ class MemberTakesShift(CampViewMixin, View): kwargs=kwargs ) ) + + +class MemberDropsShift(LoginRequiredMixin, CampViewMixin, View): + + http_methods = ['get'] + + def get(self, request, **kwargs): + shift = TeamShift.objects.get(id=kwargs['pk']) + team = Team.objects.get( + camp=self.camp, + slug=kwargs['team_slug'] + ) + + team_member = TeamMember.objects.get(team=team, user=request.user) + + shift.team_members.remove(team_member) + + kwargs.pop('pk') + + return HttpResponseRedirect( + reverse( + 'teams:shifts', + kwargs=kwargs + ) + ) From 8076f0c380e0cbb543ace164c5c7584111f53489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Wed, 8 Aug 2018 14:37:41 +0200 Subject: [PATCH 217/351] Use assign/unassign on button. --- src/teams/templates/team_shift_list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/teams/templates/team_shift_list.html b/src/teams/templates/team_shift_list.html index 063cc077..9d02d80c 100644 --- a/src/teams/templates/team_shift_list.html +++ b/src/teams/templates/team_shift_list.html @@ -66,12 +66,12 @@ {% if user in shift.users %} - Drop it! + Unassign me {% elif shift.people_required > shift.team_members.count %} - Take it! + Assign me {% endif %} {% endfor %} From badd18cb1bced6c2e1dc137712b1a77f0bf01843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Wed, 8 Aug 2018 14:41:20 +0200 Subject: [PATCH 218/351] Fix apparently intentional off by one error when creating multiple shifts. --- src/teams/views/shifts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/teams/views/shifts.py b/src/teams/views/shifts.py index cb4fe026..7a436462 100644 --- a/src/teams/views/shifts.py +++ b/src/teams/views/shifts.py @@ -255,7 +255,7 @@ class ShiftCreateMultipleView(LoginRequiredMixin, CampViewMixin, FormView): people_required = form.cleaned_data['people_required'] shifts = [] - for index in range(number_of_shifts + 1): + for index in range(number_of_shifts): shift_range = DateTimeTZRange( start_datetime, start_datetime + timezone.timedelta(minutes=shift_length), From 1c8685d15e9ab2006af1dac867e99162d7de781e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Wed, 8 Aug 2018 22:18:39 +0200 Subject: [PATCH 219/351] Initial work on rideshare feature. --- src/bornhack/settings.py | 1 + src/bornhack/urls.py | 5 +++ src/rideshare/__init__.py | 0 src/rideshare/admin.py | 3 ++ src/rideshare/apps.py | 5 +++ src/rideshare/migrations/0001_initial.py | 36 ++++++++++++++++ src/rideshare/migrations/__init__.py | 0 src/rideshare/models.py | 22 ++++++++++ .../rideshare/ride_confirm_delete.html | 10 +++++ .../templates/rideshare/ride_detail.html | 12 ++++++ .../templates/rideshare/ride_form.html | 15 +++++++ .../templates/rideshare/ride_list.html | 18 ++++++++ src/rideshare/tests.py | 3 ++ src/rideshare/urls.py | 43 +++++++++++++++++++ src/rideshare/views.py | 43 +++++++++++++++++++ src/templates/includes/menuitems.html | 1 + 16 files changed, 217 insertions(+) create mode 100644 src/rideshare/__init__.py create mode 100644 src/rideshare/admin.py create mode 100644 src/rideshare/apps.py create mode 100644 src/rideshare/migrations/0001_initial.py create mode 100644 src/rideshare/migrations/__init__.py create mode 100644 src/rideshare/models.py create mode 100644 src/rideshare/templates/rideshare/ride_confirm_delete.html create mode 100644 src/rideshare/templates/rideshare/ride_detail.html create mode 100644 src/rideshare/templates/rideshare/ride_form.html create mode 100644 src/rideshare/templates/rideshare/ride_list.html create mode 100644 src/rideshare/tests.py create mode 100644 src/rideshare/urls.py create mode 100644 src/rideshare/views.py diff --git a/src/bornhack/settings.py b/src/bornhack/settings.py index 8bf4cd27..91590962 100644 --- a/src/bornhack/settings.py +++ b/src/bornhack/settings.py @@ -46,6 +46,7 @@ INSTALLED_APPS = [ 'bar', 'backoffice', 'events', + 'rideshare', 'allauth', 'allauth.account', diff --git a/src/bornhack/urls.py b/src/bornhack/urls.py index cda0e36c..fb665d83 100644 --- a/src/bornhack/urls.py +++ b/src/bornhack/urls.py @@ -182,6 +182,11 @@ urlpatterns = [ include('teams.urls', namespace='teams') ), + path( + 'rideshare/', + include('rideshare.urls', namespace='rideshare') + ), + path( 'backoffice/', include('backoffice.urls', namespace='backoffice') diff --git a/src/rideshare/__init__.py b/src/rideshare/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/rideshare/admin.py b/src/rideshare/admin.py new file mode 100644 index 00000000..8c38f3f3 --- /dev/null +++ b/src/rideshare/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/src/rideshare/apps.py b/src/rideshare/apps.py new file mode 100644 index 00000000..9a8b366f --- /dev/null +++ b/src/rideshare/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class RideshareConfig(AppConfig): + name = 'rideshare' diff --git a/src/rideshare/migrations/0001_initial.py b/src/rideshare/migrations/0001_initial.py new file mode 100644 index 00000000..b1a843f3 --- /dev/null +++ b/src/rideshare/migrations/0001_initial.py @@ -0,0 +1,36 @@ +# Generated by Django 2.0.4 on 2018-08-08 20:18 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import uuid + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('camps', '0028_auto_20180525_1025'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Ride', + fields=[ + ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('created', models.DateTimeField(auto_now_add=True)), + ('updated', models.DateTimeField(auto_now=True)), + ('seats', models.PositiveIntegerField()), + ('location', models.CharField(max_length=100)), + ('when', models.DateTimeField()), + ('description', models.TextField()), + ('camp', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='camps.Camp')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'abstract': False, + }, + ), + ] diff --git a/src/rideshare/migrations/__init__.py b/src/rideshare/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/rideshare/models.py b/src/rideshare/models.py new file mode 100644 index 00000000..c06cca1c --- /dev/null +++ b/src/rideshare/models.py @@ -0,0 +1,22 @@ +from django.db import models +from django.urls import reverse + +from utils.models import UUIDModel, CampRelatedModel + + +class Ride(UUIDModel, CampRelatedModel): + camp = models.ForeignKey('camps.Camp', on_delete=models.PROTECT) + user = models.ForeignKey('auth.User', on_delete=models.PROTECT) + seats = models.PositiveIntegerField() + location = models.CharField(max_length=100) + when = models.DateTimeField() + description = models.TextField() + + def get_absolute_url(self): + return reverse( + 'rideshare:detail', + kwargs={ + 'pk': self.pk, + 'camp_slug': self.camp.slug + } + ) diff --git a/src/rideshare/templates/rideshare/ride_confirm_delete.html b/src/rideshare/templates/rideshare/ride_confirm_delete.html new file mode 100644 index 00000000..73d954b8 --- /dev/null +++ b/src/rideshare/templates/rideshare/ride_confirm_delete.html @@ -0,0 +1,10 @@ +{% extends 'base.html' %} + +{% block content %} + +
    {% csrf_token %} +

    Are you sure you want to delete {{ object }}?

    + +
    + +{% endblock %} diff --git a/src/rideshare/templates/rideshare/ride_detail.html b/src/rideshare/templates/rideshare/ride_detail.html new file mode 100644 index 00000000..6e41af13 --- /dev/null +++ b/src/rideshare/templates/rideshare/ride_detail.html @@ -0,0 +1,12 @@ +{% extends 'base.html' %} +{% load commonmark %} + +{% block content %} + +{{ object.location }} + +{{ object.datetime }} + +{{ object.description }} + +{% endblock %} diff --git a/src/rideshare/templates/rideshare/ride_form.html b/src/rideshare/templates/rideshare/ride_form.html new file mode 100644 index 00000000..c520b609 --- /dev/null +++ b/src/rideshare/templates/rideshare/ride_form.html @@ -0,0 +1,15 @@ +{% extends 'base.html' %} +{% load commonmark %} +{% load bootstrap3 %} + +{% block content %} + +
    + {% csrf_token %} + {% bootstrap_form form %} + +
    + +{% endblock %} diff --git a/src/rideshare/templates/rideshare/ride_list.html b/src/rideshare/templates/rideshare/ride_list.html new file mode 100644 index 00000000..41ebf72c --- /dev/null +++ b/src/rideshare/templates/rideshare/ride_list.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} + +{% block content %} + + + Create ride + + +
    + +{% for ride in ride_list %} + + {{ ride.from_location }} at {{ ride.from_datetime}} + + +{% endfor %} + +{% endblock %} diff --git a/src/rideshare/tests.py b/src/rideshare/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/src/rideshare/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/rideshare/urls.py b/src/rideshare/urls.py new file mode 100644 index 00000000..e528e248 --- /dev/null +++ b/src/rideshare/urls.py @@ -0,0 +1,43 @@ +from django.urls import path, include + +from .views import ( + RideList, + RideCreate, + RideDetail, + RideUpdate, + RideDelete, +) + +app_name = 'rideshare' + +urlpatterns = [ + path( + '', + RideList.as_view(), + name='list' + ), + path( + 'create/', + RideCreate.as_view(), + name='create' + ), + path( + '/', include([ + path( + '', + RideDetail.as_view(), + name='detail' + ), + path( + 'update/', + RideUpdate.as_view(), + name='update' + ), + path( + 'delete/', + RideDelete.as_view(), + name='delete' + ), + ]) + ) +] diff --git a/src/rideshare/views.py b/src/rideshare/views.py new file mode 100644 index 00000000..de0eaa03 --- /dev/null +++ b/src/rideshare/views.py @@ -0,0 +1,43 @@ +from django.contrib.auth.mixins import LoginRequiredMixin +from django.views.generic import ( + ListView, + DetailView, + CreateView, + UpdateView, + DeleteView, +) +from django.http import HttpResponseRedirect + +from camps.mixins import CampViewMixin + +from .models import Ride + + +class RideList(LoginRequiredMixin, CampViewMixin, ListView): + model = Ride + + +class RideDetail(LoginRequiredMixin, CampViewMixin, DetailView): + model = Ride + + +class RideCreate(LoginRequiredMixin, CampViewMixin, CreateView): + model = Ride + fields = ['location', 'when', 'seats', 'description'] + + def form_valid(self, form, **kwargs): + ride = form.save(commit=False) + ride.camp = self.camp + ride.user = self.request.user + ride.save() + self.object = ride + return HttpResponseRedirect(self.get_success_url()) + + +class RideUpdate(LoginRequiredMixin, CampViewMixin, UpdateView): + model = Ride + fields = ['location', 'when', 'seats', 'description'] + + +class RideDelete(LoginRequiredMixin, CampViewMixin, DeleteView): + model = Ride diff --git a/src/templates/includes/menuitems.html b/src/templates/includes/menuitems.html index 9b021d07..401da54e 100644 --- a/src/templates/includes/menuitems.html +++ b/src/templates/includes/menuitems.html @@ -5,6 +5,7 @@ Villages Sponsors Teams + Rideshare {% if request.user.is_staff %} Backoffice {% endif %} From 6b0bc8b737a64c6ba317383964fb6a77fe088642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Wed, 8 Aug 2018 22:36:54 +0200 Subject: [PATCH 220/351] Add non-db migration which was forgotten. --- src/teams/migrations/0046_auto_20180808_2154.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/teams/migrations/0046_auto_20180808_2154.py diff --git a/src/teams/migrations/0046_auto_20180808_2154.py b/src/teams/migrations/0046_auto_20180808_2154.py new file mode 100644 index 00000000..513ca22d --- /dev/null +++ b/src/teams/migrations/0046_auto_20180808_2154.py @@ -0,0 +1,17 @@ +# Generated by Django 2.0.4 on 2018-08-08 19:54 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teams', '0045_merge_20180805_1131'), + ] + + operations = [ + migrations.AlterModelOptions( + name='teamshift', + options={'ordering': ('shift_range',)}, + ), + ] From 6aa37716d6459de47c399ffacf8dcbe4efab0466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Thu, 9 Aug 2018 14:36:21 +0200 Subject: [PATCH 221/351] Fleshing out some templates. --- .../templates/rideshare/ride_detail.html | 35 ++++++++++++++++-- .../templates/rideshare/ride_list.html | 36 +++++++++++++++++-- src/rideshare/urls.py | 6 ++++ src/rideshare/views.py | 9 +++++ src/templates/includes/menuitems.html | 2 ++ 5 files changed, 83 insertions(+), 5 deletions(-) diff --git a/src/rideshare/templates/rideshare/ride_detail.html b/src/rideshare/templates/rideshare/ride_detail.html index 6e41af13..09383672 100644 --- a/src/rideshare/templates/rideshare/ride_detail.html +++ b/src/rideshare/templates/rideshare/ride_detail.html @@ -3,10 +3,39 @@ {% block content %} -{{ object.location }} + + + Back + + +
    + +
    +
    +

    + {{ object.seats }} + seats free, going from + {{ object.location }} + at + {{ object.when|date:"jS \o\f F \a\t H:i T" }} +

    +
    +
    + Description: +

    + {{ object.description|untrustedcommonmark }} +

    +
    +
    + + + Contact this rideshare + + +
    +
    +
    -{{ object.datetime }} -{{ object.description }} {% endblock %} diff --git a/src/rideshare/templates/rideshare/ride_list.html b/src/rideshare/templates/rideshare/ride_list.html index 41ebf72c..ca022df6 100644 --- a/src/rideshare/templates/rideshare/ride_list.html +++ b/src/rideshare/templates/rideshare/ride_list.html @@ -2,17 +2,49 @@ {% block content %} +
    +

    Ridesharing

    +
    + +

    +On this page participants of {{ camp.title }} can communicate about ridesharing to and from the festival. +

    + Create ride -
    + + + {% for ride in ride_list %} + + +
    + When + + Location + + Seats + +
    + {{ ride.when|date:"c" }} + + {{ ride.location }} + + {{ ride.seats }} + + + Details + - {{ ride.from_location }} at {{ ride.from_datetime}} +{% empty %} +
    + No rideshares yet! {% endfor %} +
    {% endblock %} diff --git a/src/rideshare/urls.py b/src/rideshare/urls.py index e528e248..6f07621d 100644 --- a/src/rideshare/urls.py +++ b/src/rideshare/urls.py @@ -6,6 +6,7 @@ from .views import ( RideDetail, RideUpdate, RideDelete, + RideContactConfirm, ) app_name = 'rideshare' @@ -38,6 +39,11 @@ urlpatterns = [ RideDelete.as_view(), name='delete' ), + path( + 'confirm/', + RideContactConfirm.as_view(), + name='contact-confirm' + ), ]) ) ] diff --git a/src/rideshare/views.py b/src/rideshare/views.py index de0eaa03..f11eed0e 100644 --- a/src/rideshare/views.py +++ b/src/rideshare/views.py @@ -5,6 +5,7 @@ from django.views.generic import ( CreateView, UpdateView, DeleteView, + TemplateView, ) from django.http import HttpResponseRedirect @@ -41,3 +42,11 @@ class RideUpdate(LoginRequiredMixin, CampViewMixin, UpdateView): class RideDelete(LoginRequiredMixin, CampViewMixin, DeleteView): model = Ride + + +class RideContactConfirm(LoginRequiredMixin, CampViewMixin, DetailView): + model = Ride + template_name = "rideshare/ride_contact_confirm.html" + + +# class RideContact(View): diff --git a/src/templates/includes/menuitems.html b/src/templates/includes/menuitems.html index 401da54e..fe144075 100644 --- a/src/templates/includes/menuitems.html +++ b/src/templates/includes/menuitems.html @@ -5,7 +5,9 @@ Villages Sponsors Teams + {% if request.user.is_authenticated %} Rideshare + {% endif %} {% if request.user.is_staff %} Backoffice {% endif %} From f2c5c262623b091cb8d5bac8a8092c7f1d415d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Thu, 9 Aug 2018 15:28:46 +0200 Subject: [PATCH 222/351] Fix video recording field and help text. --- src/program/forms.py | 3 --- .../migrations/0063_auto_20180809_1525.py | 18 ++++++++++++++++++ src/program/models.py | 4 ++-- 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 src/program/migrations/0063_auto_20180809_1525.py diff --git a/src/program/forms.py b/src/program/forms.py index bcd20b57..952f62f9 100644 --- a/src/program/forms.py +++ b/src/program/forms.py @@ -183,9 +183,6 @@ class EventProposalForm(forms.ModelForm): self.fields['track'].empty_label = None self.fields['track'].queryset = EventTrack.objects.filter(camp=camp) - # make sure video_recording checkbox defaults to checked - self.fields['allow_video_recording'].initial = True - if eventtype.name == 'Debate': # fix label and help_text for the title field self.fields['title'].label = 'Title of debate' diff --git a/src/program/migrations/0063_auto_20180809_1525.py b/src/program/migrations/0063_auto_20180809_1525.py new file mode 100644 index 00000000..d089fe94 --- /dev/null +++ b/src/program/migrations/0063_auto_20180809_1525.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.4 on 2018-08-09 13:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('program', '0062_auto_20180717_1720'), + ] + + operations = [ + migrations.AlterField( + model_name='eventproposal', + name='allow_video_recording', + field=models.BooleanField(default=True, help_text='Uncheck this to avoid video recording.'), + ), + ] diff --git a/src/program/models.py b/src/program/models.py index 36f363fb..025ce339 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -330,8 +330,8 @@ class EventProposal(UserSubmittedModel): ) allow_video_recording = models.BooleanField( - default=False, - help_text='Check to allow video recording of the event. Leave unchecked to avoid video recording.' + default=True, + help_text='Uncheck this to avoid video recording.' ) duration = models.IntegerField( From 0e3e6ae06f70b256893b7d5783d60b894e4dc603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Thu, 9 Aug 2018 15:30:24 +0200 Subject: [PATCH 223/351] Remove "this". --- src/program/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/program/models.py b/src/program/models.py index 025ce339..c5b016a1 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -331,7 +331,7 @@ class EventProposal(UserSubmittedModel): allow_video_recording = models.BooleanField( default=True, - help_text='Uncheck this to avoid video recording.' + help_text='Uncheck to avoid video recording.' ) duration = models.IntegerField( From 4043b609fd204291d05aa4975edeb40eb701047f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Thu, 9 Aug 2018 15:35:58 +0200 Subject: [PATCH 224/351] Model should have a default of false, so things that are not defined as true will default to false. --- src/program/forms.py | 3 +++ src/program/models.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/program/forms.py b/src/program/forms.py index 952f62f9..bcd20b57 100644 --- a/src/program/forms.py +++ b/src/program/forms.py @@ -183,6 +183,9 @@ class EventProposalForm(forms.ModelForm): self.fields['track'].empty_label = None self.fields['track'].queryset = EventTrack.objects.filter(camp=camp) + # make sure video_recording checkbox defaults to checked + self.fields['allow_video_recording'].initial = True + if eventtype.name == 'Debate': # fix label and help_text for the title field self.fields['title'].label = 'Title of debate' diff --git a/src/program/models.py b/src/program/models.py index c5b016a1..f7dd62d7 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -330,7 +330,7 @@ class EventProposal(UserSubmittedModel): ) allow_video_recording = models.BooleanField( - default=True, + default=False, help_text='Uncheck to avoid video recording.' ) From 72f6d42ee2be9097330c0ae63f3b4b458e392dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 10:14:03 +0200 Subject: [PATCH 225/351] Show description for team member for team responsible. --- src/teams/templates/team_members.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/teams/templates/team_members.html b/src/teams/templates/team_members.html index bf55476d..3873993d 100644 --- a/src/teams/templates/team_members.html +++ b/src/teams/templates/team_members.html @@ -25,6 +25,9 @@ Email + + Description + Action @@ -46,6 +49,9 @@ {{ member.user.email }} + + {{ member.user.profile.description|untrustedcommonmark }} +
    Date: Fri, 10 Aug 2018 16:22:17 +0200 Subject: [PATCH 226/351] Add location to events on schedule. --- schedule/src/Views/EventDetail.elm | 90 +++-- src/program/static/js/elm_based_schedule.js | 355 ++++++++++++-------- 2 files changed, 275 insertions(+), 170 deletions(-) diff --git a/schedule/src/Views/EventDetail.elm b/schedule/src/Views/EventDetail.elm index 93e35451..97bb69b0 100644 --- a/schedule/src/Views/EventDetail.elm +++ b/schedule/src/Views/EventDetail.elm @@ -123,14 +123,13 @@ eventDetailSidebar event model = ] (videoRecordingLink ++ [ speakerSidebar speakers - , eventMetaDataSidebar event - , eventInstancesSidebar eventInstances + , eventMetaDataSidebar event eventInstances model ] ) -eventMetaDataSidebar : Event -> Html Msg -eventMetaDataSidebar event = +eventMetaDataSidebar : Event -> List EventInstance -> Model -> Html Msg +eventMetaDataSidebar event eventInstances model = let ( showVideoRecoring, videoRecording ) = case event.videoState of @@ -142,10 +141,23 @@ eventMetaDataSidebar event = _ -> ( False, "" ) + + eventInstanceMetaData = + case eventInstances of + [ instance ] -> + eventInstanceItem instance model + + instances -> + [ h4 [] + [ text "Multiple occurences:" ] + , ul + [] + (List.map (\ei -> li [] <| eventInstanceItem ei model) instances) + ] in div [] - [ h4 [] [ text "Metadata" ] - , ul [] + ([ h4 [] [ text "Metadata" ] + , ul [] ([ li [] [ strong [] [ text "Type: " ], text event.eventType ] ] ++ (case showVideoRecoring of @@ -156,7 +168,44 @@ eventMetaDataSidebar event = [] ) ) + ] + ++ eventInstanceMetaData + ) + + +eventInstanceItem : EventInstance -> Model -> List (Html Msg) +eventInstanceItem eventInstance model = + let + toFormat = + if Date.day eventInstance.from == Date.day eventInstance.to then + "HH:mm" + else + "E HH:mm" + + ( locationName, _ ) = + model.eventLocations + |> List.map unpackFilterType + |> List.filter + (\( _, locationSlug ) -> + locationSlug == eventInstance.location + ) + |> List.head + |> Maybe.withDefault ( "Unknown", "" ) + in + [ p [] + [ strong [] [ text "When: " ] + , text + ((Date.Extra.toFormattedString "E HH:mm" eventInstance.from) + ++ " to " + ++ (Date.Extra.toFormattedString toFormat eventInstance.to) + ) ] + , p [] + [ strong [] [ text "Where: " ] + , text <| locationName ++ " " + , i [ classList [ ( "fa", True ), ( "fa-" ++ eventInstance.locationIcon, True ) ] ] [] + ] + ] speakerSidebar : List Speaker -> Html Msg @@ -175,32 +224,3 @@ speakerDetail speaker = li [] [ a [ href <| routeToString <| SpeakerRoute speaker.slug ] [ text speaker.name ] ] - - -eventInstancesSidebar : List EventInstance -> Html Msg -eventInstancesSidebar eventInstances = - div [] - [ h4 [] - [ text "This event will occur at:" ] - , ul - [] - (List.map eventInstanceItem eventInstances) - ] - - -eventInstanceItem : EventInstance -> Html Msg -eventInstanceItem eventInstance = - let - toFormat = - if Date.day eventInstance.from == Date.day eventInstance.to then - "HH:mm" - else - "E HH:mm" - in - li [] - [ text - ((Date.Extra.toFormattedString "E HH:mm" eventInstance.from) - ++ " to " - ++ (Date.Extra.toFormattedString toFormat eventInstance.to) - ) - ] diff --git a/src/program/static/js/elm_based_schedule.js b/src/program/static/js/elm_based_schedule.js index 7adb6ddb..8eb12b23 100644 --- a/src/program/static/js/elm_based_schedule.js +++ b/src/program/static/js/elm_based_schedule.js @@ -15706,50 +15706,6 @@ var _user$project$Views_DayView$dayView = F2( }); }); -var _user$project$Views_EventDetail$eventInstanceItem = function (eventInstance) { - var toFormat = _elm_lang$core$Native_Utils.eq( - _elm_lang$core$Date$day(eventInstance.from), - _elm_lang$core$Date$day(eventInstance.to)) ? 'HH:mm' : 'E HH:mm'; - return A2( - _elm_lang$html$Html$li, - {ctor: '[]'}, - { - ctor: '::', - _0: _elm_lang$html$Html$text( - A2( - _elm_lang$core$Basics_ops['++'], - A2(_justinmimbs$elm_date_extra$Date_Extra$toFormattedString, 'E HH:mm', eventInstance.from), - A2( - _elm_lang$core$Basics_ops['++'], - ' to ', - A2(_justinmimbs$elm_date_extra$Date_Extra$toFormattedString, toFormat, eventInstance.to)))), - _1: {ctor: '[]'} - }); -}; -var _user$project$Views_EventDetail$eventInstancesSidebar = function (eventInstances) { - return A2( - _elm_lang$html$Html$div, - {ctor: '[]'}, - { - ctor: '::', - _0: A2( - _elm_lang$html$Html$h4, - {ctor: '[]'}, - { - ctor: '::', - _0: _elm_lang$html$Html$text('This event will occur at:'), - _1: {ctor: '[]'} - }), - _1: { - ctor: '::', - _0: A2( - _elm_lang$html$Html$ul, - {ctor: '[]'}, - A2(_elm_lang$core$List$map, _user$project$Views_EventDetail$eventInstanceItem, eventInstances)), - _1: {ctor: '[]'} - } - }); -}; var _user$project$Views_EventDetail$speakerDetail = function (speaker) { return A2( _elm_lang$html$Html$li, @@ -15797,67 +15753,173 @@ var _user$project$Views_EventDetail$speakerSidebar = function (speakers) { } }); }; -var _user$project$Views_EventDetail$eventMetaDataSidebar = function (event) { - var _p0 = function () { - var _p1 = event.videoState; - switch (_p1) { - case 'to-be-recorded': - return {ctor: '_Tuple2', _0: true, _1: 'Yes'}; - case 'not-to-be-recorded': - return {ctor: '_Tuple2', _0: true, _1: 'No'}; - default: - return {ctor: '_Tuple2', _0: false, _1: ''}; - } - }(); - var showVideoRecoring = _p0._0; - var videoRecording = _p0._1; - return A2( - _elm_lang$html$Html$div, - {ctor: '[]'}, - { +var _user$project$Views_EventDetail$eventInstanceItem = F2( + function (eventInstance, model) { + var _p0 = A2( + _elm_lang$core$Maybe$withDefault, + {ctor: '_Tuple2', _0: 'Unknown', _1: ''}, + _elm_lang$core$List$head( + A2( + _elm_lang$core$List$filter, + function (_p1) { + var _p2 = _p1; + return _elm_lang$core$Native_Utils.eq(_p2._1, eventInstance.location); + }, + A2(_elm_lang$core$List$map, _user$project$Models$unpackFilterType, model.eventLocations)))); + var locationName = _p0._0; + var toFormat = _elm_lang$core$Native_Utils.eq( + _elm_lang$core$Date$day(eventInstance.from), + _elm_lang$core$Date$day(eventInstance.to)) ? 'HH:mm' : 'E HH:mm'; + return { ctor: '::', _0: A2( - _elm_lang$html$Html$h4, + _elm_lang$html$Html$p, {ctor: '[]'}, { ctor: '::', - _0: _elm_lang$html$Html$text('Metadata'), - _1: {ctor: '[]'} + _0: A2( + _elm_lang$html$Html$strong, + {ctor: '[]'}, + { + ctor: '::', + _0: _elm_lang$html$Html$text('When: '), + _1: {ctor: '[]'} + }), + _1: { + ctor: '::', + _0: _elm_lang$html$Html$text( + A2( + _elm_lang$core$Basics_ops['++'], + A2(_justinmimbs$elm_date_extra$Date_Extra$toFormattedString, 'E HH:mm', eventInstance.from), + A2( + _elm_lang$core$Basics_ops['++'], + ' to ', + A2(_justinmimbs$elm_date_extra$Date_Extra$toFormattedString, toFormat, eventInstance.to)))), + _1: {ctor: '[]'} + } }), _1: { ctor: '::', _0: A2( - _elm_lang$html$Html$ul, + _elm_lang$html$Html$p, {ctor: '[]'}, - A2( - _elm_lang$core$Basics_ops['++'], + { + ctor: '::', + _0: A2( + _elm_lang$html$Html$strong, + {ctor: '[]'}, + { + ctor: '::', + _0: _elm_lang$html$Html$text('Where: '), + _1: {ctor: '[]'} + }), + _1: { + ctor: '::', + _0: _elm_lang$html$Html$text( + A2(_elm_lang$core$Basics_ops['++'], locationName, ' ')), + _1: { + ctor: '::', + _0: A2( + _elm_lang$html$Html$i, + { + ctor: '::', + _0: _elm_lang$html$Html_Attributes$classList( + { + ctor: '::', + _0: {ctor: '_Tuple2', _0: 'fa', _1: true}, + _1: { + ctor: '::', + _0: { + ctor: '_Tuple2', + _0: A2(_elm_lang$core$Basics_ops['++'], 'fa-', eventInstance.locationIcon), + _1: true + }, + _1: {ctor: '[]'} + } + }), + _1: {ctor: '[]'} + }, + {ctor: '[]'}), + _1: {ctor: '[]'} + } + } + }), + _1: {ctor: '[]'} + } + }; + }); +var _user$project$Views_EventDetail$eventMetaDataSidebar = F3( + function (event, eventInstances, model) { + var eventInstanceMetaData = function () { + var _p3 = eventInstances; + if ((_p3.ctor === '::') && (_p3._1.ctor === '[]')) { + return A2(_user$project$Views_EventDetail$eventInstanceItem, _p3._0, model); + } else { + return { + ctor: '::', + _0: A2( + _elm_lang$html$Html$h4, + {ctor: '[]'}, { ctor: '::', - _0: A2( - _elm_lang$html$Html$li, - {ctor: '[]'}, - { - ctor: '::', - _0: A2( - _elm_lang$html$Html$strong, - {ctor: '[]'}, - { - ctor: '::', - _0: _elm_lang$html$Html$text('Type: '), - _1: {ctor: '[]'} - }), - _1: { - ctor: '::', - _0: _elm_lang$html$Html$text(event.eventType), - _1: {ctor: '[]'} - } - }), + _0: _elm_lang$html$Html$text('Multiple occurences:'), _1: {ctor: '[]'} - }, - function () { - var _p2 = showVideoRecoring; - if (_p2 === true) { - return { + }), + _1: { + ctor: '::', + _0: A2( + _elm_lang$html$Html$ul, + {ctor: '[]'}, + A2( + _elm_lang$core$List$map, + function (ei) { + return A2( + _elm_lang$html$Html$li, + {ctor: '[]'}, + A2(_user$project$Views_EventDetail$eventInstanceItem, ei, model)); + }, + _p3)), + _1: {ctor: '[]'} + } + }; + } + }(); + var _p4 = function () { + var _p5 = event.videoState; + switch (_p5) { + case 'to-be-recorded': + return {ctor: '_Tuple2', _0: true, _1: 'Yes'}; + case 'not-to-be-recorded': + return {ctor: '_Tuple2', _0: true, _1: 'No'}; + default: + return {ctor: '_Tuple2', _0: false, _1: ''}; + } + }(); + var showVideoRecoring = _p4._0; + var videoRecording = _p4._1; + return A2( + _elm_lang$html$Html$div, + {ctor: '[]'}, + A2( + _elm_lang$core$Basics_ops['++'], + { + ctor: '::', + _0: A2( + _elm_lang$html$Html$h4, + {ctor: '[]'}, + { + ctor: '::', + _0: _elm_lang$html$Html$text('Metadata'), + _1: {ctor: '[]'} + }), + _1: { + ctor: '::', + _0: A2( + _elm_lang$html$Html$ul, + {ctor: '[]'}, + A2( + _elm_lang$core$Basics_ops['++'], + { ctor: '::', _0: A2( _elm_lang$html$Html$li, @@ -15869,47 +15931,74 @@ var _user$project$Views_EventDetail$eventMetaDataSidebar = function (event) { {ctor: '[]'}, { ctor: '::', - _0: _elm_lang$html$Html$text('Recording: '), + _0: _elm_lang$html$Html$text('Type: '), _1: {ctor: '[]'} }), _1: { ctor: '::', - _0: _elm_lang$html$Html$text(videoRecording), + _0: _elm_lang$html$Html$text(event.eventType), _1: {ctor: '[]'} } }), _1: {ctor: '[]'} - }; - } else { - return {ctor: '[]'}; - } - }())), - _1: {ctor: '[]'} - } - }); -}; + }, + function () { + var _p6 = showVideoRecoring; + if (_p6 === true) { + return { + ctor: '::', + _0: A2( + _elm_lang$html$Html$li, + {ctor: '[]'}, + { + ctor: '::', + _0: A2( + _elm_lang$html$Html$strong, + {ctor: '[]'}, + { + ctor: '::', + _0: _elm_lang$html$Html$text('Recording: '), + _1: {ctor: '[]'} + }), + _1: { + ctor: '::', + _0: _elm_lang$html$Html$text(videoRecording), + _1: {ctor: '[]'} + } + }), + _1: {ctor: '[]'} + }; + } else { + return {ctor: '[]'}; + } + }())), + _1: {ctor: '[]'} + } + }, + eventInstanceMetaData)); + }); var _user$project$Views_EventDetail$getSpeakersFromSlugs = F3( function (speakers, slugs, collectedSpeakers) { getSpeakersFromSlugs: while (true) { - var _p3 = speakers; - if (_p3.ctor === '[]') { + var _p7 = speakers; + if (_p7.ctor === '[]') { return collectedSpeakers; } else { - var _p7 = _p3._0; + var _p11 = _p7._0; var foundSlug = _elm_lang$core$List$head( A2( _elm_lang$core$List$filter, function (slug) { - return _elm_lang$core$Native_Utils.eq(slug, _p7.slug); + return _elm_lang$core$Native_Utils.eq(slug, _p11.slug); }, slugs)); var foundSpeaker = function () { - var _p4 = foundSlug; - if (_p4.ctor === 'Just') { + var _p8 = foundSlug; + if (_p8.ctor === 'Just') { return { ctor: '::', - _0: _p7, + _0: _p11, _1: {ctor: '[]'} }; } else { @@ -15918,28 +16007,28 @@ var _user$project$Views_EventDetail$getSpeakersFromSlugs = F3( }(); var newCollectedSpeakers = A2(_elm_lang$core$Basics_ops['++'], collectedSpeakers, foundSpeaker); var newSlugs = function () { - var _p5 = foundSlug; - if (_p5.ctor === 'Just') { + var _p9 = foundSlug; + if (_p9.ctor === 'Just') { return A2( _elm_lang$core$List$filter, function (x) { - return !_elm_lang$core$Native_Utils.eq(x, _p5._0); + return !_elm_lang$core$Native_Utils.eq(x, _p9._0); }, slugs); } else { return slugs; } }(); - var _p6 = slugs; - if (_p6.ctor === '[]') { + var _p10 = slugs; + if (_p10.ctor === '[]') { return collectedSpeakers; } else { - var _v6 = _p3._1, - _v7 = newSlugs, - _v8 = newCollectedSpeakers; - speakers = _v6; - slugs = _v7; - collectedSpeakers = _v8; + var _v8 = _p7._1, + _v9 = newSlugs, + _v10 = newCollectedSpeakers; + speakers = _v8; + slugs = _v9; + collectedSpeakers = _v10; continue getSpeakersFromSlugs; } } @@ -15959,8 +16048,8 @@ var _user$project$Views_EventDetail$eventDetailSidebar = F2( }, model.eventInstances); var videoRecordingLink = function () { - var _p8 = event.videoUrl; - if (_p8.ctor === 'Nothing') { + var _p12 = event.videoUrl; + if (_p12.ctor === 'Nothing') { return {ctor: '[]'}; } else { return { @@ -15969,7 +16058,7 @@ var _user$project$Views_EventDetail$eventDetailSidebar = F2( _elm_lang$html$Html$a, { ctor: '::', - _0: _elm_lang$html$Html_Attributes$href(_p8._0), + _0: _elm_lang$html$Html_Attributes$href(_p12._0), _1: { ctor: '::', _0: _elm_lang$html$Html_Attributes$classList( @@ -16034,12 +16123,8 @@ var _user$project$Views_EventDetail$eventDetailSidebar = F2( _0: _user$project$Views_EventDetail$speakerSidebar(speakers), _1: { ctor: '::', - _0: _user$project$Views_EventDetail$eventMetaDataSidebar(event), - _1: { - ctor: '::', - _0: _user$project$Views_EventDetail$eventInstancesSidebar(eventInstances), - _1: {ctor: '[]'} - } + _0: A3(_user$project$Views_EventDetail$eventMetaDataSidebar, event, eventInstances, model), + _1: {ctor: '[]'} } })); }); @@ -16135,9 +16220,9 @@ var _user$project$Views_EventDetail$eventDetailView = F2( return _elm_lang$core$Native_Utils.eq(e.slug, eventSlug); }, model.events)); - var _p9 = event; - if (_p9.ctor === 'Just') { - var _p10 = _p9._0; + var _p13 = event; + if (_p13.ctor === 'Just') { + var _p14 = _p13._0; return A2( _elm_lang$html$Html$div, { @@ -16147,10 +16232,10 @@ var _user$project$Views_EventDetail$eventDetailView = F2( }, { ctor: '::', - _0: _user$project$Views_EventDetail$eventDetailContent(_p10), + _0: _user$project$Views_EventDetail$eventDetailContent(_p14), _1: { ctor: '::', - _0: A2(_user$project$Views_EventDetail$eventDetailSidebar, _p10, model), + _0: A2(_user$project$Views_EventDetail$eventDetailSidebar, _p14, model), _1: {ctor: '[]'} } }); From 56875732ddb5c28be868023fb1b5823efb008a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 16:26:25 +0200 Subject: [PATCH 227/351] Also show location on non-js event detail page. --- src/program/templates/schedule_event_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/program/templates/schedule_event_detail.html b/src/program/templates/schedule_event_detail.html index 6b992a8e..99e75f52 100644 --- a/src/program/templates/schedule_event_detail.html +++ b/src/program/templates/schedule_event_detail.html @@ -36,7 +36,7 @@

    Instances

    + {% if user == object.user %}
    - - - Contact this rideshare + + + Delete + + + + Edit
    + {% else %} +
    +
    + {% csrf_token %} + {% bootstrap_form form %} + + +
    + + {% endif %} diff --git a/src/rideshare/templates/rideshare/ride_list.html b/src/rideshare/templates/rideshare/ride_list.html index ca022df6..7b39ac5e 100644 --- a/src/rideshare/templates/rideshare/ride_list.html +++ b/src/rideshare/templates/rideshare/ride_list.html @@ -10,9 +10,13 @@ On this page participants of {{ camp.title }} can communicate about ridesharing to and from the festival.

    - - Create ride + + + Create ride + + +
    diff --git a/src/rideshare/urls.py b/src/rideshare/urls.py index 6f07621d..e528e248 100644 --- a/src/rideshare/urls.py +++ b/src/rideshare/urls.py @@ -6,7 +6,6 @@ from .views import ( RideDetail, RideUpdate, RideDelete, - RideContactConfirm, ) app_name = 'rideshare' @@ -39,11 +38,6 @@ urlpatterns = [ RideDelete.as_view(), name='delete' ), - path( - 'confirm/', - RideContactConfirm.as_view(), - name='contact-confirm' - ), ]) ) ] diff --git a/src/rideshare/views.py b/src/rideshare/views.py index f11eed0e..19e4ef31 100644 --- a/src/rideshare/views.py +++ b/src/rideshare/views.py @@ -1,19 +1,31 @@ +from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin +from django.urls import reverse from django.views.generic import ( ListView, DetailView, CreateView, UpdateView, DeleteView, - TemplateView, + FormView ) from django.http import HttpResponseRedirect +from django import forms from camps.mixins import CampViewMixin +from utils.email import add_outgoing_email from .models import Ride +class ContactRideForm(forms.Form): + message = forms.CharField( + widget=forms.Textarea(attrs={"placeholder": "Remember to include your contact information!"}), + label="Write a message to this rideshare", + help_text="ATTENTION!: Pressing send will send an email with the above text. It is up to you to include your contact information so the person receiving the email can contact you.", + ) + + class RideList(LoginRequiredMixin, CampViewMixin, ListView): model = Ride @@ -21,6 +33,32 @@ class RideList(LoginRequiredMixin, CampViewMixin, ListView): class RideDetail(LoginRequiredMixin, CampViewMixin, DetailView): model = Ride + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['form'] = ContactRideForm() + return context + + def post(self, request, **kwargs): + form = ContactRideForm(request.POST) + if form.is_valid(): + ride = self.get_object() + add_outgoing_email( + text_template='rideshare/emails/contact_mail.txt', + to_recipients=[ride.user.emailaddress_set.get(primary=True).email], + formatdict=dict( + rideshare_url="https://bornhack.dk{}".format( + reverse( + 'rideshare:detail', + kwargs={"camp_slug": self.camp.slug, "pk": ride.pk} + ) + ), + message=form.cleaned_data['message'], + ), + subject="BornHack rideshare message!", + ) + messages.info(request, "Your message has been sent.") + return HttpResponseRedirect(ride.get_absolute_url()) + class RideCreate(LoginRequiredMixin, CampViewMixin, CreateView): model = Ride @@ -42,11 +80,3 @@ class RideUpdate(LoginRequiredMixin, CampViewMixin, UpdateView): class RideDelete(LoginRequiredMixin, CampViewMixin, DeleteView): model = Ride - - -class RideContactConfirm(LoginRequiredMixin, CampViewMixin, DetailView): - model = Ride - template_name = "rideshare/ride_contact_confirm.html" - - -# class RideContact(View): From 641f4dfc73f858327145efab27c9817ebc71897d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 18:02:16 +0200 Subject: [PATCH 229/351] Upgrading various dependencies. --- .../migrations/0064_auto_20180810_1748.py | 18 ++++++++++++++++++ src/requirements/production.txt | 18 +++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 src/program/migrations/0064_auto_20180810_1748.py diff --git a/src/program/migrations/0064_auto_20180810_1748.py b/src/program/migrations/0064_auto_20180810_1748.py new file mode 100644 index 00000000..a9312697 --- /dev/null +++ b/src/program/migrations/0064_auto_20180810_1748.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1 on 2018-08-10 15:48 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('program', '0063_auto_20180809_1525'), + ] + + operations = [ + migrations.AlterField( + model_name='eventproposal', + name='allow_video_recording', + field=models.BooleanField(default=False, help_text='Uncheck to avoid video recording.'), + ), + ] diff --git a/src/requirements/production.txt b/src/requirements/production.txt index c25cd6d0..dfe5d0a1 100644 --- a/src/requirements/production.txt +++ b/src/requirements/production.txt @@ -1,8 +1,8 @@ -Django==2.0.4 -channels==2.0.2 +Django==2.1 +channels==2.1.2 -CommonMark==0.7.3 -Pillow==4.0.0 +CommonMark==0.7.5 +Pillow==5.2.0 PyPDF2==1.26.0 Unidecode==0.04.20 argparse==1.2.1 @@ -10,13 +10,13 @@ asyncio==3.4.3 bleach==1.5.0 defusedxml==0.4.1 -django-allauth==0.30.0 +django-allauth==0.36.0 django-bleach==0.3.0 -django-bootstrap3==8.2.2 +django-bootstrap3==10.0.1 django-extensions==1.7.7 -django-wkhtmltopdf==3.1.0 -django-reversion==2.0.13 -django-betterforms==1.1.4 +django-wkhtmltopdf==3.2.0 +django-reversion==3.0.0 +django-betterforms==1.2 docopt==0.6.2 future==0.16.0 html5lib==0.9999999 From d25f8eeee5e61fac5437924ffbe1c72404360fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 18:04:33 +0200 Subject: [PATCH 230/351] Add missing non-db migration. --- .../migrations/0064_auto_20180810_1748.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/program/migrations/0064_auto_20180810_1748.py diff --git a/src/program/migrations/0064_auto_20180810_1748.py b/src/program/migrations/0064_auto_20180810_1748.py new file mode 100644 index 00000000..a9312697 --- /dev/null +++ b/src/program/migrations/0064_auto_20180810_1748.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1 on 2018-08-10 15:48 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('program', '0063_auto_20180809_1525'), + ] + + operations = [ + migrations.AlterField( + model_name='eventproposal', + name='allow_video_recording', + field=models.BooleanField(default=False, help_text='Uncheck to avoid video recording.'), + ), + ] From c83ebfed082883a4d20175dab4b74883b0e08f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 18:37:27 +0200 Subject: [PATCH 231/351] Adding admin for rideshare.Ride --- src/rideshare/admin.py | 7 ++++++- src/rideshare/models.py | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/rideshare/admin.py b/src/rideshare/admin.py index 8c38f3f3..c0f1917e 100644 --- a/src/rideshare/admin.py +++ b/src/rideshare/admin.py @@ -1,3 +1,8 @@ from django.contrib import admin -# Register your models here. +from .models import Ride + + +@admin.register(Ride) +class RideModelAdmin(admin.ModelAdmin): + list_filter = ('camp', 'user') diff --git a/src/rideshare/models.py b/src/rideshare/models.py index c06cca1c..42e5a033 100644 --- a/src/rideshare/models.py +++ b/src/rideshare/models.py @@ -20,3 +20,11 @@ class Ride(UUIDModel, CampRelatedModel): 'camp_slug': self.camp.slug } ) + + def __str__(self): + return "{} seats from {} at {} by {}".format( + self.seats, + self.location, + self.when, + self.user + ) From d6321cf5e849417e3d5d73f1f179f3065cd3411a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 18:39:21 +0200 Subject: [PATCH 232/351] Use list_display instead. --- src/rideshare/admin.py | 1 + src/rideshare/models.py | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/rideshare/admin.py b/src/rideshare/admin.py index c0f1917e..6a674531 100644 --- a/src/rideshare/admin.py +++ b/src/rideshare/admin.py @@ -5,4 +5,5 @@ from .models import Ride @admin.register(Ride) class RideModelAdmin(admin.ModelAdmin): + list_display = ('location', 'when', 'seats', 'user') list_filter = ('camp', 'user') diff --git a/src/rideshare/models.py b/src/rideshare/models.py index 42e5a033..c06cca1c 100644 --- a/src/rideshare/models.py +++ b/src/rideshare/models.py @@ -20,11 +20,3 @@ class Ride(UUIDModel, CampRelatedModel): 'camp_slug': self.camp.slug } ) - - def __str__(self): - return "{} seats from {} at {} by {}".format( - self.seats, - self.location, - self.when, - self.user - ) From effe016b577f0dbdcedbc42b1f8d8217f90ffc39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 18:46:35 +0200 Subject: [PATCH 233/351] Ensure only the creator of the ride can edit and delete it. --- src/rideshare/views.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/rideshare/views.py b/src/rideshare/views.py index 19e4ef31..94305103 100644 --- a/src/rideshare/views.py +++ b/src/rideshare/views.py @@ -1,5 +1,5 @@ from django.contrib import messages -from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin from django.urls import reverse from django.views.generic import ( ListView, @@ -73,10 +73,15 @@ class RideCreate(LoginRequiredMixin, CampViewMixin, CreateView): return HttpResponseRedirect(self.get_success_url()) -class RideUpdate(LoginRequiredMixin, CampViewMixin, UpdateView): +class IsRideOwnerMixin(UserPassesTestMixin): + def test_func(self): + return self.get_object().user == self.request.user + + +class RideUpdate(LoginRequiredMixin, CampViewMixin, IsRideOwnerMixin, UpdateView): model = Ride fields = ['location', 'when', 'seats', 'description'] -class RideDelete(LoginRequiredMixin, CampViewMixin, DeleteView): +class RideDelete(LoginRequiredMixin, CampViewMixin, IsRideOwnerMixin, DeleteView): model = Ride From b864a2cd569bb47181f809489f00a04fe492f2a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 18:46:54 +0200 Subject: [PATCH 234/351] Adding str representation anyway. --- src/rideshare/models.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/rideshare/models.py b/src/rideshare/models.py index c06cca1c..42e5a033 100644 --- a/src/rideshare/models.py +++ b/src/rideshare/models.py @@ -20,3 +20,11 @@ class Ride(UUIDModel, CampRelatedModel): 'camp_slug': self.camp.slug } ) + + def __str__(self): + return "{} seats from {} at {} by {}".format( + self.seats, + self.location, + self.when, + self.user + ) From e21f5961886279f3487c8b35d2f9b45758755871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 19:29:15 +0200 Subject: [PATCH 235/351] Add a help text to rideshare when field to show format for now. --- src/rideshare/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rideshare/models.py b/src/rideshare/models.py index 42e5a033..97ce643a 100644 --- a/src/rideshare/models.py +++ b/src/rideshare/models.py @@ -9,7 +9,7 @@ class Ride(UUIDModel, CampRelatedModel): user = models.ForeignKey('auth.User', on_delete=models.PROTECT) seats = models.PositiveIntegerField() location = models.CharField(max_length=100) - when = models.DateTimeField() + when = models.DateTimeField(help_text="Format is YYYY-MM-DD HH:mm") description = models.TextField() def get_absolute_url(self): From 630b2e55de7b25f0226855e73afaf24d3591c2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 22:25:50 +0200 Subject: [PATCH 236/351] Re-add CHANNEL_LAYERS settings. --- src/bornhack/environment_settings.py.dist | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/bornhack/environment_settings.py.dist b/src/bornhack/environment_settings.py.dist index 15c4c82c..c047b63c 100644 --- a/src/bornhack/environment_settings.py.dist +++ b/src/bornhack/environment_settings.py.dist @@ -82,3 +82,10 @@ IRCBOT_SERVER_USETLS=True IRCBOT_PUBLIC_CHANNEL='{{ django_ircbot_public_channel }}' IRCBOT_VOLUNTEER_CHANNEL='{{ django_ircbot_volunteer_channel }}' +# set BACKEND to "channels.layers.InMemoryChannelLayer" and CONFIG to {} for local development +CHANNEL_LAYERS = { + "default": { + "BACKEND": "{{ django_channels_backend }}", + "CONFIG": {{ django_channels_config }} + }, +} From 084782b22d9998d81dd9853e5e763ea9d0c041e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Fri, 10 Aug 2018 22:36:28 +0200 Subject: [PATCH 237/351] Add channels_redis requirement. --- src/requirements/production.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/requirements/production.txt b/src/requirements/production.txt index dfe5d0a1..70a19a46 100644 --- a/src/requirements/production.txt +++ b/src/requirements/production.txt @@ -1,5 +1,6 @@ Django==2.1 channels==2.1.2 +channels_redis==2.2.1 CommonMark==0.7.5 Pillow==5.2.0 From a3bfd856049a4dccfc5ce4c04cbd5cf0bcf90409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sat, 11 Aug 2018 18:15:19 +0200 Subject: [PATCH 238/351] Disable timezone support. Everything is in Europe/Copenhagen anyway. --- src/bornhack/settings.py | 2 +- src/program/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bornhack/settings.py b/src/bornhack/settings.py index 91590962..d2d0d465 100644 --- a/src/bornhack/settings.py +++ b/src/bornhack/settings.py @@ -63,7 +63,7 @@ STATICFILES_DIRS = [local_dir('static_src')] LANGUAGE_CODE = 'en-us' #USE_I18N = True #USE_L10N = True -USE_TZ = True +USE_TZ = False SHORT_DATE_FORMAT = 'd/m-Y' DATE_FORMAT = 'd/m-Y' DATETIME_FORMAT = 'd/m-Y H:i' diff --git a/src/program/models.py b/src/program/models.py index f7dd62d7..486021b2 100644 --- a/src/program/models.py +++ b/src/program/models.py @@ -732,8 +732,8 @@ class EventInstance(CampRelatedModel): 'title': self.event.title, 'slug': self.event.slug + '-' + str(self.id), 'event_slug': self.event.slug, - 'from': self.when.lower.astimezone().isoformat(), - 'to': self.when.upper.astimezone().isoformat(), + 'from': self.when.lower.isoformat(), + 'to': self.when.upper.isoformat(), 'url': str(self.event.get_absolute_url()), 'id': self.id, 'bg-color': self.event.event_type.color, From da639ff4cd76d33f76b9e7ad0a17d8b796020f80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 12 Aug 2018 16:50:53 +0200 Subject: [PATCH 239/351] Add shortcut to users teams. Add a overview of users shifts, and prevent user from taking a shift which overlaps with one already assigned to the user. --- src/teams/templates/team_list.html | 46 ++++++++++++++++++++--- src/teams/templates/team_user_shifts.html | 44 ++++++++++++++++++++++ src/teams/urls.py | 6 +++ src/teams/views/base.py | 6 +++ src/teams/views/shifts.py | 37 +++++++++++++++++- 5 files changed, 131 insertions(+), 8 deletions(-) create mode 100644 src/teams/templates/team_user_shifts.html diff --git a/src/teams/templates/team_list.html b/src/teams/templates/team_list.html index c0a314da..9a74a534 100644 --- a/src/teams/templates/team_list.html +++ b/src/teams/templates/team_list.html @@ -7,13 +7,47 @@ Teams | {{ block.super }} {% endblock %} {% block content %} -

    {{ camp.title }} Teams

    -

    This is a list of the teams for {{ camp.title }}. To join a team just press the Join button, but please put some info in your profile first, so the team responsible has some idea who you are.

    -

    You can also leave a team of course, but please let the team responsible know why :)

    -

    Team memberships need to be approved by a team responsible. You will receive a message when your membership has been approved.

    -

    At {{ camp.title }} all organisers and volunteers buy full tickets like everyone else. At future events our budget may allow for discounts or free tickets for volunteers, but currently it does not.

    -

    We currently have {{ teams.count }} teams for {{ camp.title }}:

    + +
    +
    +

    About teams

    +

    This is a list of the teams for {{ camp.title }}. To join a team just press the Join button, but please put some info in your profile first, so the team responsible has some idea who you are.

    +

    You can also leave a team of course, but please let the team responsible know why :)

    +

    Team memberships neesdf be approved by a team responsible. You will receive a message when your membership has been approved.

    +

    At {{ camp.title }} all organisers and volunteers buy full tickets like everyone else. At future events our budget may allow for discounts or free tickets for volunteers, but currently it does not.

    +

    We currently have {{ teams.count }} teams for {{ camp.title }}.

    +
    + + {% if user.is_authenticated %} +
    +
    +

    Your teams

    +
    + {% if user_teams %} + + + Manage shifts + + {% else %} + You are not on any teams. + {% endif %} +
    + {% endif %} + +
    + {% if teams %}
    diff --git a/src/teams/templates/team_user_shifts.html b/src/teams/templates/team_user_shifts.html new file mode 100644 index 00000000..fe370b1d --- /dev/null +++ b/src/teams/templates/team_user_shifts.html @@ -0,0 +1,44 @@ +{% extends 'base.html' %} + +{% block content %} + +

    Your shifts

    + +
    + + {% for shift in user_shifts %} + {% ifchanged shift.shift_range.lower|date:'d' %} + + + + + + + {% endifchanged %} + + + + + + + + {% endfor %} + +
    +

    + {{ shift.shift_range.lower|date:'Y-m-d l' }} +

    +
    TeamStartEndActions
    + {{ shift.team.name }} + + {{ shift.shift_range.lower|date:'H:i' }} + + {{ shift.shift_range.upper|date:'H:i' }} + + + Unassign me + +
    + +{% endblock %} \ No newline at end of file diff --git a/src/teams/urls.py b/src/teams/urls.py index 37100380..9e84f0f0 100644 --- a/src/teams/urls.py +++ b/src/teams/urls.py @@ -37,6 +37,7 @@ from teams.views.shifts import ( ShiftDeleteView, MemberTakesShift, MemberDropsShift, + UserShifts, ) app_name = 'teams' @@ -47,6 +48,11 @@ urlpatterns = [ TeamListView.as_view(), name='list' ), + path( + 'shifts', + UserShifts.as_view(), + name='user_shifts' + ), path( '/', include([ path( diff --git a/src/teams/views/base.py b/src/teams/views/base.py index cce95e70..ee5c7c77 100644 --- a/src/teams/views/base.py +++ b/src/teams/views/base.py @@ -19,6 +19,12 @@ class TeamListView(CampViewMixin, ListView): model = Team context_object_name = 'teams' + def get_context_data(self, *, object_list=None, **kwargs): + context = super().get_context_data(object_list=object_list, **kwargs) + if self.request.user.is_authenticated: + context['user_teams'] = self.request.user.teammember_set.filter(team__camp=self.camp) + return context + class TeamGeneralView(CampViewMixin, DetailView): template_name = "team_general.html" diff --git a/src/teams/views/shifts.py b/src/teams/views/shifts.py index 7a436462..9b218dc7 100644 --- a/src/teams/views/shifts.py +++ b/src/teams/views/shifts.py @@ -1,5 +1,7 @@ +from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin from django.http import HttpResponseRedirect +from django.template import Template, Context from django.views.generic import ( View, CreateView, @@ -7,9 +9,9 @@ from django.views.generic import ( ListView, FormView, DeleteView, + TemplateView ) from django import forms -from django.contrib.postgres.forms.ranges import RangeWidget from django.utils import timezone from django.urls import reverse @@ -299,7 +301,25 @@ class MemberTakesShift(LoginRequiredMixin, CampViewMixin, View): team_member = TeamMember.objects.get(team=team, user=request.user) - shift.team_members.add(team_member) + overlapping_shifts = TeamShift.objects.filter( + team__camp=self.camp, + team_members__user=request.user, + shift_range__overlap=shift.shift_range + ) + + if overlapping_shifts.exists(): + template = Template("""You have shifts overlapping with the one you are trying to assign:
      + {% for shift in shifts %} +
    • {{ shift }}
      • + {% endfor %} +
    + """) + messages.error( + request, + template.render(Context({"shifts": overlapping_shifts})) + ) + else: + shift.team_members.add(team_member) kwargs.pop('pk') @@ -334,3 +354,16 @@ class MemberDropsShift(LoginRequiredMixin, CampViewMixin, View): kwargs=kwargs ) ) + + +class UserShifts(CampViewMixin, TemplateView): + template_name = 'team_user_shifts.html' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['user_teams'] = self.request.user.teammember_set.filter(team__camp=self.camp) + context['user_shifts'] = TeamShift.objects.filter( + team__camp=self.camp, + team_members__user=self.request.user + ) + return context \ No newline at end of file From d7e8e24361d25f49ef855d4025ceba576d8a280f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Sun, 12 Aug 2018 22:51:41 +0200 Subject: [PATCH 240/351] Correct typo. --- src/teams/templates/team_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/teams/templates/team_list.html b/src/teams/templates/team_list.html index 9a74a534..99733c13 100644 --- a/src/teams/templates/team_list.html +++ b/src/teams/templates/team_list.html @@ -14,7 +14,7 @@ Teams | {{ block.super }}

    About teams

    This is a list of the teams for {{ camp.title }}. To join a team just press the Join button, but please put some info in your profile first, so the team responsible has some idea who you are.

    You can also leave a team of course, but please let the team responsible know why :)

    -

    Team memberships neesdf be approved by a team responsible. You will receive a message when your membership has been approved.

    +

    Team memberships need to be approved by a team responsible. You will receive a message when your membership has been approved.

    At {{ camp.title }} all organisers and volunteers buy full tickets like everyone else. At future events our budget may allow for discounts or free tickets for volunteers, but currently it does not.

    We currently have {{ teams.count }} teams for {{ camp.title }}.

    From 5bd0f38249a77565c38c1d04544607c3cc9278a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 13 Aug 2018 18:55:25 +0200 Subject: [PATCH 241/351] Revert to using TZ anyway. Too many problems by disabling it by now. --- src/bornhack/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bornhack/settings.py b/src/bornhack/settings.py index d2d0d465..91590962 100644 --- a/src/bornhack/settings.py +++ b/src/bornhack/settings.py @@ -63,7 +63,7 @@ STATICFILES_DIRS = [local_dir('static_src')] LANGUAGE_CODE = 'en-us' #USE_I18N = True #USE_L10N = True -USE_TZ = False +USE_TZ = True SHORT_DATE_FORMAT = 'd/m-Y' DATE_FORMAT = 'd/m-Y' DATETIME_FORMAT = 'd/m-Y H:i' From 44f4f971019a43a9da4f465851f4c6c82d396191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 13 Aug 2018 18:56:48 +0200 Subject: [PATCH 242/351] Add success url to rideshare delete. --- src/rideshare/views.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rideshare/views.py b/src/rideshare/views.py index 94305103..568baa8a 100644 --- a/src/rideshare/views.py +++ b/src/rideshare/views.py @@ -85,3 +85,4 @@ class RideUpdate(LoginRequiredMixin, CampViewMixin, IsRideOwnerMixin, UpdateView class RideDelete(LoginRequiredMixin, CampViewMixin, IsRideOwnerMixin, DeleteView): model = Ride + success_url = reverse('rideshare:list') From 231f1e54fae4bd0cdd286b65dfa745c961ce780c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 13 Aug 2018 18:59:49 +0200 Subject: [PATCH 243/351] Woops, need to use lazy. --- src/rideshare/views.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rideshare/views.py b/src/rideshare/views.py index 568baa8a..2bc4f0b1 100644 --- a/src/rideshare/views.py +++ b/src/rideshare/views.py @@ -1,13 +1,12 @@ from django.contrib import messages from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin -from django.urls import reverse +from django.urls import reverse, reverse_lazy from django.views.generic import ( ListView, DetailView, CreateView, UpdateView, DeleteView, - FormView ) from django.http import HttpResponseRedirect from django import forms @@ -85,4 +84,4 @@ class RideUpdate(LoginRequiredMixin, CampViewMixin, IsRideOwnerMixin, UpdateView class RideDelete(LoginRequiredMixin, CampViewMixin, IsRideOwnerMixin, DeleteView): model = Ride - success_url = reverse('rideshare:list') + success_url = reverse_lazy('rideshare:list') From bd00ae3424b0d7ceb6fd7b79fdeaf34d573c4846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 13 Aug 2018 19:00:40 +0200 Subject: [PATCH 244/351] Fix menu in mobile. --- src/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/base.html b/src/templates/base.html index e3b2c5eb..34ed93cd 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -42,7 +42,7 @@