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

refonte : theme->topic et home.pt

Browse Source
This commit is contained in:
Phuoc
2021-09-11 09:40:52 +02:00
parent d24becec1c
commit e8542c9b66
11 changed files with 100 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
caotek_mesavoirs/views/contents.py
View File

@@ -19,23 +19,23 @@ def isAnonymous(request):
@view_config(route_name='folder', renderer='../templates/contents/folder.pt')
def folder(request):
theme = request.matchdict['theme']
topic = request.matchdict['topic']
logged_in = request.authenticated_userid
# lire toutes les docs du theme
docs = get_docs_bytheme(request, theme, logged_in)
# lire toutes les docs du topic
docs = get_docs_bytopic(request, topic, logged_in)
return {
'page_title': "Contenu de %s" % theme.upper(),
'page_title': "Contenu de %s" % topic.upper(),
'docs': docs,
'theme': theme,
'topic': topic,
}
@view_config(route_name='doc_edit', renderer='../templates/contents/doc_edit.pt', permission='view')
def doc_edit(request):
theme = request.matchdict['theme']
topic = request.matchdict['topic']
doc_id = request.matchdict['doc_id']
url = request.route_url('doc_edit', theme=theme, doc_id=doc_id)
url = request.route_url('doc_edit', topic=topic, doc_id=doc_id)
logged_in = request.authenticated_userid
# si anonyme, interdire de modifier les docs
@@ -43,7 +43,7 @@ def doc_edit(request):
return HTTPFound(location=request.route_url('home'))
message = ""
tags = get_docs_tags(request)
tags = get_d_tags(request)
statuts = ['private', 'public']
if doc_id == '0':
@@ -52,7 +52,7 @@ def doc_edit(request):
doc = {}
doc['intitule'] = ''
doc['texte'] = ''
doc['theme'] = theme
doc['topic'] = topic
doc['tag1'] = ''
doc['tag2'] = ''
doc['statut'] = 'private'
@@ -67,18 +67,18 @@ def doc_edit(request):
new_values[param] = request.params[param]
if new_values:
new_values['theme'] = theme
new_values['topic'] = topic
update_doc(request, doc_id, new_values)
if doc_id != '0':
return HTTPFound(location=request.route_url('doc_view', doc_id=doc_id))
else:
return HTTPFound(location=request.route_url('folder',theme=theme))
return HTTPFound(location=request.route_url('folder',topic=topic))
if 'form.deleted' in request.params:
if doc_id != '0':
delete_doc(request, doc_id)
request.session.flash(u"<%s> est supprimée avec succès." % doc.intitule, 'success')
return HTTPFound(location=request.route_url('folder',theme=theme))
return HTTPFound(location=request.route_url('folder',topic=topic))
return {
'page_title': titre,
@@ -86,7 +86,7 @@ def doc_edit(request):
'message': message,
'doc_id': doc_id,
'doc': doc,
'theme': theme,
'topic': topic,
'tags': tags,
'statuts': statuts,
}
@@ -125,7 +125,7 @@ def doc_view(request):
# mouvements portfolio, retour vers portfolio
url_retour = request.route_url('portfolio')
else:
url_retour = request.route_url('folder',theme=doc.theme)
url_retour = request.route_url('folder',topic=doc.topic)
tags = doc.tag1
if doc.tag2:
tags += ', ' + doc.tag2
@@ -143,7 +143,7 @@ def doc_view(request):
'doc_id': doc_id,
'doc': doc,
'texte': texte,
'theme': doc.theme,
'topic': doc.topic,
'tags': tags,
'url_retour':url_retour,
}