diff --git a/cao_sunyata/forms.py b/cao_sunyata/forms.py index d9c7c0d..e78c6e4 100644 --- a/cao_sunyata/forms.py +++ b/cao_sunyata/forms.py @@ -1,4 +1,4 @@ -from wtforms import Form, StringField, TextAreaField, SelectField, RadioField +from wtforms import Form, StringField, TextAreaField, SelectField, DateTimeField from wtforms import IntegerField, PasswordField from wtforms.validators import InputRequired, Length, Email from wtforms.widgets import HiddenInput @@ -14,10 +14,12 @@ class BlogCreateForm(Form): author = StringField('Auteur', validators=[InputRequired(), Length(min=1, max=50)], filters=[strip_filter]) status = SelectField('Statut', choices=[('brouillon','Brouillon'),('privé','Privé'),('publié','Publié')]) + created = DateTimeField('Créé le', validators=[InputRequired()]) class BlogUpdateForm(BlogCreateForm): id = IntegerField(widget=HiddenInput()) + created = DateTimeField('Créé le', validators=[InputRequired()]) class BlogSearchForm(Form): criteria = StringField('Critère', validators=[InputRequired(), Length(min=3, max=45)], diff --git a/cao_sunyata/static/carousel/S16.jpg b/cao_sunyata/static/carousel/S16.jpg new file mode 100644 index 0000000..18ff85d Binary files /dev/null and b/cao_sunyata/static/carousel/S16.jpg differ diff --git a/cao_sunyata/templates/blog_edit.jinja2 b/cao_sunyata/templates/blog_edit.jinja2 index d836f45..16c5367 100644 --- a/cao_sunyata/templates/blog_edit.jinja2 +++ b/cao_sunyata/templates/blog_edit.jinja2 @@ -35,12 +35,14 @@ {{ form.status(class_='form-control') }} +
+ + {{ form.created(class_='form-control') }} +
+

Topic : {{ entry.topic_id }}
{% if blog_id != '0' %} - Créé le : {{ entry.created.strftime("%d-%m-%Y - %H:%M") }} - -
Modifié le : {{ entry.edited.strftime("%d-%m-%Y - %H:%M") }} {% endif %}

diff --git a/cao_sunyata/views/blog.py b/cao_sunyata/views/blog.py index 60efb9b..da7a3c3 100644 --- a/cao_sunyata/views/blog.py +++ b/cao_sunyata/views/blog.py @@ -49,6 +49,8 @@ def blog_copy(request): dup_entry.tag = entry.tag dup_entry.author = entry.author dup_entry.status = 'brouillon' + dup_entry.created = datetime.datetime.now() + dup_entry.edited = datetime.datetime.now() request.dbsession.add(dup_entry) request.session.flash("La page a été duppliquée avec succès", 'success') @@ -69,6 +71,7 @@ def blog_edit(request): # create a new post entry = BlogRecord() entry.topic_id = topic + entry.created = datetime.datetime.now() form = BlogCreateForm(request.POST, entry) form.tag.choices = [(row.tag, row.tag_name) for row in tags] page_title = 'Nouvelle page' @@ -103,12 +106,6 @@ def blog_edit(request): entry.editor = request.authenticated_userid return HTTPFound(location=request.route_url('blog', id=entry.id, slug=entry.slug)) - if 'form.update_created' in request.params and form.validate(): - del form.id # SECURITY: prevent overwriting of primary key - form.populate_obj(entry) - entry.created = datetime.datetime.now() - return HTTPFound(location=request.route_url('blog', id=entry.id, slug=entry.slug)) - if 'form.deleted' in request.params: BlogRecordService.delete(request, blog_id) request.session.flash("La page a été supprimée avec succès.", 'success') diff --git a/cao_sunyata/views/default.py b/cao_sunyata/views/default.py index 2bdbe45..c4f436c 100644 --- a/cao_sunyata/views/default.py +++ b/cao_sunyata/views/default.py @@ -34,6 +34,7 @@ def home(request): dir + '/S09.jpg', dir + '/S12.jpg', dir + '/S15.jpg', + dir + '/S16.jpg', dir + '/S18.jpg', dir + '/S21.jpg', dir + '/S25.jpg']