diff --git a/app/controllers/admin/procedures_controller.rb b/app/controllers/admin/procedures_controller.rb index dbcdc8d88..82819d1dc 100644 --- a/app/controllers/admin/procedures_controller.rb +++ b/app/controllers/admin/procedures_controller.rb @@ -6,7 +6,7 @@ class Admin::ProceduresController < AdminController def index @procedures = smart_listing_create :procedures, - current_administrateur.procedures.published.where(archived: false).order(created_at: :desc), + current_administrateur.procedures.published.not_archived.order(created_at: :desc), partial: "admin/procedures/list", array: true @@ -26,7 +26,7 @@ class Admin::ProceduresController < AdminController def draft @procedures = smart_listing_create :procedures, - current_administrateur.procedures.not_published.where(archived: false).order(created_at: :desc), + current_administrateur.procedures.not_published.not_archived.order(created_at: :desc), partial: "admin/procedures/list", array: true diff --git a/app/controllers/demo_controller.rb b/app/controllers/demo_controller.rb index 59b784814..4773628e3 100644 --- a/app/controllers/demo_controller.rb +++ b/app/controllers/demo_controller.rb @@ -6,7 +6,7 @@ class DemoController < ApplicationController return redirect_to root_path if Rails.env.production? smart_listing_create :procedures, - Procedure.published.where(archived: false).order("id DESC"), + Procedure.published.not_archived.order("id DESC"), partial: "demo/list", array: true end diff --git a/app/controllers/users/dossiers_controller.rb b/app/controllers/users/dossiers_controller.rb index 1109f7dcd..ec7147da2 100644 --- a/app/controllers/users/dossiers_controller.rb +++ b/app/controllers/users/dossiers_controller.rb @@ -60,7 +60,7 @@ class Users::DossiersController < UsersController end def new - procedure = Procedure.where(archived: false).published.find(params[:procedure_id]) + procedure = Procedure.not_archived.published.find(params[:procedure_id]) dossier = Dossier.create(procedure: procedure, user: current_user, state: 'draft') siret = params[:siret] || current_user.siret diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml index 5b3a10fac..4ffada454 100644 --- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml +++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_index.html.haml @@ -13,13 +13,13 @@ .procedure-list-element{ class: @draft_class } Brouillons .badge.progress-bar-default - = current_administrateur.procedures.not_published.where(archived: false).count + = current_administrateur.procedures.not_published.not_archived.count %a#active-procedures{ :href => "#{url_for :admin_procedures}" } .procedure-list-element{ class: @active_class } Actives .badge.progress-bar-success - = current_administrateur.procedures.published.where(archived: false).count + = current_administrateur.procedures.published.not_archived.count %a#archived-procedures{ :href => "#{url_for :admin_procedures_archived}" } .procedure-list-element{ class: @archived_class }