From 6a815e5a213f8549e207fe4562da123d5fb5ecd4 Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Wed, 12 Apr 2017 21:08:51 +0200
Subject: [PATCH] Small news improvement and bug fixes

---
 com/models.py                     |  1 +
 com/templates/com/news_edit.jinja | 10 ----------
 com/templates/com/news_list.jinja |  6 ++++--
 com/views.py                      |  2 ++
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/com/models.py b/com/models.py
index ab750c82..670415d5 100644
--- a/com/models.py
+++ b/com/models.py
@@ -4,6 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse_lazy, reverse
 from django.conf import settings
 from django.core.mail import EmailMultiAlternatives
+from django.core.exceptions import ValidationError
 
 from core.models import User, Preferences
 from club.models import Club
diff --git a/com/templates/com/news_edit.jinja b/com/templates/com/news_edit.jinja
index 1fa00414..ea4fb73a 100644
--- a/com/templates/com/news_edit.jinja
+++ b/com/templates/com/news_edit.jinja
@@ -11,16 +11,6 @@
 
 {% block content %}
 {% if 'preview' in request.POST.keys() %}
-<section class="news_event">
-    <h4> <a href="#">{{ form.instance.title }}</a></h4>
-    <p class="date">
-        <span>{{ form.instance.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-        <span>{{ form.instance.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-    </p>
-    <p><a href="#">{{ form.instance.club or "Club" }}</a></p>
-    <p>{{ form.instance.summary|markdown }}</p>
-</section>
-<hr>
 <section class="news_event">
     <h4>{{ form.instance.title }}</h4>
     <p class="date">
diff --git a/com/templates/com/news_list.jinja b/com/templates/com/news_list.jinja
index af11e362..bd714fd3 100644
--- a/com/templates/com/news_list.jinja
+++ b/com/templates/com/news_list.jinja
@@ -54,8 +54,10 @@ section.news_event:nth-of-type(even) {
     <section class="news_event">
         <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
         <p class="date">
-            <span>{{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-            <span>{{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+        <span>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+        {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+        <span>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+        {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
         </p>
         <p><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></p>
         <p>{{ news.summary|markdown }}</p>
diff --git a/com/views.py b/com/views.py
index b3107c99..75233ca2 100644
--- a/com/views.py
+++ b/com/views.py
@@ -107,6 +107,8 @@ class NewsForm(forms.ModelForm):
                 self.add_error('start_date', ValidationError(_("This field is required.")))
             if not self.cleaned_data['end_date']:
                 self.add_error('end_date', ValidationError(_("This field is required.")))
+            if self.cleaned_data['start_date'] > self.cleaned_data['end_date']:
+                self.add_error('end_date', ValidationError(_("You crazy? You can not finish an event before starting it.")))
             if self.cleaned_data['type'] == "WEEKLY" and not self.cleaned_data['until']:
                 self.add_error('until', ValidationError(_("This field is required.")))
         return self.cleaned_data