diff --git a/cao_blogr/services/blog_record.py b/cao_blogr/services/blog_record.py
index f25058e..5348d01 100644
--- a/cao_blogr/services/blog_record.py
+++ b/cao_blogr/services/blog_record.py
@@ -46,6 +46,16 @@ class BlogRecordService(object):
query = query.order_by(sa.desc(BlogRecord.created)).limit(10).all()
return query
+ @classmethod
+ def get_last_edited(cls, request):
+ # gest the last edited posts
+ 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é')
+ query = query.order_by(sa.desc(BlogRecord.edited)).limit(10).all()
+ return query
+
@classmethod
def get_activities(cls, request):
# gest the Activities section
diff --git a/cao_blogr/templates/blog_edit.jinja2 b/cao_blogr/templates/blog_edit.jinja2
index 8918ac3..05407f7 100644
--- a/cao_blogr/templates/blog_edit.jinja2
+++ b/cao_blogr/templates/blog_edit.jinja2
@@ -56,7 +56,7 @@
{% endif %}
-
Apprendre la syntaxe de Markdown
+ Apprendre la syntaxe de Markdown
diff --git a/cao_blogr/templates/layout.jinja2 b/cao_blogr/templates/layout.jinja2
index 4b80033..d60cf4f 100644
--- a/cao_blogr/templates/layout.jinja2
+++ b/cao_blogr/templates/layout.jinja2
@@ -37,14 +37,14 @@
diff --git a/cao_blogr/templates/settings.jinja2 b/cao_blogr/templates/settings.jinja2
index 13846ad..17155ba 100644
--- a/cao_blogr/templates/settings.jinja2
+++ b/cao_blogr/templates/settings.jinja2
@@ -3,13 +3,6 @@
{% block content %}
- {% if request.authenticated_userid == 'admin' %}
-
- {% endif %}
-
-
-
Pages internes
+
{% if request.authenticated_userid == 'admin' %}
-
-
- Nouveau
-
- {% endif%}
+
+
+ {% endif %}
+
+
+
+
Dernières modifs
{% for entry in items %}
@@ -44,7 +45,7 @@
{{ entry.title }}
| {{ entry.author }} |
- {{ entry.created.strftime("%d-%m-%Y") }} |
+ {{ entry.edited.strftime("%d-%m-%Y") }} |
{% if entry.status == 'brouillon' %}
{{ entry.status }} |
{% else %}
@@ -60,6 +61,7 @@
- Pyramid {{ pyramid_version }}
- WTForms {{ wtforms_version }}
+ - Markdown {{ markdown_version }}
- SQLAlchemy {{ sqlalchemy_version }}
- SQLite {{ sqlite_version }}
- Python {{ python_version }}
diff --git a/cao_blogr/views/default.py b/cao_blogr/views/default.py
index 8ef398d..95274e2 100644
--- a/cao_blogr/views/default.py
+++ b/cao_blogr/views/default.py
@@ -116,11 +116,12 @@ def settings(request):
# lire toutes les docs du topic
topic = '_admin'
- items = BlogRecordService.by_topic(request, topic, '')
+ items = BlogRecordService.get_last_edited(request)
# informations sur les versions
pyramid_version = pkg_resources.get_distribution("pyramid").version
wtforms_version = pkg_resources.get_distribution("wtforms").version
+ markdown_version = pkg_resources.get_distribution("markdown2").version
sqlalchemy_version = pkg_resources.get_distribution("sqlalchemy").version
sqlite_version = sqlite3.sqlite_version
python_version = sys.version
@@ -130,10 +131,11 @@ def settings(request):
'topic': topic,
'items': items,
'pyramid_version': pyramid_version,
- 'python_version' : python_version,
+ 'wtforms_version': wtforms_version,
+ 'markdown_version': markdown_version,
'sqlite_version' : sqlite_version,
'sqlalchemy_version': sqlalchemy_version,
- 'wtforms_version': wtforms_version,
+ 'python_version' : python_version,
}