diff --git a/.gitignore b/.gitignore index b358153..f29c400 100644 --- a/.gitignore +++ b/.gitignore @@ -66,8 +66,5 @@ target/ /node_modules/ /static/ /templates/ -.idea/ -.gitignore -.project -.pydevproject -.settings/ +.[a-zA-Z]* +/src/kasu/settings/production.py diff --git a/Gruntfile.js b/Gruntfile.js index cf5c44c..55ce42a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -13,7 +13,7 @@ module.exports = function(grunt) { }, kasu: { src: 'src/kasu/static/less/kasu.less', - dest: 'static/css/kasu.css', + dest: 'src/kasu/static/css/kasu.css', } }, more_css: { diff --git a/src/events/models.py b/src/events/models.py index 2958f30..3ca2f93 100644 --- a/src/events/models.py +++ b/src/events/models.py @@ -3,6 +3,7 @@ import os from django.conf import settings from django.core.urlresolvers import reverse +from django.core.exceptions import ValidationError from django.db import models from django.db.models import Q from django.template.defaultfilters import slugify @@ -10,7 +11,6 @@ from django.utils.timezone import now from django.utils.translation import ugettext as _ from ckeditor.fields import RichTextField from easy_thumbnails.fields import ThumbnailerImageField - from utils import COUNTRIES, OverwriteStorage @@ -125,6 +125,12 @@ class Event(models.Model): except: return "New Event Model" + def clean(self): + if self.end < self.start: + raise ValidationError({ + 'end': _("A event can't end before it had started") + }) + def get_absolute_url(self): kwargs = { 'pk': self.id, diff --git a/src/events/templates/events/event_archive.html b/src/events/templates/events/event_archive.html index 706dfcd..2e02e83 100644 --- a/src/events/templates/events/event_archive.html +++ b/src/events/templates/events/event_archive.html @@ -52,7 +52,7 @@ {% endif %}

-

{{event.description|truncatewords_html:20}}

+

{{event.description|truncatewords_html:20|safe}}