From d7a8f23a9a0e7e26186435daef18fa1d112de28b Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Wed, 27 Jul 2016 21:20:39 +0200 Subject: [PATCH 1/5] Committee overview page --- website/committees/models.py | 5 +++ .../templates/committees/index.html | 41 +++++++++++++++++++ website/committees/urls.py | 12 ++++++ website/committees/views.py | 21 +++++++++- website/thaliawebsite/menus.py | 2 +- website/thaliawebsite/settings/settings.py | 2 + website/thaliawebsite/templates/base.html | 2 + website/thaliawebsite/urls.py | 10 ++++- 8 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 website/committees/templates/committees/index.html create mode 100644 website/committees/urls.py diff --git a/website/committees/models.py b/website/committees/models.py index 78367dbd..63b34bd7 100644 --- a/website/committees/models.py +++ b/website/committees/models.py @@ -2,6 +2,7 @@ import datetime import logging from django.core.exceptions import ValidationError, NON_FIELD_ERRORS +from django.core.urlresolvers import reverse from django.contrib.auth.models import Permission from django.db import models from django.utils import timezone @@ -45,6 +46,7 @@ class Committee(models.Model): photo = models.ImageField( verbose_name=_('Image'), + upload_to='public/committeephotos/', ) members = models.ManyToManyField( @@ -75,6 +77,9 @@ class Committee(models.Model): def __str__(self): return self.name + def get_absolute_url(self): + return reverse('committees:details', args=[str(self.pk)]) + class Meta: verbose_name = _('committee') verbose_name_plural = _('committees') diff --git a/website/committees/templates/committees/index.html b/website/committees/templates/committees/index.html new file mode 100644 index 00000000..6648dc43 --- /dev/null +++ b/website/committees/templates/committees/index.html @@ -0,0 +1,41 @@ +{% extends "base.html" %} +{% load i18n %} +{% block title %}{% trans 'Committees' %} — {{ block.super }}{% endblock %} +{% block page_title %}{% trans 'Committees' %}{% endblock %} + +{% block body %} +

{% trans 'Committees' %}

+ +
+
+ +
+
+{% endblock %} diff --git a/website/committees/urls.py b/website/committees/urls.py new file mode 100644 index 00000000..4a46fb58 --- /dev/null +++ b/website/committees/urls.py @@ -0,0 +1,12 @@ +""" +Committees URL Configuration +""" + +from django.conf.urls import url + +from . import views + +urlpatterns = [ + url(r'^$', views.index, name='index'), + url(r'^details/(?P\d)/$', views.details, name='details'), +] diff --git a/website/committees/views.py b/website/committees/views.py index fd0e0449..60c66b75 100644 --- a/website/committees/views.py +++ b/website/committees/views.py @@ -1,3 +1,20 @@ -# from django.shortcuts import render +from django.shortcuts import render, get_object_or_404 -# Create your views here. +from .models import Committee + + +def index(request): + """Overview of committees""" + committees = Committee.objects.all() + + return render(request, + 'committees/index.html', + {'committees': committees}) + + +def details(request, committee_id): + """View the details of a committee""" + committee = get_object_or_404(Committee, pk=committee_id) + + return render(request, 'committee/details.html', + {'committee': committee}) diff --git a/website/thaliawebsite/menus.py b/website/thaliawebsite/menus.py index 9572f730..dd61e580 100644 --- a/website/thaliawebsite/menus.py +++ b/website/thaliawebsite/menus.py @@ -4,7 +4,7 @@ main = [ {'title': _('Home'), 'name': 'index'}, {'title': _('Association'), 'name': '#', 'submenu': [ {'title': _('Board'), 'name': '#'}, - {'title': _('Committees'), 'name': '#'}, + {'title': _('Committees'), 'name': 'committees:index'}, {'title': _('Members'), 'name': '#'}, {'title': _('Documents'), 'name': 'documents:index'}, {'title': _('Members'), 'name': '#'}, diff --git a/website/thaliawebsite/settings/settings.py b/website/thaliawebsite/settings/settings.py index 823fb2ba..0d04375e 100644 --- a/website/thaliawebsite/settings/settings.py +++ b/website/thaliawebsite/settings/settings.py @@ -71,6 +71,7 @@ TEMPLATES = [ 'context_processors': [ 'django.template.context_processors.debug', 'django.template.context_processors.request', + 'django.template.context_processors.media', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', ], @@ -146,6 +147,7 @@ LOCALE_PATHS = ('locale',) # Where to store uploaded files MEDIA_ROOT = os.path.join(BASE_DIR, 'media') +MEDIA_URL = '/media/public/' SENDFILE_BACKEND = 'sendfile.backends.development' diff --git a/website/thaliawebsite/templates/base.html b/website/thaliawebsite/templates/base.html index a103d625..2b838ad3 100644 --- a/website/thaliawebsite/templates/base.html +++ b/website/thaliawebsite/templates/base.html @@ -6,6 +6,8 @@ +{% block title %}{% trans "Study Association Thalia" %}{% endblock %} + diff --git a/website/thaliawebsite/urls.py b/website/thaliawebsite/urls.py index 12dc953f..80363d81 100644 --- a/website/thaliawebsite/urls.py +++ b/website/thaliawebsite/urls.py @@ -13,7 +13,11 @@ Including another URLconf 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ +import os.path + +from django.conf import settings from django.conf.urls import url, include +from django.conf.urls.static import static from django.contrib import admin from django.views.generic import TemplateView @@ -23,8 +27,9 @@ urlpatterns = [ url(r'^members/', include('members.urls')), url(r'^nyi$', TemplateView.as_view(template_name='status/nyi.html'), name='#'), url(r'^association/', include([ - url(r'^sister-associations', TemplateView.as_view(template_name='singlepages/sister_associations.html'), name='sister-associations'), + url(r'^committees/', include('committees.urls', namespace='committees')), url(r'^documents/', include('documents.urls', namespace='documents')), + url(r'^sister-associations', TemplateView.as_view(template_name='singlepages/sister_associations.html'), name='sister-associations'), ])), url(r'^for-members/', include([ url(r'^become-active', TemplateView.as_view(template_name='singlepages/become_active.html'), name='become-active'), @@ -33,4 +38,5 @@ urlpatterns = [ # Default login helpers url(r'^', include('django.contrib.auth.urls')), url(r'^i18n/', include('django.conf.urls.i18n')), -] +] + static(settings.MEDIA_URL, + document_root=os.path.join(settings.MEDIA_ROOT, 'public')) -- GitLab From f77fec519056fc06f003eeb8bbcce4427b69b1c8 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Wed, 27 Jul 2016 22:15:42 +0200 Subject: [PATCH 2/5] Implement details page --- .../templates/committees/details.html | 60 +++++++++++++++++++ website/committees/views.py | 17 +++++- 2 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 website/committees/templates/committees/details.html diff --git a/website/committees/templates/committees/details.html b/website/committees/templates/committees/details.html new file mode 100644 index 00000000..5bdc008a --- /dev/null +++ b/website/committees/templates/committees/details.html @@ -0,0 +1,60 @@ +{% extends "base.html" %} +{% load i18n %} +{% block title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %} +{% block page_title %}{% trans 'Committees' %}{% endblock %} + +{% block body %} +

{{ committee.name }} + + + + + +

+
+
+
+
+ {{ committee.name }} +
+
+

{% blocktrans with name=committee.name %}About the {{ name }}{% endblocktrans %}

+

{{ committee.description }}

+
+
+

{% trans 'Committee members' %}

+ +
+
+
+{% endblock %} diff --git a/website/committees/views.py b/website/committees/views.py index 60c66b75..8aea1b1d 100644 --- a/website/committees/views.py +++ b/website/committees/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render, get_object_or_404 -from .models import Committee +from .models import Committee, CommitteeMembership def index(request): @@ -16,5 +16,16 @@ def details(request, committee_id): """View the details of a committee""" committee = get_object_or_404(Committee, pk=committee_id) - return render(request, 'committee/details.html', - {'committee': committee}) + members = [] + memberships = (CommitteeMembership + .active_memberships + .filter(committee=committee)) + for membership in memberships: + member = membership.member + member.chair = membership.chair + member.committee_since = membership.since + members.append(member) # list comprehension would be more pythonic? + + return render(request, 'committees/details.html', + {'committee': committee, + 'members': members}) -- GitLab From 03d3cdb98b024b35ae51d8f3ca50dcf0742c1623 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Wed, 27 Jul 2016 22:46:13 +0200 Subject: [PATCH 3/5] Display avatars on committee page See #13 --- .../templates/committees/details.html | 8 +++++-- .../members/migrations/0002_member_photo.py | 20 ++++++++++++++++++ website/members/models.py | 7 ++++++ .../static/members/images/default-avatar.jpg | Bin 0 -> 11399 bytes website/thaliawebsite/settings/settings.py | 2 +- website/thaliawebsite/urls.py | 2 +- 6 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 website/members/migrations/0002_member_photo.py create mode 100644 website/members/static/members/images/default-avatar.jpg diff --git a/website/committees/templates/committees/details.html b/website/committees/templates/committees/details.html index 5bdc008a..e7e789c2 100644 --- a/website/committees/templates/committees/details.html +++ b/website/committees/templates/committees/details.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n %} +{% load i18n static %} {% block title %}{{ committee.name }} — {% trans 'Committees' %} — {{ block.super }}{% endblock %} {% block page_title %}{% trans 'Committees' %}{% endblock %} @@ -29,7 +29,11 @@
- {{ member.display_name }} + {% if not member.photo %} + {% trans + {% else %} + {{ member.display_name }} + {% endif %}
{% if member.chair %}
diff --git a/website/members/migrations/0002_member_photo.py b/website/members/migrations/0002_member_photo.py new file mode 100644 index 00000000..9efb4edd --- /dev/null +++ b/website/members/migrations/0002_member_photo.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10rc1 on 2016-07-27 20:21 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0001_squashed_0002_auto_20160707_1512'), + ] + + operations = [ + migrations.AddField( + model_name='member', + name='photo', + field=models.ImageField(blank=True, null=True, upload_to='public/avatars/', verbose_name='Foto'), + ), + ] diff --git a/website/members/models.py b/website/members/models.py index 67a0cfb8..7d23b32b 100644 --- a/website/members/models.py +++ b/website/members/models.py @@ -176,6 +176,13 @@ class Member(models.Model): default='full', ) + photo = models.ImageField( + verbose_name=_('Foto'), + upload_to='public/avatars/', + null=True, + blank=True, + ) + # --- Communication preference ---- language = models.CharField( diff --git a/website/members/static/members/images/default-avatar.jpg b/website/members/static/members/images/default-avatar.jpg new file mode 100644 index 0000000000000000000000000000000000000000..118dcb4e907d548c36beea6058b2afc933ec55d4 GIT binary patch literal 11399 zcmbVy30#a@{P#06E!r0oMVlq25>i=Olx51)#mu1G5I50OwzSGkk>wgGDqC)hnZ{mO zCb`I#?5P?UYkF*^>(VP(x7PKzVoaO0Z?#X6)m`6^Y zWI4_}G~$mnLE)RsUCgIVRPU=GW)UJ6qF7#L{k3^g1=H`J#a(9t9m8vI5{Sxs44jjpAkMgM>P*LR!H z8$?}0T|=XcB&d26njWR^9$^MdDpT-3LjI3J1sYXU2dSxRz<^v`f=Z#$s7f?MHH?mh z_k@z3vi=C$87hN0f2fWOrBB+r|HPnCGcVpT;7XfE+xc(Yrlvk*sG-p?i!oyvmR9x- zlc!9b<~VCM)7@hZ%X7iPMczJ(fA?J(uxfQ6FDN)HJR&kGdQ(io_8mKS{k5B)lA3nl z;Gx4u(uJZ-@yS!C&z!w<)(^FC&VXLA)gQNOK z=-`o)whp4t+<)TY9ko$*+-3v+jZ*a?qwT9LS`cfPv;RBBw*7x`_Jgs0zRC$r8U>U` z(<5Aou9_4+gAnq4iCIj#gy1j@1xmt1ZcV(przMZb6dsJ%KbQi4_~@HBQ$S7d2zDx= zFzM|6%Safn&iLi>lcce!Ql5wex|tC zNMJBK5JeQBr@$i~j%fJt1^+(XN$RF-1Pm~+B>A4i0wz6;;7VEKK$3j=VS%y`-Z8|& zc>P3KTjoeC2O6T>BZdLYD6WZ&LV_-dS5U$M5&b6h@P+Bo690!wBsRoT(Cj%(g3c)f zV$)&5q|zuPbOF*NFwSQ*%6W_s(TQ*&e<}zg1r`9+4$iUxs^OV00cL?GQxXB^8Xhs8 z@W_`TP!h;wY)TnPs6CcOI2u6_=)cS|6pEoHwW4Xv#P~fZMM9);fhuI!X`FIC;Uq<7bNtys zKG5umwMYmLro?Nv4wz3dx3LrqAeIM0ohD3b9frjV6Obe$<@)m(MT83aL;l1as7Ax> z+^45uiqi>($ev`(9r=e7h#k0*!t(*Da!hx%LfW{QwmPwd;>GeR2jBB$P#A(%uwGF* z+*$^K8#u{iQShLME@5Ny2lm*MIWh1Q^x+5#n$(Jr;7w|Qo*D2=i%x`stjWb1K;yK0 z`f5HgwTO=O4g}e;yxdfHh{kk=NK6=sz9aIPCJJlAtW_nY5vvsjm?&F)$exH2@|6jC zphE6O0?aP5o>Df&Jr-spxZjZzCP~m6gaj-mVMFJ#5r1xKUM!Db@NEWIeM%CD1XO?k zL^}-$sK}_$Sn8${=FUSDf}8_59%4GNI#G(40@9EH7zq<#XdRe`;u*}y=tfe;69K`< zM+uQVA^_~EI0l|;N|D|3r=dIWD?-$)&_fYjt|z=G<`$^{0Uq`Nz#)J?a0L6+-~*O+ zh4e^)awhzGsf>*v%AOrlf&mdL8kW*2O9Y!Tsf8i7Op}I?In7(Lver&+TmSFH2Z#Fz zt6m9Z&-|pJN4DJ;ziOj7)R#}V>ojM`l+rPF54C;mtG65|59+c=N;|RE#($UUG$v7^ zy1VWsrR=+dPm)yVUMuSsyz~lcUia_)brWQ+i)I%$q<;rbeAl=|r;d|Y6dGZ@dD7NC zLQu9nPSbwSjsyZ&^K zhGh=1|0~phw8>}R6*qFjK~9P$BPL!*riNPlaP*s z;S6B{vgd(UAz>gA)(*Ya^Kj?0k)MplMYE^pK96>)zSs4{;+Y_8ePH5_T3O&pmvd#3 zo=Fv6d5dlSn8R^18 z^UHHmH#55@8n^!)J!`nO`i1+J$MJKWgUa95Lj-3poF9VpvmypF_|8U4<<_~xtoIu65Zslt;5k7|V+cE*;7tk_>OPGFo+WY)@Fr~NOnN91P9Z_p zP8)_D4Q?gi;Q%?{6XgkT5{p~n&Q$=0+<>voxht{$8G<4+oP3_eCM=$wQRun|0 zci|u{pxT~;z!h+msq#xO?8m5d!YW&QvZDS<%95q`NAG@M&d+5M(Q$j7b;7FuNo+}; z{HR#_)}7BGX*uFAHZ|9G3y%z0{A$HH%>=&*?~9dg?OHdt@Y3bQbE3y)>?$cy9lw=-)sk%u1Bz|Itn3M z=tPu25uv!U)$!`zb#_(_Vq6T)lQypTvcqtri_Z7#sOmmqyUt%ZH#$rAFy=oEEja$= zWv+1CoYQ=Rg)1np*t9e9$So%TQ5~sJKpnO~c_dROsZ|oA$grsCv#@ln#g&X%h2{n7 z7eP`J61%OZ?2H(Boh3>A$akCC6&rW|pZc!h_l}w6wU{2Yki1t_$~^pNL4%*#*`UjH zLuKWaBUq#Sr!_UX88F0kOvvC+5(o(e$BTus!3knwY!;Zl28(F~;;};lgW!d7JPVsK zJctshGKe8R+__vKFC6bt9_IvbPB2Ii9|mC_IXqx@3B^0S!pOn8*2dpx(^AIS7xk{{ ze@;AO^y1Tk8{HQY>MBcAL#uoAO=zAwpXqK8jhjC@FU)r#2Qm!^z;cy1u?ZkGzqVgP zNfIz}6P|!phrnJFlZA3fQ5M)Ug=q-clmAs6zTZ%!ye5k8|y?bf+?0rz&w%P`F_ds3eOi`8V$Gk?@MxAdAf%|-6cjDPgM%a-W>5# zX%d3VX}}4EoEE@KB2B_^Q$sl)8+g>``y%Qp+qDZl9C|E z@XDZ0qhKH!hRnb+$OUk?HB$tPVkCxK3SoYhqHKp; z+}53kfX=>O0!R`NROD`?+>ep|ux=qKI4J*YVVrm1?zPh^1i`v1^qZ%eEe-Vz-%g$A zKI1cw_HkY70hiBatFEVy9Q3Mi!<%4rVB1NC;yFwYYm%M=WPmDA!GJPovH+0~92Oa7 zu@1H(kNr^^mM67BsUrA}^Z{vlIV7c`Tq-IU8W5D^usZD2LiTc(CR*LkjE#!hu_-qu z>dw0K2R#@2h}X5W=RBB+WOWWCib9wgUr;#X8V-fTUoV(f5feyBA%#tkYH=Q;qg!vA zqQ8Kn4%`0RIpSV(zz(X9m3W#*48qy|66P2WYQPwuJ4dz^oh?khF=|cEl(@Z{vZCIq zeyYe`R&e~5_UDx)$t?n%WknV?5W-P_t z;*-y4z*wQeLpB4*ty*kqd3b4bGIyV*YQ{6yVNcFECiW4*w~np(wE5sO+eNh$1na2& zgsNK%Ke9y1ts#90TtJ*@4`qt43sg%yVZ1IEUML|Y)G_H0Fy&%^LJz7mQa{kes3Lz2 zJW~(MJ0N*e?H&X_xwsLJRI%+uy;Zk+HYLer@^ zsC9sGqqv3iIh7Q*y4Ft`M+6jsEXW!R1zwCfDv+lvboejlBJa>k;$5M}g>L2L*&a1p zPP9$X^fJ6(_iF6)j6TAXXmOT78B1-?6rovBet}@_81i1Ty@2c_doDrP*>NKUBqOG$ zT_q(Td?8ds4Ro z*jatOwcRoAP(;|N3!~>a7fyR;9M*mAg~IY|F-K}%3MZI>NCHGP;bn@O@H=IC1~>-P zYqg3d18{)R5$ZwZO|FGKUPYyA&(Co3pZnP2ZHza?Ozw+sFLy`SoohIB zXtu6NFMHkwRaz%oWtEME3T6n}N3cBVz_3B@I@ml=20yQqEd5b33bm)9Fa^NH3(Vhh z04RVsRT2>V1KzoB0;9snZGwEYiVv+D4OZ2`R5~Tfz4U`L*Lw5AtI>xiyLgCW2M2A) ziK(pQ|D=y76KMC!ZIiSNu#N<|d?EmnBIO2S z3nq&CBzWPUJ|i>tm)Wmgxr5CbdqJS>RkQj^xyP=jp?`aAtXe$kLVcV#`ap!4uCu%I zjI1eX6Y)2U?8QU6A~`W4;~5qutMaKhTty9>qK;a(D^)x zfBcYCdp3hi*cCRyXhLv7UaElPQ36^P&KI3-#B#W5puxHS^#!Bannja!v3YX@Xc7(jAWG?L^0^dAjW)`KnR<4f= zZiC*ohk23~^aqd_{1IXD#t<}|z{GHt2O7c6B~(=p2-GkbII-T-ai}Ih7Jldw-);Pt zq3cu^`F;ADeSGnY##S%2b=k|;@Fo%U4@!KthIEy7^`3J0@X4b1vFo+`9YkQnSbKl8 z2wXTC@G<}P(550Q`BrSo`LJdgtknvOL4+c03QGsPNZ#e()b%S-H4DZ-GX)}QBw_}I zQ8rZuAPGVi3kYLfW=vB-&Ty@HJPOfABkCSD!leso~rN(M>6k%CP!u+REl&q0wQHlv>T#* zz?D=J-FRZtsulYMkH#E(N+04+7^lSe?C+k{^7_T-SjW4|TOC|)?ALZKsB0ByHkozg zcQa3K(lfcjZWhGpeTgd;Z(Il(f}RGR_D9nUEK4A7Et2M`C zh}Mz6CAY5R=^@?Bix;9RSN%S32A$}_@)2c`HsuIP#s-Jmp>iq8opxc=P}}mEUmsVG z;-uVrVG?$4h@Yv%?#<)D2^a0Y*|r+I_p@p#Y}y@QdvN0GZIO3x1jOYwxDBgv?AS5p zLea`qhu1Ew{(H)#xcKZLTTvfNk(EN^gXWvU*VsHH7aL-%m>v^~4Lt_ub<|`}q*S;P zrJf8Tv(c*x;0!g#Pzi+_%F|2-IH^+mdu>2~UPaZ#?{S0bd}Ya!^6}MDQRnsWaXy6D1XrNw;ajV;K;IDk35~S;l_B^8;&K)o>;w5 za+*poZlsf*E<$RCY8~RTt2ziZ`7V5i<{^nDj#8|0698t^AB22Ml5twjgkwp6B8Q3y zq!PFwkj6++6oMWSYI_XfdxEDE7YWVO5_PH6*(tV0?P=tOLl3IL?k3;QUs>R)wZ?w= zn9avqujdv7Bp+DvimiG)I!?+lt?)TNzUcg(CKPF(Am?LTx1t=IRl zUBYK4A5Q_}_Pfp85|qdd0~FX-LX~>tLpBDo?Z1-mliVn{vdTVj(zpJC;ktLMlC}-n z(+>pmiEpmD-J>i0mW^?9>eM&;5b_N7+zuB;tskw``|4efR_us{5wZHkOLHf;@7t~W zRcAx&UgFPxnNeG;I+ll>{O9=GG4&NnmrPCK?qBuhX6;ncdxfi26CQ*b=;yZLbQ3j| z6;$BQrWt6@0V-%@)`cjWVN={-5OjpQNiIbFoe4SE;QsxOSulR^twNUkzCLiyidmzx zHyF6jC1x!v-o9m6WpMVPVcYWabCzv42yD$xy|Y|<)bkXlA`kt_W8Nd$7j%c@n=q(X zGEOcD@@`N*Z>bqu$%X@DQvG=Y`OY@o zb=XoxYZCz1G!5JQKupFRQVa%=f586Fxohsp5m{B@tjyIc!?s#cX$dX7Xi}{2SErEh zabH3o1h*xtMw?a?c-Qz)Lq3|>pX!K>KR10y^Nv$H*Rn_M9?$RoruWFDWy!~Q3d@s$ zu&e(fgEyF@0PQRhqLu+>012pkAnN5b0W&{biF)E%?#{M1?~d7yn>X>{n?Ywz3v`TH zZWXkby!mpzofRx)>i7O#lUiZ*9utvH*ci>^WZAjs zp?69;A`4d^pe=tqJ!;ee({0zz5)6Bw0Ci&Y523q(R)%XQEF9FT#*s8ixE02z5AgAU z{*JPwx#9ZO)|zMDCCr0*YH!DXw~K@i+sg#GBI5%ODvLtR_Qp*_VP~E)cKGj$ z1N8hX-WLxt(^`IHgwkuzEwg%_*SQ&^P8>-Jf;3!SxDI0|(s-2RfMKe`W(yDg`ZDTR zZm3<2fd@R@1>Na*g2O}ifWvo$DPTV0QP<1!f7&(kF6GVTesx|t$4-CZf1>~1?hRY6 zeZ#EhpO|%DCfS&eN^Z(KCCkrnW5ZtiM4}cT6gfIh9H3{TU>q&6b)Z#~_js=bx;z8q zsMzNM3ICJ`ojV(}FSw0cUTGd(xpM#Wsw|G1nM?H1f^X4bi&DxKIoTbq>?4M?IixoD zb-tgV;ZYN7e^2{K+N0e)JvzD3E>HD+=Z~J0{aW{cc~^;2I0qNj`-5l&iNbdh0~!k1#L`Oq}&lK=UUJSGw4GI2=vl>XM$*McKyEJ@1BpkP zC4jKl(aHV4pKQzIG){P!1fr1!Ijusn{hwl7Mk>SxdxHia-x@eGRwe)E`&upH_7T09 z%s0j0QQp2y`!BYBu|5t!!^60PTWm;I z9w^;{n=p6emJG6KgL`Ktw@~5?WjU%6qu@9It#>Z8q1XfuyW6DM31Qcj*)BZV>5i~! zX?DX*R%&e4O`|);gJ1dNS?vI`F(#~s-<@u@r=Z+^q7~!F&d$XV7BI|#y!?|jXW3S#)>*6JDv%cRuwj(G!gY7rN&?_V%g}!0y{)p^5&5+hA5=ySed!QLCQbJZI6c5}dqoPYV*(cA$bm`$ck1k=CCxgiC$jw_o>ik2TzA?awDV zkMYvg{H7SLnri;sI=4eC9CIWq>nZDs)4s*k8>VRAdUo|JWH~Z&O4!%=Vbm0ei-10! z(EG#t0^n1m90aIDLj=^{G_DOfAH8!->fx-G5lR92j_U2&$6nm;9xvUoYggI7?<*W0 zja%Z}SZwf`Y#*+MN*`oF?iiE$RgGcDJ!K%Dkek2~&{z5?+;LDQFK;OQ@&@gvr88>K zK?0IW+R>KYo#`)koiyzEY?kkSKPJMUdi2VKvYSUDe7wDlxD%PtI(zL?MbZ2(#IdET z@&wPKo%;yq5*1UI+8@%uX%)0<6$;T{p;F)%3sqhwT{C>)3!AJ%)ArwfXjI6}Zm%{? zZOii8T&8v9joX5Xv3w`-s4V;QOS!xu zE`m~Evkk1l7?6*|9Qh~Y*B~csB;e;oaD%&VjtVvU%V8P8!?&D0UGp=7)}9{E+S9&< zcyH84G`tj+t^Z3>SZ2TE+=Am7gNDa^jGrDU{JVCgf42ICspf4bOVIHcd1wOnA=yXe z4poLW2w-Cu4u14osX^l{&G6z2(f-qnBJ&H3be;=(bKeh%{8<0R(CyLwyS=M#?tPxM zBO_5a+if;2owx{P0-79!5p){rN4pp$tH{RSs01V~xUG|p5?N?)*^pD^9ji_ z?Yaj04PQPdxa@BGZ`b2b|1tWvtJAOM{Cz6glY(L4fs{n62d0_cF9;jzzE<44P0z!~IW%GjCttkLA2B^A$mrRyMaFP4p>{K4`jbGV zskA3yXRxDDCjb`|#h($ literal 0 HcmV?d00001 diff --git a/website/thaliawebsite/settings/settings.py b/website/thaliawebsite/settings/settings.py index 0d04375e..85825f40 100644 --- a/website/thaliawebsite/settings/settings.py +++ b/website/thaliawebsite/settings/settings.py @@ -147,7 +147,7 @@ LOCALE_PATHS = ('locale',) # Where to store uploaded files MEDIA_ROOT = os.path.join(BASE_DIR, 'media') -MEDIA_URL = '/media/public/' +MEDIA_URL = '/media/' # Public is included by the db fields SENDFILE_BACKEND = 'sendfile.backends.development' diff --git a/website/thaliawebsite/urls.py b/website/thaliawebsite/urls.py index 80363d81..37ace8f8 100644 --- a/website/thaliawebsite/urls.py +++ b/website/thaliawebsite/urls.py @@ -38,5 +38,5 @@ urlpatterns = [ # Default login helpers url(r'^', include('django.contrib.auth.urls')), url(r'^i18n/', include('django.conf.urls.i18n')), -] + static(settings.MEDIA_URL, +] + static(settings.MEDIA_URL + 'public/', document_root=os.path.join(settings.MEDIA_ROOT, 'public')) -- GitLab From d5d794122aa562f05ea99d20e95a4a5b22f5c6bd Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Wed, 27 Jul 2016 22:55:47 +0200 Subject: [PATCH 4/5] Include missing migration --- .../migrations/0004_auto_20160727_2253.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 website/committees/migrations/0004_auto_20160727_2253.py diff --git a/website/committees/migrations/0004_auto_20160727_2253.py b/website/committees/migrations/0004_auto_20160727_2253.py new file mode 100644 index 00000000..2685c386 --- /dev/null +++ b/website/committees/migrations/0004_auto_20160727_2253.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10rc1 on 2016-07-27 20:53 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('committees', '0003_auto_20160713_1700'), + ] + + operations = [ + migrations.AlterField( + model_name='committee', + name='photo', + field=models.ImageField(upload_to='public/committeephotos/', verbose_name='Image'), + ), + ] -- GitLab From 176ec92a8464a2fbf1850de39462a0635f5579ad Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Wed, 27 Jul 2016 22:59:26 +0200 Subject: [PATCH 5/5] Silence deprecationerror --- website/committees/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/committees/models.py b/website/committees/models.py index 63b34bd7..a91ffb9e 100644 --- a/website/committees/models.py +++ b/website/committees/models.py @@ -2,9 +2,9 @@ import datetime import logging from django.core.exceptions import ValidationError, NON_FIELD_ERRORS -from django.core.urlresolvers import reverse from django.contrib.auth.models import Permission from django.db import models +from django.urls import reverse from django.utils import timezone from django.utils.translation import ugettext_lazy as _ -- GitLab