From 19b4e6629bc20e50bfccf6e05aa040fa698c9223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Wed, 8 Nov 2017 00:18:46 +0100 Subject: [PATCH] admin: manage activities --- cfp/forms.py | 6 +++ cfp/models.py | 6 +++ cfp/templates/cfp/admin/activity_form.html | 33 +++++++++++++++ cfp/templates/cfp/admin/activity_list.html | 26 ++++++++++++ cfp/templates/cfp/admin/base.html | 7 ++-- cfp/urls.py | 3 ++ cfp/views.py | 31 +++++++++++++- locale/fr/LC_MESSAGES/django.mo | Bin 22602 -> 22833 bytes locale/fr/LC_MESSAGES/django.po | 45 +++++++++++++++------ 9 files changed, 140 insertions(+), 17 deletions(-) create mode 100644 cfp/templates/cfp/admin/activity_form.html create mode 100644 cfp/templates/cfp/admin/activity_list.html diff --git a/cfp/forms.py b/cfp/forms.py index 8e65a5b..603207c 100644 --- a/cfp/forms.py +++ b/cfp/forms.py @@ -326,6 +326,12 @@ class TagForm(OnSiteNamedModelForm): fields = ['name', 'color', 'inverted', 'public'] +class ActivityForm(OnSiteNamedModelForm): + class Meta: + model = Activity + fields = ['name', 'description'] + + class VolunteerForm(forms.ModelForm): def __init__(self, *args, **kwargs): self.conference = kwargs.pop('conference') diff --git a/cfp/models.py b/cfp/models.py index de85041..5e217a6 100644 --- a/cfp/models.py +++ b/cfp/models.py @@ -470,5 +470,11 @@ class Activity(models.Model): verbose_name = _('Activity') verbose_name_plural = _('Activities') + def get_absolute_url(self): + return reverse('activity-list') + + def get_filter_url(self): + return reverse('volunteer-list') + '?activity=' + self.slug + def __str__(self): return self.name diff --git a/cfp/templates/cfp/admin/activity_form.html b/cfp/templates/cfp/admin/activity_form.html new file mode 100644 index 0000000..6feb503 --- /dev/null +++ b/cfp/templates/cfp/admin/activity_form.html @@ -0,0 +1,33 @@ +{% extends 'cfp/admin/base.html' %} + +{% load bootstrap3 i18n %} + +{% block activitiestab %} class="active"{% endblock %} + +{% block css %} +{{ block.super }} +{{ form.media.css }} +{% endblock %} + +{% block content %} + +

+ {% if tag %} + {% trans "Edit activity" %} + {% else %} + {% trans "New activity" %} + {% endif %} +

+ +
+
+{% include "_form.html" %} +
+
+ +{% endblock %} + +{% block js_end %} +{{ block.super }} +{{ form.media.js }} +{% endblock %} diff --git a/cfp/templates/cfp/admin/activity_list.html b/cfp/templates/cfp/admin/activity_list.html new file mode 100644 index 0000000..4eb8fed --- /dev/null +++ b/cfp/templates/cfp/admin/activity_list.html @@ -0,0 +1,26 @@ +{% extends 'cfp/admin/base.html' %} + +{% load bootstrap3 cfp_tags i18n %} + +{% block activitiestab %} class="active"{% endblock %} + +{% block content %} + +

{% trans "Activities" %}

+ +

{% trans "Add an activity" %}

+ +

