From 6f9fb9c5b3bf121a1d5e12046e08e5367564afcf Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Sun, 23 Aug 2020 16:31:24 +0200 Subject: [PATCH] remettre les js en debut --- caotek_mesavoirs/templates/global_layout.pt | 40 ++++++++++----------- caotek_mesavoirs/views/default.py | 3 +- setup.py | 1 + 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/caotek_mesavoirs/templates/global_layout.pt b/caotek_mesavoirs/templates/global_layout.pt index 98839b5..7e8d6ee 100644 --- a/caotek_mesavoirs/templates/global_layout.pt +++ b/caotek_mesavoirs/templates/global_layout.pt @@ -16,6 +16,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -88,26 +108,6 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/caotek_mesavoirs/views/default.py b/caotek_mesavoirs/views/default.py index 13921a6..b501d66 100644 --- a/caotek_mesavoirs/views/default.py +++ b/caotek_mesavoirs/views/default.py @@ -157,13 +157,14 @@ def doc_edit(request): @view_config(route_name='doc_search', renderer='../templates/doc_search.pt') def doc_search(request): + logged_in = request.authenticated_userid critere = '' docs = [] if 'form.submitted' in request.params: critere = request.params['critere'] # si afficher tous les fiches ? - docs = get_docs_bycritere(request, critere) + docs = get_docs_bycritere(request, critere, logged_in) return { 'page_title': "Rechercher", diff --git a/setup.py b/setup.py index b51c259..f3d6425 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,7 @@ requires = [ 'pyramid_debugtoolbar', 'pyramid_layout', 'pyramid_mailer', + 'pyramid_retry', 'pyramid_tm', 'SQLAlchemy', 'transaction',