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

doc_edit : le theme est fixé par le dossier d'origine

Browse Source
This commit is contained in:
Phuoc
2021-03-02 16:51:03 +01:00
parent 2908ce7367
commit 0d14bf0d5a
6 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
caotek_mesavoirs/views/contents.py
View File

@@ -28,12 +28,14 @@ def folder(request):
return {
'page_title': "Contenu de %s" % theme.upper(),
'docs': docs,
'theme': theme,
}
@view_config(route_name='doc_edit', renderer='../templates/contents/doc_edit.pt', permission='view')
def doc_edit(request):
theme = request.matchdict['theme']
doc_id = request.matchdict['doc_id']
url = request.route_url('doc_edit',doc_id=doc_id)
url = request.route_url('doc_edit', theme=theme, doc_id=doc_id)
logged_in = request.authenticated_userid
# si anonyme, interdire de voir les docs privés
@@ -41,7 +43,6 @@ def doc_edit(request):
return HTTPFound(location=request.route_url('home'))
message = ""
themes = get_docs_themes(request, logged_in)
tags = get_docs_tags(request)
statuts = ['private', 'public']
@@ -51,7 +52,7 @@ def doc_edit(request):
doc = {}
doc['intitule'] = ''
doc['texte'] = ''
doc['theme'] = ''
doc['theme'] = theme
doc['tag1'] = ''
doc['tag2'] = ''
doc['statut'] = 'private'
@@ -65,18 +66,19 @@ def doc_edit(request):
if param in request.params and request.params[param] != db_value:
new_values[param] = request.params[param]
if new_values:
if new_values:
new_values['theme'] = theme
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=request.params['theme']))
return HTTPFound(location=request.route_url('folder',theme=theme))
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=doc.theme))
return HTTPFound(location=request.route_url('folder',theme=theme))
return {
'page_title': titre,
@@ -84,7 +86,7 @@ def doc_edit(request):
'message': message,
'doc_id': doc_id,
'doc': doc,
'themes': themes,
'theme': theme,
'tags': tags,
'statuts': statuts,
}
@@ -141,6 +143,7 @@ def doc_view(request):
'doc_id': doc_id,
'doc': doc,
'texte': texte,
'theme': doc.theme,
'tags': tags,
'url_retour':url_retour,
}