From 36539d04b5e6caeba9dfc94901fb100fad2cf599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastiaan=20Versteeg?= Date: Wed, 5 Jun 2019 22:03:59 +0200 Subject: [PATCH] Remove mark all present feature from events --- website/events/admin.py | 4 --- website/events/admin_views.py | 34 ------------------ .../events/locale/nl/LC_MESSAGES/django.mo | Bin 16946 -> 16815 bytes .../events/locale/nl/LC_MESSAGES/django.po | 6 +--- .../events/locale/nl/LC_MESSAGES/djangojs.mo | Bin 822 -> 781 bytes .../templates/events/admin/details.html | 1 - 6 files changed, 1 insertion(+), 44 deletions(-) diff --git a/website/events/admin.py b/website/events/admin.py index 1c97c666..bfdab30e 100644 --- a/website/events/admin.py +++ b/website/events/admin.py @@ -226,10 +226,6 @@ class EventAdmin(DoNextTranslatedModelAdmin): self.admin_site.admin_view( admin_views.EventRegistrationEmailsExport.as_view()), name='events_event_export_email'), - path('/all-present/', - self.admin_site.admin_view( - admin_views.EventRegistrationsMarkPresent.as_view()), - name='events_event_all_present'), path('/message/', self.admin_site.admin_view( admin_views.EventMessage.as_view(admin=self)), diff --git a/website/events/admin_views.py b/website/events/admin_views.py index 4e933117..254d49a7 100644 --- a/website/events/admin_views.py +++ b/website/events/admin_views.py @@ -293,37 +293,3 @@ class EventRegistrationEmailsExport(TemplateView, PermissionRequiredMixin): context['addresses'] = addresses context['no_addresses'] = no_addresses return context - - -@method_decorator(staff_member_required, name='dispatch') -@method_decorator(organiser_only, name='dispatch') -class EventRegistrationsMarkPresent(View, PermissionRequiredMixin): - """ - Renders a page that outputs all email addresses of registered members - for an event - """ - template_name = 'events/admin/email_export.html' - permission_required = 'events.change_registration' - - def get(self, request, pk): - """ - Mark all registrations of an event as present - - :param request: the request object - :param pk: the primary key of the event - :return: HttpResponse 302 to the event admin page - """ - event = get_object_or_404(Event, pk=pk) - - if event.max_participants is None: - registrations_query = event.registration_set.filter( - date_cancelled=None) - else: - registrations_query = (event.registration_set - .filter(date_cancelled=None) - .order_by('date')[:event.max_participants]) - - event.registration_set.filter(pk__in=registrations_query).update( - present=True, payment=Registration.PAYMENT_CASH) - - return redirect('admin:events_event_details', event.pk) diff --git a/website/events/locale/nl/LC_MESSAGES/django.mo b/website/events/locale/nl/LC_MESSAGES/django.mo index 8f4eee25d899efd8549e1f4ac3d0885c3e5e82a4..a385a909caaa5c0efc87a478525f9be9ee8f3ff2 100644 GIT binary patch delta 3787 zcmYk-2~ZVv0LSq^2!Zeb0Z$&nGw?U8Ynar$g$Q+$9$H{ThnNr3nOPzF@?E7Q?H0}7~^WS~D`@h%YML|ajgPa?2A?ppt z36e-Y4K?OI4v*vyhcCvMOl*MRI0&D?5%&66tj_sH>n=RW`2p1ZqiPt_81pe6*WwB+ z#ROvoR0Y=9eLtjifHpgs? zz|mL_3$Osi8b*KX5l|br%W5V(KgtauGo$91-0A;oy88Eo7%?A zgpL@7WjGJdpc<4-E2FRjCQ!fWML|6nhrHM1V_hu3Ok9E*y3<%6%aM1P3e*dOxmnML zqt2tygYmcoeW-@)MIJFnkfAqUqoXAx54bhKna6EFW*@CHf z0)2Q5HG)r2Jxtel> zj*PZ>h)lPMWaSR2#^|7?U}iGYh{v%#=JAEshjyge{Ry zn8BzypMshK2i5ZcYAOz*M(_eszqyR*cop@Y@MqnTY=wT#yI@Z&M0KFtp`f9Wl_4L)W)WBm&CJ-LXg?*@iz|5s4Z z_IQAy_&4eW!Azif>Ou819yO#%s3A>9O-XlDgNLBj$RzvwBGfM0V6X2(t(nh|D$I3E zqJ9&^(q!|nNaww>$cW@2!-a@8Zp-T6P|lNa2F^jP z_Is!~tCr>dACQRSI3IuvjyZ+u;jhT(o8M5|G?DqJi48Cov$2Gs>w&Bd$6Rh_%qRR1 z$LFstmLt<;LfgA*p|y1ks>cEAcGMc!hkEW3*2e1m2cQalsGetG0_LDbwg7{17Bf)?2}UBG?z{9{y$&!HYDx93+;Lwysqh<-s$;XTv{JwZJe+R1%yH0nIT znu2;R4IQoGObVK-Y)r)Vs6{sv)q|<1Rl69~(B<}gJ*vmsQ13a88j+8XSv5bP-W%a} z8yJJ}oF}3hlsklj#2H^4dy)$?hn9?nNSxD3^UHK^+wQP=mN?mvXOehT%z zbJi=U5x#Bx)9<)*9^Bczu_i`wLn`WpnWzzHk9u(*dp#FbL7u%n3B8=pvgd124cv+v zncb-Om0}R;=tGWEf90`>zhiBA7Zws#xXoT$i*e*7GQ(cmZJmbW2s`S(V=E<9SVYE< z;ba#1kSrrrM`is7I4dSc$ZKRKQR{VRepiqWh*tRkGMeaENwk&PkRBw3Oe8v9A+M83 zq&L|@P7v*|MMOtaZ9IKcUL-q+hHxOMI^L=(;G2P69&i2kC~4rUjx`io5+5lDT=RIN zHd9(pH1AUaK~dgXBPn$u?-D*PmB)xcMpPX~AG+E0N)@9h%pp68MrSqAF`sDd{Qua% z$zaltv?fc*UZU@jHozN1M+5RI$sr5Lc5+N#5p82_*&(DA2_x%BfHWoxNY&AZ!o0xa zD6cb>(mP~2=|;wrxnv*F;U|+x2AM$W6CH=iA+nLYP4bA2mt89Vw%~6WDJ7YeSKK|k z$Cj5=jY2#ZQpw`LuIQABgD7<(U5SoWE+*gFAG64Q(u;H_M@dieK3Pt5Jm+F^ttF^W e(m|3;hLyF5N%fS?@j9L|Uz0UaWmmFBdj181(QU&3 delta 3915 zcmYk;3s6*50LJlyA|@`PC~BamiQ*$Q6$^Y&YAdXWBI2@2ShSgse5Vpv znyG0%(n2My%ygP`CUu%-N~ap9rs?5ij+2j?$#km!$Guc%{PuUw-Miz-~F^n-LXoh#PPn?eZ`C>MPVjXtCtkFX9};CuHw?o# zybqa+$-%xj3d7Nl_hJop96R-gj@eAyNw=n}dFnlIuMqp+uWAbq%?RC-i zfIi0|v^#b+W)Y6Zw)inF!SkpAjbfA$_z1>ueN#w9GgyT5YnEVltig1wM=jl1jKyz| zzRVp|hf$oY-*-o~W6^~PxDq|6fxL_S#GFEw-h7Ec-J_dSv?O;>Ka8fqq)j~P#0*Tt zJRE?FkyFhN>65tiNUw={BY}CSelh;iFiE zDR>Tbi~c}uroT}gC$nQ&b<+>o24*-;Y0a&{A+!(m;C{1 zH#xYMXl&;%)x3L zgU5qZG=osqO-mMo*?2$dco8xgQ;ph;^~jTB4&r@y0w2OlI1ppFAFXi`YQP1kmGPna zt3q98J?d!+Zlj`+zkyofw=oo(9FL=31*cFyIFCC2BI^8aQ7iY8<8=(BeaBJjtacmJ ztqw;`Bo5gFK{L=fA=f@&9!6cD0CnOF)Ql=oGp<7ZnR-6d@d?!VAE9>lIc$U9qXzu5 z<4woAsP{@3_r;~>Kbnd$)3K-}EkG@43F?;Apa#4FwMTY4 z-@l8x_n$h)zeDYr-!PHun<%!lW;O`f*k%gq9#x_SwiMaGW({fpZ=wd+m7HYHt8W$|5vdc-t5cz>oK~^0d*YR&psgy)$t(Iy_$o~_a1d# zJ+{ZA$Yjk)WEq;i# zcm_4IX=(NaXCfQh%tLLyji}98huVCvU^*T_4fIFk)zEyf6U6hSR$u_?I)j5$bb(yd zOvm6RoQhiFUyw)J+(KQT8*eKuT`KCmkcC?6$ry=V)QlIRg=;Yf524P#h8kG-0DCV4 zlc?y6@#w<2sF79SR19JOze4Ty@fr4;uLwD0o7pN3GZn z?1Foc6$zU6sjOiQ&!aZUWL|&Au?{maZ?L@?SE2UAF~`fOnRgvx8;8lX`=Nf9k6m#c z>Vmtm2fl|fcoFZ>^M9R6D-PVoB)p4kbd&I){hUw09NJIfINXKWwAWBe9>%D-JEkjY z>BnF+7NIU&jXG}wcEr~(5gRZ~&;La#x~FZ2+IyfAYIj>syPwk@jM@{UQRnA5?LyR2 z7oqmjT-2?sK&?;>>UXP9{cdvF+p+oY|6VHkVFPM6H=*v;``80dqBh?p)C_K+_DE=s z-JuKB?v9$Vh3Y2*wIW%Vg^!{7U5^^z<{Z|)GnE}2&zhyf$U2p{{Ceuk32_E2MHTi!zL}Mj6OuS?<(f&}; z{ar`)67BLwNfA-mKw6OjmQCjDPW%e|DS^d@?=a>-7jCCn!+ z<=K`BR@QEExns9c)55ou%~bjmi1`R+C-iIkJ(cJVUf){$IAxm`o-RUbJQv*-tWw9)L2U5=WjOj}dlY z^Z!wg>MasRLyxT9ys1P_RULVWB$FD_Qj(}VU3(?M9b8ClJqeJJq=YOXZxWRpvVf$K zIV6^-G?2H+%VZgOl1wC%NK4@_rg?|#Bk9gTJ;QG}^%q)Jp)&`1k>_hSbx0^JpvGIm zj36p6+L(Ecd6+>ClCfkIIYP#eJ!B108DwLoIIhJWcE-TIo^+3=@x$boBH|0_x71fmhrV)aL4`HT7w~$^iY;0#edcA%bo~Qm CRhZQP diff --git a/website/events/locale/nl/LC_MESSAGES/django.po b/website/events/locale/nl/LC_MESSAGES/django.po index 89687729..406cd98e 100644 --- a/website/events/locale/nl/LC_MESSAGES/django.po +++ b/website/events/locale/nl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-07 19:56+0200\n" +"POT-Creation-Date: 2019-08-14 08:06+0200\n" "PO-Revision-Date: 2019-08-07 19:57+0200\n" "Last-Translator: Thom Wiggers \n" "Language-Team: \n" @@ -487,10 +487,6 @@ msgstr "Exporteer aanmeldingen" msgid "Export email addresses of attendees" msgstr "Exporteer e-mailadressen van aanwezigen" -#: templates/events/admin/details.html -msgid "Set all registered to paid and present" -msgstr "Zet iedereen op betaald en present" - #: templates/events/admin/details.html msgid "Send pushnotification to registered users" msgstr "Stuur pushnotificatie naar participerende gebruikers" diff --git a/website/events/locale/nl/LC_MESSAGES/djangojs.mo b/website/events/locale/nl/LC_MESSAGES/djangojs.mo index 28005efcb4f257a11277265f1235afd7574ac523..45b4277b004919c924e03b8b40bcd0697d490de4 100644 GIT binary patch delta 69 zcmdnS*2^{_#4Lc3fk6p~#TghFikTP~Y=Lw)kQM{dCxNsGkbVH9S%LIdAT0=_e=|+& LI<~ozaW5kPVTKFg delta 108 zcmeBW+r~B_#H^B$fk6p~#TghF<}fiZ*aGP-Kw1n)e*)4XK$?@8fq@lB%K>RYAg#hY zvFn&xh^}){YGO%dex9yNVo9o%f{}rtrLKXIuA!lVp^24|xwe6!fx%{9#siE1ovahN diff --git a/website/events/templates/events/admin/details.html b/website/events/templates/events/admin/details.html index 33d8ed06..fb68d9a5 100644 --- a/website/events/templates/events/admin/details.html +++ b/website/events/templates/events/admin/details.html @@ -54,7 +54,6 @@
{% trans "Export registrations" %} {% trans "Export email addresses of attendees" %} - {% trans "Set all registered to paid and present" %} {% trans "Send pushnotification to registered users" %} -- GitLab