From c691a7cff2d4a72239de630b9e82e2a39dd63014 Mon Sep 17 00:00:00 2001
From: Yingtong Li <runassudo@yingtongli.me>
Date: Fri, 7 Dec 2018 16:12:23 +1100
Subject: [PATCH] Fix/implement image uploads

---
 .gitignore                                           | 1 +
 selfserv/jinja2.py                                   | 2 ++
 selfserv/urls.py                                     | 4 +++-
 sspromotions/jinja2/sspromotions/bulletin_edit.html  | 2 +-
 sspromotions/jinja2/sspromotions/email/bulletin.html | 8 ++++----
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3f0171..bce8317 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ __pycache__
 
 settings.py
 migrations
+promo_uploads
diff --git a/selfserv/jinja2.py b/selfserv/jinja2.py
index 01ff1c2..8e4392c 100644
--- a/selfserv/jinja2.py
+++ b/selfserv/jinja2.py
@@ -18,6 +18,7 @@ import markdown
 
 from django.contrib.staticfiles.storage import staticfiles_storage
 
+from django.conf import settings
 from django.urls import reverse
 from django.utils import timezone
 
@@ -32,6 +33,7 @@ def environment(**options):
 		'localtime': lambda dt: timezone.localtime(dt).strftime('%Y-%m-%d %H:%M'),
 		'static': staticfiles_storage.url,
 		'url': reverse,
+		'MEDIA_URL': settings.MEDIA_URL,
 	})
 	env.filters.update({
 		'markdown': lambda x: Markup(markdown.markdown(x))
diff --git a/selfserv/urls.py b/selfserv/urls.py
index 1b0171d..8cf182e 100644
--- a/selfserv/urls.py
+++ b/selfserv/urls.py
@@ -14,6 +14,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
+from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import include, path
 
@@ -23,4 +25,4 @@ urlpatterns = [
 	path('treasury/', include('sstreasury.urls')),
 	path('promotions/', include('sspromotions.urls')),
 	path('', include('ssmain.urls')),
-]
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/sspromotions/jinja2/sspromotions/bulletin_edit.html b/sspromotions/jinja2/sspromotions/bulletin_edit.html
index 2c33643..64c415e 100644
--- a/sspromotions/jinja2/sspromotions/bulletin_edit.html
+++ b/sspromotions/jinja2/sspromotions/bulletin_edit.html
@@ -23,7 +23,7 @@
 {% block maincontent %}
 	<h1>{% if request.resolver_match.url_name == 'bulletin_new' %}New{% else %}Edit{% endif %} bulletin item</h1>
 	
-	<form class="ui form" method="POST">
+	<form class="ui form" method="POST" enctype="multipart/form-data">
 		<div class="ui disabled inline grid field">
 			<label class="three wide column">ID</label>
 			<input class="eleven wide column" type="text" name="id" value="{{ item.id if item.id != None else '' }}">
diff --git a/sspromotions/jinja2/sspromotions/email/bulletin.html b/sspromotions/jinja2/sspromotions/email/bulletin.html
index 8763b3c..7cb28ff 100644
--- a/sspromotions/jinja2/sspromotions/email/bulletin.html
+++ b/sspromotions/jinja2/sspromotions/email/bulletin.html
@@ -59,7 +59,7 @@
 						<table>
 							<tr>
 								<th> 
-									<a href="#"><img src="{{ item.image }}" alt="{{ item.title }}"></a>
+									{% if item.link %}<a href="{{ item.link }}">{% endif %}<img src="{{ MEDIA_URL }}{{ item.image }}" alt="{{ item.title }}">{% if item.link %}</a>{% endif %}
 								</th>
 							</tr>
 						</table>
@@ -71,7 +71,7 @@
 							<th>
 								<b><h5>{{ item.title }}</h5></b>
 								<p>{{ item.content | markdown }}</p>
-								{% if item.link %}<p><a href="{{ item.link }}">Click Here &#x203A;</a></p>{% endif %}
+								{% if item.link %}<p><a href="{{ item.link }}">Read more &#x203A;</a></p>{% endif %}
 							</th>
 						</tr>
 					</table>
@@ -99,10 +99,10 @@
 					<table>
 						<tr>
 							<th>
-								{% if item.image %}{% if item.link %}<a href="{{ item.link }}">{% endif %}<img src="{{ item.image }}" alt="{{ item.title }}">{% if item.link %}</a>{% endif %}<br>{% endif %}
+								{% if item.image %}{% if item.link %}<a href="{{ item.link }}">{% endif %}<img src="{{ MEDIA_URL }}{{ item.image }}" alt="{{ item.title }}">{% if item.link %}</a>{% endif %}<br>{% endif %}
 								<b><h5>{{ item.title }}</h5></b>
 								<p>{{ item.content }}</p>
-								{% if item.link %}<p><a href="{{ item.link }}">Click Here &#x203A;</a></p>{% endif %}
+								{% if item.link %}<p><a href="{{ item.link }}">Read more &#x203A;</a></p>{% endif %}
 							</th>
 						</tr>
 					</table>