From 178f0f88c13126a0108abd1c60bd2ad71fd5be05 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Mon, 28 Nov 2016 14:38:33 +0100 Subject: [PATCH] =?UTF-8?q?-=20Delete=20page=20=C2=AB=20Tous=20les=20dossi?= =?UTF-8?q?ers=20=C2=BB=20-=20Fix=20follow=20tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/backoffice/dossiers_controller.rb | 4 ++-- app/services/dossiers_list_gestionnaire_service.rb | 5 +++-- ..._left_panel_backoffice_dossierscontroller_index.html.haml | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/backoffice/dossiers_controller.rb b/app/controllers/backoffice/dossiers_controller.rb index 0defef003..c6f63f321 100644 --- a/app/controllers/backoffice/dossiers_controller.rb +++ b/app/controllers/backoffice/dossiers_controller.rb @@ -3,8 +3,8 @@ class Backoffice::DossiersController < Backoffice::DossiersListController def index super - dossiers_list_facade.service.filter_procedure_reset! - @facade_data_view = dossiers_list_facade + procedure = dossiers_list_facade.gestionnaire_procedures_name_and_id_list.first + redirect_to backoffice_dossiers_procedure_path(id: procedure[:id]) end def show diff --git a/app/services/dossiers_list_gestionnaire_service.rb b/app/services/dossiers_list_gestionnaire_service.rb index 2c8f0241e..2eb286ea8 100644 --- a/app/services/dossiers_list_gestionnaire_service.rb +++ b/app/services/dossiers_list_gestionnaire_service.rb @@ -17,7 +17,7 @@ class DossiersListGestionnaireService end def self.dossiers_liste_libelle - ['nouveaux', 'suivi', 'a_traiter', 'fige' ,'deposes', 'a_instruire', 'termine', 'all_state'] + ['nouveaux', 'suivi', 'a_traiter', 'fige', 'deposes', 'a_instruire', 'termine', 'all_state'] end def all_state @@ -25,7 +25,7 @@ class DossiersListGestionnaireService end def suivi - @suivi ||= @current_devise_profil.dossiers_follow + @suivi ||= @current_devise_profil.dossiers_follow.merge(all_state) end def nouveaux @@ -188,4 +188,5 @@ class DossiersListGestionnaireService def current_preference_smart_listing_page @current_devise_profil.preference_smart_listing_page end + end diff --git a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml index 0772f4b06..f17a03236 100644 --- a/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml +++ b/app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_index.html.haml @@ -20,7 +20,6 @@ %div#infos-block #procedure_list %div.procedure_list_element - =link_to "Tous les dossiers", backoffice_dossiers_path - @dossiers_list_facade.gestionnaire_procedures_name_and_id_list.each do |procedure| %div.procedure_list_element =link_to truncate(procedure[:libelle], {length: 50}), backoffice_dossiers_procedure_path(procedure[:id]),{title: procedure[:libelle]}