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

2
caotek_mesavoirs/routes.py
View File

@@ -4,7 +4,7 @@ def includeme(config):
config.add_route('apropos', 'apropos') config.add_route('apropos', 'apropos')
# contents # contents
config.add_route('folder', '/folder/{theme}') config.add_route('folder', '/folder/{theme}')
config.add_route('doc_edit', '/doc_edit/{doc_id}') config.add_route('doc_edit', '/doc_edit/{theme}/{doc_id}')
config.add_route('doc_view', '/doc_view/{doc_id}') config.add_route('doc_view', '/doc_view/{doc_id}')
config.add_route('doc_search', '/doc_search') config.add_route('doc_search', '/doc_search')
# portfolio # portfolio

23
caotek_mesavoirs/templates/contents/doc_edit.pt
View File

@@ -24,16 +24,6 @@
<textarea class="form-control monospace-font" rows="15" cols="40" id="texte" name="texte">${doc.texte}</textarea> <textarea class="form-control monospace-font" rows="15" cols="40" id="texte" name="texte">${doc.texte}</textarea>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-2" for="theme">Thème</label>
<div class="col-xs-6">
<select class="form-control" id="theme" name="theme">
<div tal:repeat="item themes">
<option value="${item.theme}" tal:attributes="selected doc.theme==item.theme and 'selected' or None">${item.theme}</option>
</div>
</select>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-xs-2" for="tag1">Tag 1</label> <label class="control-label col-xs-2" for="tag1">Tag 1</label>
<div class="col-xs-6"> <div class="col-xs-6">
@@ -60,11 +50,18 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-xs-2">Dossier</label>
<div class="col-xs-7">
<p class="form-control-static">${doc.theme}</p>
</div>
</div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<a href="${request.application_url}/doc_view/${doc_id}" class="btn btn-default" role="button"> <a href="${request.application_url}/doc_view/${doc_id}" class="btn btn-default" role="button" tal:condition="doc_id!='0'">
<span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Annuler</a> <span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Annuler</a>
<a href="${request.application_url}/folder/article" class="btn btn-default" role="button" tal:condition="doc_id=='0'">
<span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Annuler</a>
<button class="btn btn-primary" type="submit" name="form.submitted"> <button class="btn btn-primary" type="submit" name="form.submitted">
<span class="glyphicon glyphicon-ok"></span>&nbsp;Enregistrer</button> <span class="glyphicon glyphicon-ok"></span>&nbsp;Enregistrer</button>
<button class="btn btn-warning" type="submit" name="form.deleted" tal:condition="doc_id != '0'"> <button class="btn btn-warning" type="submit" name="form.deleted" tal:condition="doc_id != '0'">

13
caotek_mesavoirs/templates/contents/doc_view.pt
View File

@@ -3,19 +3,20 @@
<p> <p>
<a href="${url_retour}">[&nbsp;Fermer&nbsp;]</a>&nbsp; <a href="${url_retour}">[&nbsp;Fermer&nbsp;]</a>&nbsp;
<a href="${request.application_url}/doc_edit/${doc_id}" tal:condition="not layout.isAnonymous()">[&nbsp;Modifier&nbsp;]</a> <a href="${request.application_url}/doc_edit/${theme}/${doc_id}" tal:condition="not layout.isAnonymous()">[&nbsp;Modifier&nbsp;]</a>
</p> </p>
<hr> <hr>
<div tal:replace="structure texte"> <div tal:replace="structure texte">
Page text goes here. Page text goes here.
</div> </div>
<hr> <hr>
Dernière modification le ${doc.modif_le.strftime('%d/%m/%Y')}<br /> <p>
Tags : ${tags} Dernière modification le ${doc.modif_le.strftime('%d/%m/%Y')}<br />
Tags : ${tags}
<div tal:condition="not layout.isAnonymous"> </p>
<p tal:condition="not layout.isAnonymous">
Status : ${doc.statut} Status : ${doc.statut}
</div> </p>
<br /> <br />
<br /> <br />

4
caotek_mesavoirs/templates/contents/folder.pt
View File

@@ -1,6 +1,10 @@
<div metal:use-macro="load: ../global_layout.pt"> <div metal:use-macro="load: ../global_layout.pt">
<div metal:fill-slot="content"> <div metal:fill-slot="content">
<p>
<a href="${request.application_url}">[&nbsp;Retour&nbsp;]</a>&nbsp;
<a href="${request.application_url}/doc_edit/${theme}/0" tal:condition="not layout.isAnonymous()">[&nbsp;Créer&nbsp;]</a>
</p>
<div class="row"> <div class="row">
<table class="table"> <table class="table">
<tr tal:repeat="ligne docs"> <tr tal:repeat="ligne docs">

8
caotek_mesavoirs/templates/home.pt
View File

@@ -7,13 +7,9 @@
<br /> <br />
<img src="${request.static_url('caotek_mesavoirs:static/img/cover_image_540max.jpg')}" alt="cover_image"> <img src="${request.static_url('caotek_mesavoirs:static/img/cover_image_540max.jpg')}" alt="cover_image">
</div> </div>
<div class="col-sm-8">
<h3>Derniers posts</h3>
<p>
| <a href="${request.application_url}/folder/blog">Voir tous les posts</a> |
<a tal:condition="not layout.isAnonymous()" href="${request.application_url}/doc_edit/0">Créer un nouveau post |</a>
</p>
<div class="col-sm-8">
<h3>Derniers posts</h3>
<table class="table"> <table class="table">
<tr tal:repeat="ligne items"> <tr tal:repeat="ligne items">
<td>${ligne.cree_le.strftime("%d %b")}</td> <td>${ligne.cree_le.strftime("%d %b")}</td>

15
caotek_mesavoirs/views/contents.py
View File

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