From e2d98d9962f62985d88105fae4abd609c8b9b798 Mon Sep 17 00:00:00 2001 From: Martin Bauer Date: Sun, 30 Jun 2013 16:55:00 +0200 Subject: [PATCH] Eventplanner - cleaned up urls - permissions --- blechreiz/database.sqlite | Bin 54272 -> 47104 bytes blechreiz/settings.py | 2 +- blechreiz/urls.py | 18 +--- eventplanner/admin.py | 2 +- eventplanner/locale/de/LC_MESSAGES/django.po | 80 +++++++++++------- eventplanner/models.py | 30 +++++-- eventplanner/templates/custom_tabular.html | 78 +++++++++++++++++ .../eventplanner/eventplanning_view.html | 4 +- .../templates/eventplanner/events_grid.html | 20 ++++- eventplanner/tests.py | 16 ---- eventplanner/views.py | 74 ++++++++++------ musicians/models.py | 8 ++ planning.txt | 40 +++++++++ 13 files changed, 271 insertions(+), 101 deletions(-) create mode 100644 eventplanner/templates/custom_tabular.html delete mode 100644 eventplanner/tests.py create mode 100644 planning.txt diff --git a/blechreiz/database.sqlite b/blechreiz/database.sqlite index bb838bb0aaab331fd396657eb011c44bf50e37f4..7763ca4f371e8de57aebbc6f5a04c6b129abba72 100644 GIT binary patch delta 4629 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 literal 54272 zcmeHQ32Yn7dEVI}MUk?6$ue!rvR0BEKh+k^-R1Joi~Am*4xglKS(Zh%sj?zhA|+nt zAxlJp2ik4W06l;f30m|*+Y}9Y=Rk|3MN{-OMX&Ti&?0TpBR$e24SJ;skfcEWnLT+u zNqK(n#rCeG(eBJYGyi>RZe6a3_{F{9LF$7WEe(*Km7>7 zi9^4D|HyLQN@uZ(e9aygZe%g=@V6DIN9__f=2XFU^QPmlM?C}OgOw6a~fp95G{ zpu!@(CTALVE4+E`dN_<--be&Jy4%u*m6B4Xx1AKfl}?~& zK$vWGq~aE4=VljXku|45emN5eH$gqyHXU8(Mrl#a+6 zbZMozFy7x*nt^R=sQ_`Rs1*R{US@l|w=Z-@7Y5w=?s{3 zq;{Q%JL+UEpm7Th6_`?bv|7nIcf_F3YNQleW#s(SVJCAA4eJ%rWKst?dCMUu!=njn z`3jwHoO%`NQ{^ZDA@6f8%;z-n` zJ|lxxbyEhdeoKZ4kI@H&hbC&mh=r7M8|-S#)GA6DYfO-HuGgT@YNr%ht>pZas|jA3 zOsXL#V?9o0Qte}{d^*vwS_SlC42F+Jqt&3&XjRaQ(+($d9*yW-s1lG$=-CDAWJ2ys zmQFP1D6J+l;sR?BYt@-)T9szRIRxGArnd)y(o7(A(<>Ohr%!m;6U-Sj$KWsFzrr8G zzlwhxzZ=(a1~1_k@p*iZ{RaCv_Al92*blHj#eN^V#lD?&qW?gjLVt*U9sMkN7g|Ge z>QCp{;Ms^BaiAAapVnc@7R)Clxm?YrvL(3+Zvdley4FYS>D*}til9EyGwq2ZM;+)K z@>mN$qefZF8$RSfBgkVEaeB~!E+Ds-D_^SsGjd@_jny*hv8QNpZjx7zItl%D6?K@b zPe8&Y)T@=3a2)m0yNk^C>fC;uR@ge#4yv(QA^L=QjI!Y(CFoHDM;vGzS?A27 zYK)eZ%!5Y`I?yocA=${~;bRUofm-IkLu#a+OP$UR(xRL+qZ-qH!hv|yVIn)ACTRIB zvrr#xiG!43iS^Kut#grEjnN7q^Gh#f8{+W z|Jxw3BWwho83gR-|1;Coc0+9h+7Pgx|80=i5jFzP3W`HH&UMDRLknx@7M7XyP?y1h$2k-asLy z#_l8Qjg)$$;~yPl&_OiKzQ{K4FXB(&PoQ6Jn)v|0c7!T;9n^^yqvGD0GX~0)=|r+YJCU`874$ zDg~(toY7J{N~E>R`cc|0VtzWjAcAHT2_k4O^!9k~Om-JRgQ3Sl}bhyq~KZ5 zs`2~JE{5lB-;sd-GC@ZTTls5ar8#@}yUEyTwj? z%}=Luw`OknV>^86Y~bpR@a&aKHF-97PYlNcGXW*LHN9S4u3o>lc5nT`bbWjNlEmNN z+VN|A1qomN@RSgo@=HF+9}EkDJP|lA#Ax`ETvN)cBv?_SUtG^``_hWev=HKWaY_hJ zNq+MDXYm&p(8~M56VvrJqc#FI0{cXu4-X-2@?zciq+6XC$n)R9yq{s-&(_%YEJV86>Nis;caT?TW4lr*c{!UiTNsks8c3M0%4=(# z8HZFkRn2aJPIaet5kyutKyz9F7~A0SOz;PKyt5;_uVks3)&!+P-EJ&X>(;o}%%~&H zH&q7;{r1}H-O-F}2i4s%xl~%o$*YP5-cDqBP~&}d5<>~tED_dT)qJqXJFRP*BS4s*^*YPV7DBr3r16XF!2?cw|`Dc+~$_^b=_I`Ew)VR^@d)sbbN4 z90DEU5$`ZO3skjoIi1fIbp6GnphP_A9VB{*^p6BXpfo%*Jf!JY>;JU>&w;k^xpU)I z#b=9NVa0NO1T=>S2M5XINFJi({{ZL*dk4LAtA)hTlVQ*U9vvJt_X9|ZdF8>Yj0YcP z@H_C|fe!GW;}78gK8$bRpM<&K2jBdzw>hv8cq0)Qcbwx<+g#B!=ky(Sob$HRc#b

RQQo-zMuJGVNQOFBx_tUZbH7S{oNwNAu9=bRa6Xr7WGn@7J zMpT-=x3m$f-`VUC8CPX+sG8G6;iGoiG@R3OH;eg8-dnBoM z-Zn3;-{<*MXmh8U&B~GcNLT?iU|oZv6%43Hr5}+^T~X?zP=sL$AtJyCKJDs z*ooDzi4Z3w7hlT8uEgpr(3W(#_~q z^JWB81X#`tPX+uwV%{s@^59Q1PCU-wt9Ts$5YFS@c)iEJUA~RL6NSK897FVR^(vEw zixA0M+j3eeWiwKFCof6G@_MyY$^~Vmw3bcMpkonQqOroGU9W5^ zJLbw)z`EYnZZ=TQ18Z3F7*|!ctF23T%62JRR#wO&SI4EU=MVRI=O=bqrqQd>S7@~B zV~vYPT;B0<^l-!qC3!v60f5uvom&qnM$>hvNUI222P28;A}kBSf~K+X*>0I`ta$;< zDgf=7cuYMH-_PVm*)R8GL9$p_AuF*RdO}+sC7;QAl+`1oz=Or)A=utC*A|;fv06>k zy2eV|QcQ7mLrGO>0pym_Skq$5N(rjfyFlpB1zJPbax!34$;-JM7{KIeg-UiE7F=6z zP|XTZ9xNQm>wrwtP3)N<;~(LFX5iO8Yy@lsoL=upVruZtMH^zdX(}KA?|dW_YA%HD>5?TNP5A|1h?j&g-<&1q^iXt9qDG(2t11N| z2~$$Y7ZyViDTH}-Q`q2A-wgF}I^WqmJVl7PXii_?;>Kc{bwRC-W4@f@RchlyK7S|@ zgdbbm*sittrvh-J20~((e_XY#AhoMcqDphOiT)|S=nI5` zK}md-%A)Bsyb`o^6^v`1SaS6Dk>|f{|BHZNA2tHd9s;KP5BebN{Ox=zBG7OgcRh3s zxV)hddNfHth4mS&Vm0>NG4e$7=W$1x{eEh`wy(&vQc0O#cznC;jcPjABoQnmo{5Jq zA9Hzm9(~V53le(M^#2vZn(wJ@80e&r4**SS#ri=^Hk?$G+Rb0n^i{%aWhW__Y@t#u z*YfcGWYPsR2LxlQ*>W|LmSHuAtiEVp(Lk>#7HV+yprxd;)#imCExw*Dfq+^XK8-a$ z5?XwzwwlYPR!DD^vn8^&png1iCZ-2_y!ZHSYdSinCj2XWd)yGYslAskpvEM1FhM~w zx8+yFkg^s~Rs${ZXSANY7N412Zu8J!~!~lEtgA_*R7Jr^00`RZhtkV0o=l?f29QX|7OAWnghmfbRwL z{J>~`KkjF(wP~`rT4nm%z37Kxp~0K(NH+!_D|@Q^|5q6N4RsOVabs=C|-{~svu`}gJl2Qqx8mOgscPC1hIU~FFnCO&Uds?UxyjCAfp%EuDjUu`qu1tlXSF-Q);NEySquxgk(-P<`5IwdiXGtv;Nd zJ7rL6bs3aeb^7(#NrNk>$JhmEa`fcERpt!-cJluJRs7%Jm-AooKj6Q?pTvKP{{a6k z{w@6L_}B0+;P-((z>k1@;P-)bzyf#&TgBfA9>Q+n>v#r#yZZAuZxy>N8-XVQ0rDQ* zH%dc}h9e~OoT1?`4NsHMJw(G(G$g*&j`ou6w*$SzYg$k5aT4zuq~S3d4v?_tC=HL$ z@GuFThiG_^hW#XT9H3zz4Lu~pZW{K|&_zPFhlWlXIvm)IFbU}Uzit2LNx08!9&H3( z9|Xwze-HC^27bQ*^1mGWK0MFN?z67Ob3-ogohWKtGxsv+QfIBwIO%nHZ$wbzc{7PB zBU!D5u1ISEURaCBbho1|d8EUpM;nn*hGp-gjfiZ4sFB1yb>qwlmABbf<1H+vLu-*R zm{T!4fSda?mC-%%rkAlBZ)U-CbEd(Zba`KxM2%6CL5eGFLuDl>2K=d@n4+v%62>|( zWl1*jS=g~86Oia7#R#2JSs3rkLQ~IK3K`#p1wCJP7A*bL{q_QBUK6uUfKZk!Bxk$v z)k@eEq*lUaxO}J8k#M&KuGU;D`YmDhT`S4CJ+rEp)e2^7iG)=X3wn#$&;NbSbvC(; zz*B^PJ^r7f&a|6iBd|{d?D4-(z-)3Gfu{%od;C8|ooP44Mqr-^*yDenfZ60W0#6YF zWc)j^LhOJ3F8*2k-Ee9jHUc&Rj}w72IEqvO|Ij2KFfI27!(h5U&}$|KCz~vE@q!SF zxLT51%$hl^$$XpHHAho&n=LwUp+Nk9et=;jMa*2+qKk{VDcTqF7NXbuoGsS&M^2+Qj2Ri5My(0Yb!4GEUlS8Xa`P5b?}*9*Z$-eM zHFUsQS(w;`1zqE;I}2^fV~t~+%X=+^8WLqimpf}x$}}M9nEGwaOm(C&N>DlLNYjMS z!--LbH`Y!76?ix}_G&1+nyuzQrBJuyW3@A-=@(Xa zN*01(n+0~$q*SX(AJxPW3ALhBjnXE|K3a-yX2Rs8NzKwTL7xA^xTMSfeF^^?{wJ^m z{3(zC{4@MV_~ZC@@Na?);0HiE;OFtr;GX~~z#qmxfZq*o3NPb2u0dA&uo18k*dqc& z@NSp{r%5nGf>R_oNrDq3@RHy-2?j}Uj06KDI7)&eBsffhLnJszf_@SlAVD7qJS1?F zpqB(L67-P3NrDdYf5Z3=1Gazu7yk$TJdFOI#|eA~e+K_G{tNuaFavxH`~rLk|1$n* z{A2h%U={q`_z`|5egK}rH?e|O_SkTn%tqkZK!AwZx~cH5n+pGWsPM0c3jcael2p$L z8hU9+g?~L%_}4>)e?3(A*F%MWJyiJDLxq1a75?>5;a?9G{`FAdUk?@j^-$qo4;B9P zP~l$>75?>5;a^OJf3btqh%pUW2S#o%odk#D+2|O%l{Nx40?i1J?|&9wMDSjJu{p)Q zvJtQmup*FU-OPo7QKr8!2omE8S5Ru2MM*G5N!Ryy|D+HIM0}zci9`Z{P$=jR_#+p= ziexwfRwTnhILyPpQ1~Jt3ix^6ObkF4as-8oe27^C!+%~{*EqFVsn_5qzCX3hAxR4R zBVf1@a?lz;h+Y)^K_L_f@U#XoB1CA6$OlDA6b?oF5it+~@2J7>MLyV%KhHSudtLaw z_!FSz_dnM5+UGU`HUcUF;1%;b-0p$938iwU$YoO*u9C`>mFz0Fp;YVC_K#BFZWQyx zSQ!xGUtvPXJ#d4C3|EV}oXn;1`@mp9b5vI0?#a3InxatSL0WdX+=qG?xBJLIyttZ^ z@p;_CAormg>31+PizEi1fC8ATnPh?FMRq&9t<#-M-(_U8u

Gx?9R`%2cIlzPeb(raiHSq2mox=W_pqIMmCeZ42{(HPPZlLdZf$Wk! z6x2Pl?>_Xcyl2*ZqieU_v|TpB^o=ybjZ61EHzUO}0R!ZfC+99EtA4Dy{7+8}`(F;` z0fWAVe;Q4}$s2RLKI7lFzrmx=DtjJ0P2<0D`K&sHJ)z_O(b+N3e%8nTZu8PE)7Hh^ z_RpK<^Zjn78*nea{#MaqM=s(d9qh-{`{5Er+ehujF z1TURXy^&neebs<_+Ys@yN`57u6b|~uh)00MQOnwBi_@GNUbPIV$!QKROa;PIg5ZM% z(qKgJ@SPm>7;b6wmpR{!8-U^Ex z(+bm}QYRH*N(_QmB40oN7Q0By?CSs+kjTPYb@1gFe5=`w86bMO{3kW*lnE2%Qf7B#E#p zjs?xWcKD#qaf@FmnBCzP5yb$k)px1}hx)rPNc=g2GiN?5@ZgcEox#S$0o6wkNJg$( zyO5s(XI25h$MZp0r0?R)idB8~&{u+H+lbuQEctl6Wi@MP3}o(`%Vzoh|0=8iknex{ zuo18kc=`}fzyE1y+W#ZZe<%7q2LA>=%f866aB3e<7y@q{Rv%O+(WLsc0W}hVyq19r zL4o&y|H5!E;?{lpsUG~+l~>*eE3f6M@2#i1>50dM)KO4xiH7*a$VZ5njo7 z@VF=h!u37y&e+3RbT?1t^NX8-`Nd>zekQpYo0-cbghU`wPv(;|$&L6%icc=iZYS!w zjpV(A6kptwk{jub_{{xiw7_pi?_`!{bCFDXd7-#0F4dFE*VhvHxeZxZswJ<^PA}cb zZOZw%T2ctt5<;YwzIwfs$V!y{X8thUUR=M=^QqA0PBojABlnehCY_SSt&$WI5@KR8;g4;s zKZxg(`FMSOJD!gT@tI5}ekHLJt6vi#PDn1kl#N}9)qzfoZM=y$+tT{2C>+aTJeLyV zrBy*%OD<;~$jjHI)a|94(W~ao*sfhj#y^5#55IvobnM%e*$BL$2s|9[\w]+)$', user_edit ), @@ -32,10 +26,4 @@ urlpatterns = patterns('', url(r'^website/$', website.views.home_view), url(r'^login/$', website.views.login_view), url(r'^logout/$', website.views.logout_view), - url(r'^events/$', eventplanner.views.eventplanning_view), - url(r'^eventParticipation/$', eventplanner.views.event_participation_detail ), - url(r'^eventParticipation/(\w+)/$', eventplanner.views.event_participation_detail ), - url(r'^eventParticipation/(\w+)/(\d+)$', eventplanner.views.event_participation_detail ), - url(r'^events/grid$', eventplanner.views.events_grid ), - url(r'^events/(?P\d+)$', eventplanner.views.EventUpdate.as_view() ), ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/eventplanner/admin.py b/eventplanner/admin.py index d5e4562..edab05c 100644 --- a/eventplanner/admin.py +++ b/eventplanner/admin.py @@ -10,7 +10,7 @@ class EventParticipationInline(admin.TabularInline): has_add_permission = lambda self, req : False has_delete_permission = lambda self, req, obj : False - template = "custom_tabular.html" + template = "custom_tabular.html" class EventAdmin(admin.ModelAdmin): diff --git a/eventplanner/locale/de/LC_MESSAGES/django.po b/eventplanner/locale/de/LC_MESSAGES/django.po index 3808a99..10e733f 100644 --- a/eventplanner/locale/de/LC_MESSAGES/django.po +++ b/eventplanner/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-30 10:55+0200\n" +"POT-Creation-Date: 2013-06-30 16:20+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,18 +18,22 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: models.py:11 +#: models.py:10 msgid "Rehearsal" msgstr "Probe" -#: models.py:12 +#: models.py:11 msgid "Concert" msgstr "Konzert" -#: models.py:13 +#: models.py:12 msgid "General Rehearsal" msgstr "Generalprobe" +#: models.py:13 +msgid "Party" +msgstr "Feier" + #: models.py:16 msgid "title" msgstr "Titel" @@ -39,52 +43,70 @@ msgid "type" msgstr "Typ" #: models.py:18 -msgid "date" -msgstr "Datum" - -#: models.py:19 -msgid "time" -msgstr "Uhrzeit" - -#: models.py:20 -msgid "participants" -msgstr "Teilnehmer" - -#: models.py:22 -msgid "description" -msgstr "Beschreibung" - -#: models.py:23 msgid "location" msgstr "Ort" -#: models.py:44 +#: models.py:19 +msgid "description" +msgstr "Beschreibung" + +#: models.py:21 +msgid "date" +msgstr "Datum" + +#: models.py:22 +msgid "time" +msgstr "Uhrzeit" + +#: models.py:23 +msgid "meeting_time" +msgstr "" + +#: models.py:25 +msgid "participants" +msgstr "Teilnehmer" + +#: models.py:45 msgid "?" msgstr "" -#: models.py:45 +#: models.py:46 msgid "Yes" msgstr "Ja" -#: models.py:46 +#: models.py:47 msgid "No" msgstr "Nein" -#: models.py:49 +#: models.py:50 msgid "event" msgstr "Termin" -#: models.py:50 +#: models.py:51 msgid "musician" msgstr "Musiker" -#: models.py:51 +#: models.py:52 msgid "status" msgstr "Status" -#: models.py:52 +#: models.py:53 msgid "comment" msgstr "Kommentar" -#~ msgid "Delete?" -#~ msgstr "Löschen" +#: models.py:72 +msgid "Can modify participation status of other users" +msgstr "" + +#: templates/custom_tabular.html:17 +msgid "Delete?" +msgstr "Löschen" + +#: templates/custom_tabular.html:74 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: templates/custom_tabular.html:75 +msgid "Remove" +msgstr "" diff --git a/eventplanner/models.py b/eventplanner/models.py index 12626bd..155c6b3 100644 --- a/eventplanner/models.py +++ b/eventplanner/models.py @@ -1,6 +1,5 @@ from django.db import models from django.utils.translation import ugettext as _ -from locpick.field import LocationField from musicians.models import Musician @@ -10,19 +9,21 @@ class Event ( models.Model ): EVENT_TYPES = ( ( 'Reh', _('Rehearsal') ), ( 'Conc', _('Concert') ), - ( 'GenReh', _('General Rehearsal') ), + ( 'GenReh', _('General Rehearsal') ), + ( 'Party', _('Party') ), ) title = models.CharField( max_length=40, verbose_name = _("title") ) - type = models.CharField( max_length=6, choices=EVENT_TYPES, default='Reh', verbose_name= _("type") ) + type = models.CharField( max_length=6, choices=EVENT_TYPES, default='Reh', verbose_name= _("type") ) + location = models.TextField( blank=False, verbose_name=_("location") ) + desc = models.TextField( blank=True, verbose_name=_("description")) + date = models.DateField( verbose_name= _("date") ) time = models.TimeField( null=True, blank=True, verbose_name = _("time") ) + meeting_time = models.TimeField( null=True, blank=True, verbose_name = _("meeting_time") ) + participants = models.ManyToManyField( Musician, through='EventParticipation', verbose_name=_("participants") ) - desc = models.TextField( blank=True, verbose_name=_("description")) - location = LocationField( verbose_name=_("location") ) - - def __unicode__(self): return self.title + " ( " + self.get_type_display() + " ) " @@ -51,10 +52,25 @@ class EventParticipation( models.Model ): status = models.CharField ( max_length=3, choices = OPTIONS, default='?', verbose_name=_("status") ) comment = models.CharField ( max_length=64, blank=True, verbose_name=_("comment") ) + def get_musician_username(self): return self.musician.user.username + + + @staticmethod + def get_or_create( musician , event ): + try: + result = EventParticipation.objects.get( event = event, musician = musician ) + except EventParticipation.DoesNotExist: + result = EventParticipation.objects.create( event = event, musician = musician, status='?', comment = '' ) + return result + class Meta: unique_together = ("event", "musician") + permissions = ( + ("change_others_participation", _("Can modify participation status of other users") ), + ) + \ No newline at end of file diff --git a/eventplanner/templates/custom_tabular.html b/eventplanner/templates/custom_tabular.html new file mode 100644 index 0000000..355cc9a --- /dev/null +++ b/eventplanner/templates/custom_tabular.html @@ -0,0 +1,78 @@ +{% load i18n admin_static admin_modify %} +

+
+{{ inline_admin_formset.formset.management_form }} +
+

{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}

+ {{ inline_admin_formset.formset.non_form_errors }} + + + {% for field in inline_admin_formset.fields %} + {% if not field.widget.is_hidden %} + {{ field.label|capfirst }} + {% if field.help_text %} ({{ field.help_text|striptags }}){% endif %} + + {% endif %} + {% endfor %} + {% if inline_admin_formset.formset.can_delete %}{% endif %} + + + + {% for inline_admin_form in inline_admin_formset %} + {% if inline_admin_form.form.non_field_errors %} + + {% endif %} + + + {% for fieldset in inline_admin_form %} + {% for line in fieldset %} + {% for field in line %} + + {% if field.is_readonly %} +

{{ field.contents|linebreaksbr }}

+ {% else %} + {{ field.field.errors.as_ul }} + {{ field.field }} + {% endif %} + + {% endfor %} + {% endfor %} + {% endfor %} + {% if inline_admin_formset.formset.can_delete %} + + {% endif %} + + {% endfor %} + +
{% trans "Delete?" %}
{{ inline_admin_form.form.non_field_errors }}
+ {% if inline_admin_form.original or inline_admin_form.show_url %}

+ +

{% endif %} + {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %} + {{ inline_admin_form.fk_field.field }} + {% spaceless %} + {% for fieldset in inline_admin_form %} + {% for line in fieldset %} + {% for field in line %} + {% if field.is_hidden %} {{ field.field }} {% endif %} + {% endfor %} + {% endfor %} + {% endfor %} + {% endspaceless %} + 		{% if inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }}{% endif %}
+
+
+
+ + diff --git a/eventplanner/templates/eventplanner/eventplanning_view.html b/eventplanner/templates/eventplanner/eventplanning_view.html index a82e4a9..6f5c9a8 100644 --- a/eventplanner/templates/eventplanner/eventplanning_view.html +++ b/eventplanner/templates/eventplanner/eventplanning_view.html @@ -51,7 +51,7 @@ request = $.ajax( { type: "PUT", - url: "/eventParticipation/" + p.data("username") + "/" + p.data("event-id"), + url: "{% url 'event_api' %}", contentType: "application/json", data: JSON.stringify(putObject) }); @@ -73,7 +73,7 @@ $.ajax( { type: "PUT", - url: "/eventParticipation/" + $(this).data("username") + "/" + $(this).data("event-id"), + url: "{% url 'event_api' %}", contentType: "application/json", data: JSON.stringify(putObject) }); diff --git a/eventplanner/templates/eventplanner/events_grid.html b/eventplanner/templates/eventplanner/events_grid.html index ffe486d..44d073c 100644 --- a/eventplanner/templates/eventplanner/events_grid.html +++ b/eventplanner/templates/eventplanner/events_grid.html @@ -29,9 +29,14 @@ {% addtoblock "js" %}