From 0d14bf0d5ac1df984e9d66dd15bb0f4e281b6ea0 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Tue, 2 Mar 2021 16:51:03 +0100
Subject: [PATCH] =?UTF-8?q?doc=5Fedit=20:=20le=20theme=20est=20fix=C3=A9?=
 =?UTF-8?q?=20par=20le=20dossier=20d'origine?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 caotek_mesavoirs/routes.py                    |  2 +-
 .../templates/contents/doc_edit.pt            | 23 ++++++++-----------
 .../templates/contents/doc_view.pt            | 13 ++++++-----
 caotek_mesavoirs/templates/contents/folder.pt |  4 ++++
 caotek_mesavoirs/templates/home.pt            |  8 ++-----
 caotek_mesavoirs/views/contents.py            | 17 ++++++++------
 6 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/caotek_mesavoirs/routes.py b/caotek_mesavoirs/routes.py
index e65768a..10f28ff 100644
--- a/caotek_mesavoirs/routes.py
+++ b/caotek_mesavoirs/routes.py
@@ -4,7 +4,7 @@ def includeme(config):
     config.add_route('apropos', 'apropos')
     # contents
     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_search', '/doc_search')
     # portfolio
diff --git a/caotek_mesavoirs/templates/contents/doc_edit.pt b/caotek_mesavoirs/templates/contents/doc_edit.pt
index 8dd65b0..fac59cd 100644
--- a/caotek_mesavoirs/templates/contents/doc_edit.pt
+++ b/caotek_mesavoirs/templates/contents/doc_edit.pt
@@ -24,16 +24,6 @@
 						<textarea class="form-control monospace-font" rows="15" cols="40" id="texte" name="texte">${doc.texte}</textarea>
 					</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">
 					<label class="control-label col-xs-2" for="tag1">Tag 1</label>
 					<div class="col-xs-6">
@@ -60,11 +50,18 @@
 						</select>
 					</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="col-sm-offset-2 col-sm-10">
-						<a href="${request.application_url}/doc_view/${doc_id}" class="btn btn-default" role="button">
-                        <span class="glyphicon glyphicon-chevron-left"></span>&nbsp;Annuler</a>
+						<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>
+						<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">
                         <span class="glyphicon glyphicon-ok"></span>&nbsp;Enregistrer</button>
 						<button  class="btn btn-warning" type="submit" name="form.deleted" tal:condition="doc_id != '0'">
diff --git a/caotek_mesavoirs/templates/contents/doc_view.pt b/caotek_mesavoirs/templates/contents/doc_view.pt
index 5415e26..40681fe 100644
--- a/caotek_mesavoirs/templates/contents/doc_view.pt
+++ b/caotek_mesavoirs/templates/contents/doc_view.pt
@@ -3,19 +3,20 @@
 
 	<p>
 		<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>
 	<hr>
 	<div tal:replace="structure texte">
 		Page text goes here.
 	</div>
 	<hr>
-	Dernière modification le ${doc.modif_le.strftime('%d/%m/%Y')}<br />
-	Tags : ${tags}
-
-	<div tal:condition="not layout.isAnonymous">
+	<p>
+		Dernière modification le ${doc.modif_le.strftime('%d/%m/%Y')}<br />
+		Tags : ${tags}
+	</p>
+	<p tal:condition="not layout.isAnonymous">
 		Status : ${doc.statut}
-	</div>
+	</p>
 	
 	<br />
 	<br />
diff --git a/caotek_mesavoirs/templates/contents/folder.pt b/caotek_mesavoirs/templates/contents/folder.pt
index 6711f91..aee78d5 100644
--- a/caotek_mesavoirs/templates/contents/folder.pt
+++ b/caotek_mesavoirs/templates/contents/folder.pt
@@ -1,6 +1,10 @@
 <div metal:use-macro="load: ../global_layout.pt">
 <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">
 		<table class="table">
 			<tr tal:repeat="ligne docs">
diff --git a/caotek_mesavoirs/templates/home.pt b/caotek_mesavoirs/templates/home.pt
index 0609de7..1bba4fc 100644
--- a/caotek_mesavoirs/templates/home.pt
+++ b/caotek_mesavoirs/templates/home.pt
@@ -7,13 +7,9 @@
 			<br />
 			<img src="${request.static_url('caotek_mesavoirs:static/img/cover_image_540max.jpg')}" alt="cover_image">
 		</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>
-	
+			<h3>Derniers posts</h3>	
 			<table class="table">
 				<tr tal:repeat="ligne items">
 					<td>${ligne.cree_le.strftime("%d %b")}</td>
diff --git a/caotek_mesavoirs/views/contents.py b/caotek_mesavoirs/views/contents.py
index 6afb583..93ff7d2 100644
--- a/caotek_mesavoirs/views/contents.py
+++ b/caotek_mesavoirs/views/contents.py
@@ -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,
     }