phuoc/cao_sunyata
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added last modified entries in settings

Browse Source
This commit is contained in:
Phuoc
2022-09-28 17:27:01 +02:00
parent 7ee8774143
commit e6c7c5661d
5 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cao_blogr/services/blog_record.py
View File

@@ -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

2
cao_blogr/templates/blog_edit.jinja2
View File

@@ -56,7 +56,7 @@
{% endif %}
</div>
<p class="text-center">Apprendre la syntaxe de <a href="https://www.markdownguide.org/basic-syntax/" target="_blank">Markdown</a></li></p>
<p class="text-center">Apprendre la syntaxe de <a href="https://daringfireball.net/projects/markdown" target="_blank">Markdown</a></li></p>
</form>

8
cao_blogr/templates/layout.jinja2
View File

@@ -37,14 +37,14 @@
</div>
<div class="collapse navbar-collapse" id="myNavbar">
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ request.route_url('blog_search') }}"><span class="glyphicon glyphicon-search"></span></a></li>
<li><a href="{{ request.route_url('blog_search') }}" title="Recherche"><span class="glyphicon glyphicon-search"></span></a></li>
{% if request.authenticated_userid %}
<li><a href="{{request.route_url('settings')}}"><span class="glyphicon glyphicon-cog"></span></a></li>
<li><a href="{{request.route_url('logout')}}">
<li><a href="{{request.route_url('settings')}}" title="Paramères"><span class="glyphicon glyphicon-cog"></span></a></li>
<li><a href="{{request.route_url('logout')}}" title="Déconnexion">
{{request.authenticated_userid}}&nbsp;<span class="glyphicon glyphicon-log-out"></span></a></li>
{% else %}
<!-- si anonyme, lien pour se connecter -->
<li><a href="{{request.route_url('login')}}"><span class="glyphicon glyphicon-log-in"></span></a></li>
<li><a href="{{request.route_url('login')}}" title="Connexion"><span class="glyphicon glyphicon-log-in"></span></a></li>
{% endif %}
</ul>

34
cao_blogr/templates/settings.jinja2
View File

@@ -3,13 +3,6 @@
{% block content %}
<div class="row text-center">
{% if request.authenticated_userid == 'admin' %}
<div class="col-sm-3">
<a href=" {{request.route_url('users')}} "><span class="glyphicon glyphicon-user icone-big"></span>
<h4>UTILISATEURS</h4>
</a>
</div>
{% endif %}
<div class="col-sm-3">
<a href=" {{request.route_url('topics')}} "><span class="glyphicon glyphicon-list icone-big"></span>
<h4>TOPICS / TAGS</h4>
@@ -26,15 +19,23 @@
</a>
</div>
</div>
<div class="row">
<h2>Pages internes</h2>
<div class="row text-center">
{% if request.authenticated_userid == 'admin' %}
<p>
<a href="{{ request.route_url('blog_edit', topic=topic, id='0') }}" class="btn btn-success" role="button">
<span class="glyphicon glyphicon-plus"></span> Nouveau</a>
</p>
{% endif%}
<div class="col-sm-3">
<a href=" {{request.route_url('users')}} "><span class="glyphicon glyphicon-user icone-big"></span>
<h4>UTILISATEURS</h4>
</a>
</div>
<div class="col-sm-3">
<a href="{{ request.route_url('topic', topic='_admin') }}"><span class="glyphicon glyphicon-list icone-big"></span>
<h4>PAGES INTERNES</h4>
</a>
</div>
{% endif %}
</div>
<br>
<div class="row">
<h2>Dernières modifs</h2>
<table id="users_list" class="table table-condensed">
{% for entry in items %}
@@ -44,7 +45,7 @@
<a href="{{ request.route_url('blog', id=entry.id, slug=entry.slug) }}">{{ entry.title }}</a>
</td>
<td>{{ entry.author }}</td>
<td>{{ entry.created.strftime("%d-%m-%Y") }}</td>
<td>{{ entry.edited.strftime("%d-%m-%Y") }}</td>
{% if entry.status == 'brouillon' %}
<td><span class="label label-danger">{{ entry.status }}</span></td>
{% else %}
@@ -60,6 +61,7 @@
<ul>
<li>Pyramid {{ pyramid_version }}</li>
<li>WTForms {{ wtforms_version }}</li>
<li>Markdown {{ markdown_version }}</li>
<li>SQLAlchemy {{ sqlalchemy_version }}</li>
<li>SQLite {{ sqlite_version }}</li>
<li>Python {{ python_version }}</li>

8
cao_blogr/views/default.py
View File

@@ -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,
}