diff --git a/caotek_mesavoirs/models/default.py b/caotek_mesavoirs/models/default.py index 729bc39..1a27860 100644 --- a/caotek_mesavoirs/models/default.py +++ b/caotek_mesavoirs/models/default.py @@ -46,8 +46,11 @@ def get_docs_themes(request): results = request.dbsession.execute(query).fetchall() return results -def get_docs_bycritere(request, critere): - query = "SELECT * FROM docs WHERE texte like :critere;" +def get_docs_bycritere(request, critere, logged_in): + if logged_in == None: + query = "SELECT * FROM docs JOIN docs_themes ON docs.theme = docs_themes.theme WHERE (docs.texte like :critere) OR (docs.intitule like :critere) AND docs_themes.visible = 'oui';" + else: + query = "SELECT * FROM docs JOIN docs_themes ON docs.theme = docs_themes.theme WHERE (docs.texte like :critere) OR (docs.intitule like :critere);" results = request.dbsession.execute(query, {'critere': '%' + critere + '%'}).fetchall() return results diff --git a/caotek_mesavoirs/routes.py b/caotek_mesavoirs/routes.py index 84746d6..3f257e5 100644 --- a/caotek_mesavoirs/routes.py +++ b/caotek_mesavoirs/routes.py @@ -2,7 +2,7 @@ def includeme(config): config.add_static_view('static', 'static', cache_max_age=3600) config.add_route('home', '/') config.add_route('apropos', 'apropos') - config.add_route('archives', '/archives/{theme}') + config.add_route('archives', '/archives') config.add_route('doc_edit', '/doc_edit/{doc_id}') config.add_route('doc_view', '/doc_view/{doc_id}') config.add_route('doc_search', '/doc_search') diff --git a/caotek_mesavoirs/templates/archives.pt b/caotek_mesavoirs/templates/archives.pt index 9afad88..0214798 100644 --- a/caotek_mesavoirs/templates/archives.pt +++ b/caotek_mesavoirs/templates/archives.pt @@ -1,10 +1,24 @@
+
+
+
+ + +
+ +
+
-

- Créer un nouveau post -

diff --git a/caotek_mesavoirs/templates/global_layout.pt b/caotek_mesavoirs/templates/global_layout.pt index 7ea9b81..98839b5 100644 --- a/caotek_mesavoirs/templates/global_layout.pt +++ b/caotek_mesavoirs/templates/global_layout.pt @@ -69,8 +69,6 @@
${ligne.intitule}
@@ -21,20 +22,6 @@
-
-
- -

EPARGNE

-
-
- -

MEMOS

-
-
- -

ARTICLES

-
-
diff --git a/caotek_mesavoirs/templates/panels/dropdown_menu_panel.pt b/caotek_mesavoirs/templates/panels/dropdown_menu_panel.pt index fd32ac3..a4ce58a 100644 --- a/caotek_mesavoirs/templates/panels/dropdown_menu_panel.pt +++ b/caotek_mesavoirs/templates/panels/dropdown_menu_panel.pt @@ -9,7 +9,9 @@
  • Mes préférences
  • +
  • Markdown syntax
  • Gestion des membres
  • +
  • Porfolio
  • diff --git a/caotek_mesavoirs/views/default.py b/caotek_mesavoirs/views/default.py index 1507580..13921a6 100644 --- a/caotek_mesavoirs/views/default.py +++ b/caotek_mesavoirs/views/default.py @@ -85,7 +85,13 @@ def home(request): @view_config(route_name='archives', renderer='../templates/archives.pt') def archives(request): - theme = request.matchdict['theme'] + theme = 'blog' + + if 'theme' in request.params: + theme = request.params["theme"] + + # lire la table des themes + themes = get_docs_themes(request) # lire toutes les docs du theme docs = get_docs_bytheme(request, theme) @@ -93,6 +99,8 @@ def archives(request): return { 'page_title': "Archives de %s" % theme, 'docs': docs, + 'themes': themes, + 'theme': theme, } @view_config(route_name='doc_edit', renderer='../templates/doc_edit.pt', permission='view')