+ +{% endblock %} diff --git a/cfp/templates/cfp/admin/base.html b/cfp/templates/cfp/admin/base.html index f204984..fd40826 100644 --- a/cfp/templates/cfp/admin/base.html +++ b/cfp/templates/cfp/admin/base.html @@ -7,9 +7,10 @@ {{ block.super }}
    -  {% trans "Conference" %} -  {% trans "Categories" %} -  {% trans "Tags" %} +  {% trans "Conference" %} +  {% trans "Categories" %} +  {% trans "Tags" %} +  {% trans "Activities" %} {% if request.user.is_staff %}
  •  Django-Admin
    • {% endif %} diff --git a/cfp/urls.py b/cfp/urls.py index cb60729..1750474 100644 --- a/cfp/urls.py +++ b/cfp/urls.py @@ -65,6 +65,9 @@ urlpatterns = [ url(r'^staff/tags/$', views.TagList.as_view(), name='tag-list'), url(r'^staff/tags/add/$', views.TagCreate.as_view(), name='tag-add'), url(r'^staff/tags/(?P[-\w]+)/edit/$', views.TagUpdate.as_view(), name='tag-edit'), + url(r'^staff/activities/$', views.ActivityList.as_view(), name='activity-list'), + url(r'^staff/activities/add/$', views.ActivityCreate.as_view(), name='activity-add'), + url(r'^staff/activities/(?P[-\w]+)/edit/$', views.ActivityUpdate.as_view(), name='activity-edit'), url(r'^schedule/((?P[\w]+)/)?$', views.public_schedule, name='public-schedule'), #url(r'^markdown/$', views.markdown_preview, name='markdown'), ] diff --git a/cfp/views.py b/cfp/views.py index 49de4a0..7104064 100644 --- a/cfp/views.py +++ b/cfp/views.py @@ -29,7 +29,7 @@ from .forms import TalkForm, TalkStaffForm, TalkFilterForm, TalkActionForm, \ ParticipantForm, ParticipantFilterForm, NotifyForm, \ ConferenceForm, CreateUserForm, TrackForm, RoomForm, \ VolunteerForm, VolunteerFilterForm, MailForm, \ - TagForm, TalkCategoryForm, \ + TagForm, TalkCategoryForm, ActivityForm, \ ACCEPTATION_VALUES, CONFIRMATION_VALUES @@ -896,6 +896,35 @@ class TagUpdate(StaffRequiredMixin, TagFormMixin, UpdateView): pass +class ActivityMixin(OnSiteMixin): + model = Activity + + +class ActivityList(StaffRequiredMixin, ActivityMixin, ListView): + template_name = 'cfp/admin/activity_list.html' + + +class ActivityFormMixin(ActivityMixin): + template_name = 'cfp/admin/activity_form.html' + form_class = ActivityForm + success_url = reverse_lazy('activity-list') + + def get_form_kwargs(self): + kwargs = super().get_form_kwargs() + kwargs.update({ + 'conference': self.request.conference, + }) + return kwargs + + +class ActivityCreate(StaffRequiredMixin, ActivityFormMixin, CreateView): + pass + + +class ActivityUpdate(StaffRequiredMixin, ActivityFormMixin, UpdateView): + pass + + @staff_required def create_user(request): form = CreateUserForm(request.POST or None) diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index 645f52d179083709337e7fed0c46ce9a527533ce..b10b1718d6745162fa76460ea7ba1e7aa9bd2546 100644 GIT binary patch delta 6315 zcmY+|3!KhX9>?)B=6+)?%#6$M80KP_X@(h%Vag0e?n`c~3o)7zCK^QXD9XA{DB6fd zM8wh%TUKscNGYY{wp&x}=2poja@o)KIfqyMU;Uo)*h1YQj><_XFtqSb25zIbEW;eJfPpacRlFamQh77MXH_C>ldV=xpaVLhCV zVYu9#UyC)3@tP_MQJmOq8_cJuFMf^c;2ehIC9H-1b$u6_SS+BPgn>91HNoMSigQu- zumx-5`^Y_*6R3VKVjSa}>lAcHb(p43G(b%t1$8Ic$V^Q>2H-uIjy*6FC!!{>26ZDF zun)eA>L-@8XyOe~{byn%=3xlqo4YA62h$USu@p7qG5P{Ni*Zj~)>G|asPETB4V>(3gW<1#7mPz?Xc}sOS*Yt4pzdgi zJHHCEslS0~cnXs-IMJBKn1L;@Cu+|;nMnSXvgc?}1}aelz2n@C8gRcm{|V~CGuRYw z;67~HknG?&EWyc*SUxuKcbJ8djINB_LHcxk2h`^6pG5vW6o%2Di9Cb!VHRO7ZowIN z2FKuIO^kUFzr{8pUvY+{+RYV*+Jwode(pfufT-{Hb@id{{3z57OtN~-H1~x$sF^K7 zbySIgxB->2&8QUab>}}vrM%jm{{fZB8^~&ys5Ew_s0npOR@3zJ$@)*Epv|`w zHG#KKU)+VkcnCGn7pOI_Mx`#XnH?YrH9#7wJr_eTAC;L7&igQw`Z&}Lc`<_VO$7z5 z)lyUkZ{jfAikeu1bo**;jatLrs5eB(Padx-+0tS6Hyatja_j- z3!eW`6jsup48&v@!%dqsRJ}LSrzt^RYUX+8M&!{q2c4(!HtHd~k6U6Ms-H(tOYs6~ zBFj)Wv=aN`x=iw~20yOW7eY|=ny9s}gX$m=b>}I_Yu)6bGSJ7h_eWh{iji1`deKbA zP@Ip-$P(1%d(FAuOF=0-i(2cSoZ(q^0?DYg%D~oGgz8`--ib?56Fq^N=r^cTpF@2= zDBD_q-KdwNGPDc%&v-BLsTrow8jV?)k40D$CnHaknS;Fa%x2V59L03Jh#I(2D<+9) zs0{Q&WoQ`cd>3i&1O&Dk{Yvy85T6rMiZ(7{C_S zbqS~eJ*fVgp$5!!^*m<*Ch7OT$TbvW7e8Z0NG{ltYab)!Q5|NWmZ&xA@#}?6vBaI9 zi(2DFsNaxESKo=6zy}zIM^OEo#Y8>-LATq~H${D+HR_JKqn?5xsHK>I{AZr!LmlqG z_PEa(nrA20#rcqP5^7=#Q2oD*%G74`s<54cQoR@T#g9?HUdK@>{}suyxsD{ov}|KL zD8U5kkKzcNiR$MfYU0{RnrIwGp$Bz78#R%FeDbd^+)INxdH_|Q;Ob9dGWC~G7w$w4 z9>fSdhgzB|s2lNbYu|w3&W2cz_H3+=-JB&@m-_U!u%!!rr(8_1H!i*gMZbO{}Yzg6?=YY66d<2A+T^ zI2Dzd)u<)di2-cVi@1UM0R3Lqrckl)L4WGdI9r>FbBk$rT6xZV({2sLg>+iOI1;34~g83fR-n5h51KC)M zdMAv>{-~#;47pLSnP&@TF)FpMpgLHGdXa2%=ihVZ54rj=)F!J&y|^x;)-=4c?I#&i zsb{(R0Q9Fm6l3sVjMei$iGory4+rC`z7wSR9@}vOYM^w~h3&CE_Cckv3^m~?sK<6T zYU0b?`Sqylw!8L2uKgs|VtjL!f+lbk12MXb9WWl%VFqe|LJY$msLeAFbzM0o;!M<2 zvKsYxRiXCI0ZhYcEW(Jcc5n4WuVy-)g6?oS2IEVpfma}pvUv+Nu^%xAe?hJ3HPrVb zyV*@#2R+mqVIyphVK^Ao-y^8;yr>(P+l~CIgEcgi;6`kMb-UXc7a%`mW;m+D#i$Fn zqIU6N)Wk2Le$66#*uMkrL|%%f40QvmQA_p}hTt{S4F&Zi|4Ly*Py2>yjJm^?sEM^f zZK^`loeaWo9PZl3qIUHh)Eciu4Y1X`!*) zMW{8MgnC?F#0I$4)jvbtDduO)!>r!+x>D2xDp7a17Ih;VaV&0g_2zwSySEhuUC`Dw zbi`2V-B5Sd4?Q><_4rhvCb|%nsW-4DR=M`ws7xJ4W$HU@ffq0X8{KPvmb)Y4cuj8# zQJlCBb>S$~8b6NtxDb`0k8lWHLrwU>zILJ|sI?u7%E&zArD#4tl4`>G*;n)+Y)O47 z>IM&Cl%D@DDdf;_+SkAg`@0thY6%9Q1{jaoxBxYQy_kg`qB3zEYhd62J3t63V=<^D zh{H&1h_$c<1~9&9M?tA7baqD#G!V6hvr#FWkDB=ojKF=Uj*p-waMIPkL1pqR2H+*< zRZOGqH_(1R9ld@u=q_~JV=+UW@tmwnsFQ~Y_KvAZy)#A=uM__!0%?mR-lN=#(6Nh1 zCzh(h5yyEQD~J?AOU~gnU-GH6{e#d(VnhGo*hB4K#N)&=;$woP^&R)|`6)5oR(+pa z`Mg4GAj*6#q?^G{QdZh^JZIrk`R5o%>?Inj;*Q(#8)7Y?bZYZlBW4piHd=0d?xVDx zSVF8JVu(dVZK4Trn3zwL5Ic!EM7Z+*IfX)^iui%Jc?_Wt#rdD`0uf8FM}5ard=7Hu zWIW@_8erJ?_e=6?~!OZA??u4G-EySzDqeKknbbM&> zeRk#Zx8Kz_yK;j2Za3;|c;iQ1kKHsPhj^LLQQP-D*8dolL%t^d>5X@}@?V|L;6fsZ z81CBMa^8>8bd-c2xwhXknaUePGvYdV=gg*SVc4>bj-Dw zuP~9&TkOT|9^N4ZH);1 z0on=c;Lo_5s7LSuG!e87!#>0|LPrr%pZGu(j{1B@$6$^B9|{ksMq^W0M;s-7B{~wZ zwAUlzDL+WeApSz=7)?wfc#--3Xl;N$5(UInVl~l*&=Eo(nRuJ8#_tS<-+caCP??($vXMQJL}E)s5+o%EiP%zmY^|sgORKgTMNk=3J8#v#v_>Ps3}dPZ zt!)~qDr&Et%2-CJQl*x$bZE!eJKx`Xk3R16{PQ{I+!F~v%bdUQCTgd^Vt|^jLY<;5KO~xr@>4@T{s)nK>_;VGJAeCwxGTlz3?7tVoxv;t$I=8cQ4i1_dtfhA zKdUhazd#MV7Xz>i)&Dt+VtjLjf)9F-Kh3xT>VoR1nI>XQY>CRmYskZzk*EnyN8Mk5 zn&?v7z8rOZ32NZ2sD2M&D4sxQBme5C9SyPzYQP@$g1)F5^RO1q!u_}o=i&J3 z42nKA*aK|Z(U^jTF-|7-GYj2+1hrW&Ag9bN)RG0&B>(hbV#se}Y=tv0569qRT!guC z#xzA=X7MhzMx}N)GNw6-Jf!&|(dM{P!r1Scc@s0oHxUDYYHp&<#C`dn0p z<58Py8fvpGK;5_&HIdDz>%O-2WA^-6)P%2D@7VJXQ4{e>bovQKFTMZOC@4j7sFXFb z7qmmAINP3o1(mu{NS2KY>A)1BCbkMSp^eC@nLXC4sLkeA+nGQ->bey4(fi+$f(B}j zTH|c=#JQ*e=A#BEwCzRcOZ`(+X4YE|p)zv`^+2~!_dP)^jb9z7-&h<>JptYC{~QXu zai$oxW;;=9dl5CjLwmjwUmv}g7F%qbd_f%4Be)<9ly)6ANK^{J1?hPV>d(HYbedh$KiL;_F`5{5l7+SW(g^W$y( z9rWS+)OxJHI+#m?p1c708k?1<4D7P)dr<>?ivf5J^8qCHTl?uWWQ&$w?@ z!2;9+F2f8g!9aA~puihq9wHw(6UW_JiVn#BF@sP8e}H7$6rwV)2bH1Y_WUUh)0* z$iN6}i|VH@Y7^&S2Sv>^m)ZImjHmsVrsQ8YMzJMhFdqG}J-T;0YC`=m6bDk5pbz6

    oki`P+o)ZB57nPfGpD~`RK0RD@~_my+7ro`Nj(+yNzKDLxC#^T1ZLwS z)aH7jx%0$hF`D`;RA!1$6Ih2DXagqTHdID_LS_Dmi-IS+vSAA@rXj5*8w4-oNZRM} z5g39GGM$+ZXze`tFw~PyMQzf>s3+ZqNq7Xg)!fGdY}&?{Nq7{OVdu7dUD0)&!fpzQ z?VQwK$9mN7Az3qt?Va|4sI||Sz!q;wW2Ri24A1gnFHdQ5o5U1MnN$UcaN$ZyVGe%E2l) z0t5B_&!nIk7NR;TLe2C`_XYgB9d+YL+kVxy-$iA@E6W);9KER5MLkFgs=xNA{`;UF zs=v=r_m!bG?e#9?Uo#Kx>ik+IAU}MjH}WwvGf_{l1GQ!k&=(`RIZspr zwdV1t4^aksV`tRFvQc}e59&e2p&z_>+B_)p$F7Yej zLo^}w5J6nm5_N1LyomtXJcz%lkz)ff!Cm4_puGm=cQw<+#1LXR@$?9KTEK(Pl$TL% zO*AH+C&K9{6Tc>!5j~0Dh&&>cI8L-9{JBm?IbxT)#LqFhV)zrr$^KY{c!%gf+$LTm zP7^JNNaD}LG~(&;IfY8Z4PudP?2Z4nWzml~VC#X5<4dfx^;E6YZYryYY}@#hWD2K< zsl=DWWx|i>OEguPjw0|6#0g?GQI}Xk{Dsi5-og9_|3-`@5{NOx4x)nAU&mGlGsij~ z|7gpDt;N=>)-PRrkv8tao5)38xSt29Sch9X88pFA4*ny>Hq)$ diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 921c94c..6191abb 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-07 22:57+0000\n" -"PO-Revision-Date: 2017-11-07 23:58+0100\n" +"POT-Creation-Date: 2017-11-07 23:13+0000\n" +"PO-Revision-Date: 2017-11-08 00:14+0100\n" "Last-Translator: \n" "Language-Team: \n" "Language: fr\n" @@ -402,7 +402,9 @@ msgstr "Si vous avez des contraintes, vous pouvez les indiquer ici." msgid "Volunteer" msgstr "Bénévole" -#: cfp/models.py:471 cfp/templates/cfp/staff/volunteer_details.html:27 +#: cfp/models.py:471 cfp/templates/cfp/admin/activity_list.html:9 +#: cfp/templates/cfp/admin/base.html:13 +#: cfp/templates/cfp/staff/volunteer_details.html:27 #: cfp/templates/cfp/staff/volunteer_list.html:32 msgid "Activities" msgstr "Activités" @@ -422,6 +424,30 @@ msgstr "[%(prefix)s] Conversation avec %(dest)s" msgid "[%(prefix)s] Talk: %(talk)s" msgstr "[%(prefix)s] Talk: %(talk)s" +#: cfp/templates/cfp/admin/activity_form.html:16 +msgid "Edit activity" +msgstr "Édition d’une activité" + +#: cfp/templates/cfp/admin/activity_form.html:18 +msgid "New activity" +msgstr "Nouvelle activité" + +#: cfp/templates/cfp/admin/activity_list.html:11 +msgid "Add an activity" +msgstr "Ajouter une activité" + +#: cfp/templates/cfp/admin/activity_list.html:17 +#: cfp/templates/cfp/admin/category_list.html:17 +#: cfp/templates/cfp/admin/tag_list.html:17 +#: cfp/templates/cfp/staff/participant_details.html:13 +#: cfp/templates/cfp/staff/talk_details.html:10 +msgid "Edit" +msgstr "Éditer" + +#: cfp/templates/cfp/admin/activity_list.html:21 +msgid "No activites." +msgstr "Aucune activité." + #: cfp/templates/cfp/admin/base.html:10 #: cfp/templates/cfp/admin/conference.html:8 msgid "Conference" @@ -438,7 +464,7 @@ msgstr "Catégories" msgid "Tags" msgstr "Étiquettes" -#: cfp/templates/cfp/admin/base.html:21 cfp/templates/cfp/staff/base.html:21 +#: cfp/templates/cfp/admin/base.html:22 cfp/templates/cfp/staff/base.html:21 msgid "Please select a category." msgstr "Veuillez sélectionner une catégorie." @@ -454,13 +480,6 @@ msgstr "Nouvelle catégorie" msgid "Add a category" msgstr "Ajouter une catégorie" -#: cfp/templates/cfp/admin/category_list.html:17 -#: cfp/templates/cfp/admin/tag_list.html:17 -#: cfp/templates/cfp/staff/participant_details.html:13 -#: cfp/templates/cfp/staff/talk_details.html:10 -msgid "Edit" -msgstr "Éditer" - #: cfp/templates/cfp/admin/category_list.html:21 msgid "No categories." msgstr "Aucune catégorie." @@ -1339,11 +1358,11 @@ msgstr "" msgid "Modifications successfully saved." msgstr "Modification enregistrée avec succès." -#: cfp/views.py:905 +#: cfp/views.py:934 msgid "User created successfully." msgstr "Utilisateur créé avec succès." -#: cfp/views.py:926 +#: cfp/views.py:955 #, python-format msgid "Format '%s' not available" msgstr "Format '%s' non disponible"