diff --git a/cao_blogr/forms.py b/cao_blogr/forms.py
index 43674d0..9e36d88 100644
--- a/cao_blogr/forms.py
+++ b/cao_blogr/forms.py
@@ -10,7 +10,7 @@ class BlogCreateForm(Form):
filters=[strip_filter])
body = TextAreaField('Corps du texte', validators=[InputRequired(), Length(min=1)],
filters=[strip_filter])
- tag = SelectField('Sous-rubrique')
+ tag = SelectField('Tag')
author = StringField('Auteur', validators=[InputRequired(), Length(min=1, max=50)],
filters=[strip_filter])
status = SelectField('Statut', choices=[('brouillon','Brouillon'),('publié','Publié')])
@@ -29,7 +29,7 @@ class UserCreateForm(Form):
password = PasswordField('Mot de passe', validators=[InputRequired(), Length(min=6)])
class TopicForm(Form):
- topic = StringField('Rubrique', validators=[InputRequired(), Length(min=1, max=25)],
+ topic = StringField('Topic', validators=[InputRequired(), Length(min=1, max=25)],
filters=[strip_filter])
topic_name = StringField('Intitulé', validators=[InputRequired(), Length(min=1, max=25)],
filters=[strip_filter])
@@ -40,7 +40,7 @@ class TopicForm(Form):
class TagForm(Form):
id = IntegerField(widget=HiddenInput())
- tag = StringField('Sous-rubrique', validators=[InputRequired(), Length(min=1, max=25)],
+ tag = StringField('Tag', validators=[InputRequired(), Length(min=1, max=25)],
filters=[strip_filter])
tag_name = StringField('Intitulé', validators=[InputRequired(), Length(min=1, max=25)],
filters=[strip_filter])
diff --git a/cao_blogr/services/blog_record.py b/cao_blogr/services/blog_record.py
index 2b95b7e..f25058e 100644
--- a/cao_blogr/services/blog_record.py
+++ b/cao_blogr/services/blog_record.py
@@ -39,7 +39,7 @@ class BlogRecordService(object):
@classmethod
def get_last_created(cls, request):
# gest the last created posts
- query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id != 'ADM')
+ query = request.dbsession.query(BlogRecord).filter(BlogRecord.topic_id != '_admin')
if request.authenticated_userid == None:
# if user is anonym, display only published posts
query = query.filter(BlogRecord.status == 'publié')
@@ -49,7 +49,7 @@ class BlogRecordService(object):
@classmethod
def get_activities(cls, request):
# gest the Activities section
- query = request.dbsession.query(BlogRecord).filter(and_(BlogRecord.topic_id == 'ADM',
+ query = request.dbsession.query(BlogRecord).filter(and_(BlogRecord.topic_id == '_admin',
BlogRecord.tag == 'activities',
BlogRecord.status == 'publié'))
query = query.order_by(sa.desc(BlogRecord.created)).first()
@@ -77,7 +77,7 @@ class BlogRecordService(object):
@classmethod
def get_topics(cls, request):
# get all topics
- query = request.dbsession.query(Topics).order_by(Topics.topic).all()
+ query = request.dbsession.query(Topics).order_by(Topics.topic_name).all()
return query
@classmethod
diff --git a/cao_blogr/templates/blog.jinja2 b/cao_blogr/templates/blog.jinja2
index e199dc6..c2438c6 100644
--- a/cao_blogr/templates/blog.jinja2
+++ b/cao_blogr/templates/blog.jinja2
@@ -21,7 +21,8 @@
Auteur : {{ entry.author }}
Publié le : {{ entry.created.strftime("%d-%m-%Y - %H:%M") }}
{% if request.authenticated_userid %}
- Topic - Tag : {{ entry.topic_id }} - {{ entry.tag }}
+ Topic - Tag : {{ entry.topic_id }} - {{ entry.tag }}
+ Statut : {{ entry.status }}
{% endif %}