ajout recherche.pt

caotek_mesavoirs/views/default.py

@@ -102,7 +102,7 @@ def doc_edit(request):
     url = request.route_url('doc_edit',doc_id=doc_id)
 
     message = ""
-    themes = get_blog_themes(request)
+    themes = get_docs_themes(request)
     
     if doc_id == '0':
         titre = "Nouveau doc"
@@ -126,15 +126,15 @@ def doc_edit(request):
             if doc_id != '0':
                 return HTTPFound(location=request.route_url('doc_view', doc_id=doc_id))
             else:
-                return HTTPFound(location=request.route_url('doc_list'))
+                return HTTPFound(location=request.route_url('archives',theme=doc.theme))
         else:
             message = "Veuillez saisir un intitule et un texte."
 
     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." % intitule, 'success')
-            return HTTPFound(location=request.route_url('doc_list'))
+            request.session.flash(u"<%s> est supprimée avec succès." % doc.intitule, 'success')
+            return HTTPFound(location=request.route_url('archives',theme=doc.theme))
 
     return {
         'page_title': titre,
@@ -147,24 +147,61 @@ def doc_edit(request):
         'themes': themes,
     }
 
+@view_config(route_name='doc_search', renderer='../templates/doc_search.pt')
+def doc_search(request):
+
+    critere = ''
+    docs = []
+    
+    if 'form.submitted' in request.params:
+        critere = request.params['critere']
+        # si afficher tous les fiches ?
+        docs = get_docs_bycritere(request, critere)
+
+    return {
+        'page_title': "Rechercher",
+        'docs': docs,
+        'critere': critere,
+    }
+
+@view_config(route_name='apropos', renderer='../templates/apropos.pt')
+def apropos(request):
+
+
+    return {
+        'page_title': "A propos",
+    }
+
+
 @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):
+        
+    logged_in = request.authenticated_userid
     doc_id = request.matchdict['doc_id']    
 
     doc = get_docs(request, doc_id)
+    if logged_in == None and doc.theme == 'memo':
+        # si anonyme, interdire de voir les memo
+        return HTTPFound(location=request.route_url('home'))
+
     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
-
-    texte = doc.texte.replace('image:: static/img/', img_path)
+    texte = doc.texte.replace('static/img/', "%s/static/img/" % request.application_url)
+    
     # convertir reST en HTML
-    texte = publish_parts(texte, writer_name='html')['html_body']
+    # texte = publish_parts(texte, writer_name='html')['html_body']
+    
+    # convertir mardown en HTML
+    from markdown2 import Markdown
+    markdowner = Markdown()
+    texte = markdowner.convert(texte)
+    
     return {
         'page_title': intitule,
         'texte': texte,
+        'modif_le': doc.modif_le.strftime('%d/%m/%Y'),
         'doc_id': doc_id,
         'url_retour':url_retour
     }