DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2016-09-26 13:59:03 +02:00
commit 9909b29d86
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/backoffice/dossiers/procedure_controller.rb
View file

@ -8,6 +8,8 @@ class Backoffice::Dossiers::ProcedureController < ApplicationController
cookies[:liste] = params[:liste] || cookies[:liste] || 'a_traiter'
smartlisting_dossier cookies[:liste]
current_gestionnaire.update_column :procedure_filter, [params[:id]]
render 'backoffice/dossiers/index'
rescue ActiveRecord::RecordNotFound
flash[:alert] = "Cette procédure n'existe pas ou vous n'y avez pas accès."

3
app/controllers/backoffice/dossiers_controller.rb
View file

@ -6,6 +6,9 @@ class Backoffice::DossiersController < ApplicationController
def index
cookies[:liste] = params[:liste] || cookies[:liste] || 'a_traiter'
current_gestionnaire.update_column :procedure_filter, []
smartlisting_dossier (cookies[:liste])
end

3
app/views/layouts/_navbar.html.haml
View file

@ -6,7 +6,8 @@
= image_tag('marianne_small.png', class: 'logo')
%a{href: '/'}
= image_tag('logo-tps.png', class: 'logo')
%a{href: '/', class: 'btn btn-md'}
%a{href: (current_gestionnaire.procedure_filter.empty? ? '/' : backoffice_dossiers_procedure_path(current_gestionnaire.procedure_filter)), class: 'btn btn-md'}
-if gestionnaire_signed_in? || user_signed_in?
Mes Dossiers
-elsif administrateur_signed_in?