refonte de doc_list et doc_view

This commit is contained in:
2020-04-30 17:43:50 +02:00
parent cb73317f8c
commit 9462483fa5
13 changed files with 156 additions and 136 deletions

View File

@@ -18,6 +18,9 @@ from sqlalchemy.exc import DBAPIError
from ..security import groupfinder
from ..models.default import *
from ..models.members import (
get_member_by_email
)
# import datetime
import time
@@ -69,24 +72,27 @@ def to_percent(x, d):
@view_config(route_name='home', renderer='../templates/home.pt')
def home(request):
member = get_member_by_email(request, 'ctphuoc@gmail.com')
id_photo = member.photo_instagram
# lire toutes les docs
items = get_docs_bytheme(request, 'BLOG')
return {
'page_title': "Home",
'page_title': "Blog d'un ancien geek",
'items': items,
'id_photo': id_photo,
}
@view_config(route_name='doc_list', renderer='../templates/doc_list.pt', permission='view')
def doc_list(request):
@view_config(route_name='archives', renderer='../templates/archives.pt')
def archives(request):
theme = request.matchdict['theme']
# lire toutes les docs
memos = get_docs_bytheme(request, 'memo')
docs = get_docs_bytheme(request, 'doc')
# lire toutes les docs du theme
docs = get_docs_bytheme(request, theme)
return {
'page_title': "Documents",
'memos': memos,
'page_title': "Archives de %s" % theme,
'docs': docs,
}
@@ -141,13 +147,15 @@ def doc_edit(request):
'themes': themes,
}
@view_config(route_name='doc_view', renderer='../templates/doc_view.pt', permission='view')
@view_config(route_name='doc_view', renderer='../templates/doc_view.pt')
@view_config(route_name='memo_view', renderer='../templates/doc_view.pt', permission='view')
def doc_view(request):
doc_id = request.matchdict['doc_id']
current_route_path = request.current_route_path()
doc = get_docs(request, doc_id)
intitule = doc.intitule
url_retour = request.route_url('archives',theme=doc.theme)
# insèrer le path de static/img
img_path = 'image:: %s/static/img/' % request.application_url
@@ -158,6 +166,7 @@ def doc_view(request):
'page_title': intitule,
'texte': texte,
'doc_id': doc_id,
'url_retour':url_retour
}
def envoyerMail(request, destinataire, objet, corps):

View File

@@ -65,9 +65,9 @@ Le lien suivant vous dirigera vers une page où vous pourrez ré-initialiser vot
'message': message,
}
@view_config(route_name='changer_mdp', renderer='../templates/members/changer_mdp.pt', permission='view')
def changer_mdp(request):
url = request.route_url('changer_mdp')
@view_config(route_name='preferences', renderer='../templates/members/preferences.pt', permission='view')
def preferences(request):
url = request.route_url('preferences')
logged_in = request.authenticated_userid
message = ''
@@ -84,8 +84,14 @@ def changer_mdp(request):
else:
message = "Le mot de passe actuel n'est pas correct."
if 'form.photo' in request.params:
photo_instagram = request.params['photo_instagram']
update_membre_photo(request, logged_in, photo_instagram)
request.session.flash(u"L'id de la photo a été mis à jour avec succès.")
return HTTPFound(location=request.route_url('home'))
return {
'page_title': "Changer mon mot de passe",
'page_title': "Mes préférences",
'url': url,
'member': member,
'message': message,