Merge branch 'develop' into staging

app/models/procedure.rb

@@ -39,7 +39,7 @@ class Procedure < ActiveRecord::Base
   MAIL_TEMPLATE_TYPES = %w(InitiatedMail ReceivedMail ClosedMail RefusedMail WithoutContinuationMail)
 
   MAIL_TEMPLATE_TYPES.each do |name|
-    has_one "#{name.underscore}".to_sym, class_name: "Mails::#{name}"
+    has_one "#{name.underscore}".to_sym, class_name: "Mails::#{name}", dependent: :destroy
     define_method("#{name.underscore}_with_override") do
       self.send("#{name.underscore}_without_override") || Object.const_get("Mails::#{name}").default
     end

app/views/dossiers/_invites.html.haml

@@ -14,5 +14,5 @@
   .col-xs-3
     = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline' do
       = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation'
-      = submit_tag 'Ajouter', class: 'btn btn-success', id: 'send-invitation'
+      = submit_tag 'Ajouter', class: 'btn btn-success', id: 'send-invitation', data: {confirm: "Envoyer l'invitation ?"}
 

app/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.html.haml

@@ -5,19 +5,21 @@
 #action-block
   - if gestionnaire_signed_in?
     - if !@facade.dossier.read_only? || @facade.dossier.initiated?
-      = link_to 'Passer en instruction', backoffice_dossier_receive_path(@facade.dossier), method: :post, class: 'btn btn-danger btn-block'
+      = link_to 'Passer en instruction', backoffice_dossier_receive_path(@facade.dossier), method: :post, class: 'btn btn-danger btn-block', data: { confirm: "Confirmer vous le passage en instruction de ce dossier ?" }
 
     - elsif @facade.dossier.received?
-      = form_tag(url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Accepter') do
+      %ul.list-inline
-        %button.action.close-dossier
+        %li
-          %i.fa.fa-check
+          = link_to url_for({controller: 'backoffice/dossiers', action: :close, dossier_id: @facade.dossier.id}), class: 'btn btn-success', method: :post, title: 'Accepter', data: { toggle: :tooltip, confirm: "Accepter ce dossier ?" } do
-      = form_tag(url_for({controller: 'backoffice/dossiers', action: :without_continuation, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Classer sans suite') do
+            %i.fa.fa-check
-        %button.action.forget-dossier
+        %li
-          %i.fa.fa-circle-o
+          = link_to url_for({controller: 'backoffice/dossiers', action: :without_continuation, dossier_id: @facade.dossier.id}), class: 'btn btn-warning', method: :post, title: 'Classer sans suite', data: { toggle: :tooltip, confirm: "Classer sans suite ce dossier ?" } do
-      = form_tag(url_for({controller: 'backoffice/dossiers', action: :refuse, dossier_id: @facade.dossier.id}), class: 'form-inline action_button', method: 'POST', style: 'display:inline', 'data-toggle' => :tooltip, title: 'Refuser') do
+            %i.fa.fa-circle-o
-        %button.action.refuse-dossier
+        %li
-          %i.fa.fa-times
+          = link_to url_for({controller: 'backoffice/dossiers', action: :refuse, dossier_id: @facade.dossier.id}), class: 'btn btn-danger', method: :post, title: 'Refuser', data: { toggle: :tooltip, confirm: "Refuser ce dossier ?" } do
-      = link_to 'Reouvrir', backoffice_dossier_reopen_path(@facade.dossier), method: :post, class: 'btn btn-default btn-block'
+            %i.fa.fa-times
+
+      = link_to 'Reouvrir', backoffice_dossier_reopen_path(@facade.dossier), method: :post, class: 'btn btn-default btn-block', data: { confirm: "Confirmer vous la réouverture de ce dossier ?" }
 
     %hr
     - if @facade.dossier.archived?
@@ -26,7 +28,7 @@
       = link_to 'Désarchiver', unarchive_backoffice_dossier_path(@facade.dossier), method: :post, class: 'btn btn-default btn-block'
 
     - else
-      = link_to 'Archiver', archive_backoffice_dossier_path(@facade.dossier), method: :post, class: 'btn btn-default btn-block'
+      = link_to 'Archiver', archive_backoffice_dossier_path(@facade.dossier), method: :post, class: 'btn btn-default btn-block', data: { confirm: "Confirmer vous l'archivage de ce dossier ?" }
 
 
 

app/views/layouts/navbars/_navbar_backoffice_dossierscontroller_show.html.haml

@@ -38,4 +38,4 @@
           %li
             = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline', id: 'send-invitation' do
               = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation', id: 'invitation-email'
-              = submit_tag 'Ajouter', class: 'btn btn-success'
+              = submit_tag 'Ajouter', class: 'btn btn-success', data: {confirm: "Envoyer l'invitation ?"}

app/views/layouts/navbars/_navbar_users_recapitulatifcontroller_show.html.haml

@@ -28,4 +28,4 @@
           %li
             = form_tag invites_dossier_path(dossier_id: @facade.dossier.id), method: :post, class: 'form-inline', id: 'send-invitation' do
               = text_field_tag :email, '', class: 'form-control', placeholder: 'Envoyer une invitation', id: 'invitation-email'
-              = submit_tag 'Ajouter', class: 'btn btn-success'
+              = submit_tag 'Ajouter', class: 'btn btn-success', data: {confirm: "Envoyer l'invitation ?"}

spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb

@@ -75,9 +75,9 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
       it { expect(rendered).to have_content('En instruction') }
 
       it 'button accepter / refuser / classer sans suite are present' do
-        expect(rendered).to have_css('form[data-toggle="tooltip"][title="Accepter"]')
+        expect(rendered).to have_css('a[title="Accepter"]')
-        expect(rendered).to have_css('form[data-toggle="tooltip"][title="Classer sans suite"]')
+        expect(rendered).to have_css('a[title="Classer sans suite"]')
-        expect(rendered).to have_css('form[data-toggle="tooltip"][title="Refuser"]')
+        expect(rendered).to have_css('a[title="Refuser"]')
       end
     end