From 6e4ddcdbcf0f9670a34e81629c91de75a4dfbeaa Mon Sep 17 00:00:00 2001 From: Xavier J Date: Thu, 17 Nov 2016 11:24:49 +0100 Subject: [PATCH] Fix test --- app/controllers/backoffice/dossiers_list_controller.rb | 4 ++-- app/views/backoffice/dossiers/index.html.haml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/backoffice/dossiers_list_controller.rb b/app/controllers/backoffice/dossiers_list_controller.rb index 8b6d42f3f..9a98d7e45 100644 --- a/app/controllers/backoffice/dossiers_list_controller.rb +++ b/app/controllers/backoffice/dossiers_list_controller.rb @@ -30,14 +30,14 @@ class Backoffice::DossiersListController < ApplicationController def smartlisting_dossier dossiers_list=nil, liste='a_traiter' dossiers_list_facade liste - @dossiers_list = dossiers_list_facade.dossiers_to_display if dossiers_list.nil? + dossiers_list = dossiers_list_facade.dossiers_to_display if dossiers_list.nil? if param_page.nil? params[:dossiers_smart_listing] = {page: dossiers_list_facade.service.default_page} end @dossiers = smart_listing_create :dossiers, - @dossiers_list, + dossiers_list, partial: "backoffice/dossiers/list", array: true, default_sort: dossiers_list_facade.service.default_sort diff --git a/app/views/backoffice/dossiers/index.html.haml b/app/views/backoffice/dossiers/index.html.haml index 2e11f6120..0f0f3326b 100644 --- a/app/views/backoffice/dossiers/index.html.haml +++ b/app/views/backoffice/dossiers/index.html.haml @@ -6,7 +6,7 @@ =t('dynamics.backoffice.title') %div.dropdown.pull-right#download_menu - - if @dossiers_list.count > 200 + - if @dossiers_list_facade.dossiers_to_display.count > 200 %button.btn.btn-error.dropdown-toggle#dropdownDownloadMenu{ type: :button, 'data-toggle' => 'dropdown', 'aria-haspopup' => true, 'aria-expanded' => false, class: 'disabled'} %span{'data-toggle' => :tooltip, "data-placement" => :left, title: 'Pour réduire le nombre de dossiers et ne pas dépasser la limite autorisée de 200, merci de bien vouloir appliquer des filtres.'} = t('dynamics.backoffice.limit_excess_download_all_dossiers')