Merge branch 'develop' into staging

app/controllers/users/dossiers/invites_controller.rb

@@ -8,7 +8,7 @@ class Users::Dossiers::InvitesController < UsersController
   end
 
   def show
-    @facade = InviteDossierFacades.new params[:id], current_user.email
+    @facade = InviteDossierFacades.new params[:id].to_i, current_user.email
 
     render 'users/recapitulatif/show'
   rescue ActiveRecord::RecordNotFound

app/facades/invite_dossier_facades.rb

@@ -1,7 +1,7 @@
 class InviteDossierFacades < DossierFacades
 
   #TODO rechercher en fonction de la personne/email
-  def initialize dossier_id, email
-    @dossier = Invite.where(email: email, dossier_id: dossier_id).first!.dossier
+  def initialize id, email
+    @dossier = Invite.where(email: email, id: id).first!.dossier
   end
 end

app/views/dossiers/_dossier_show.html.haml

@@ -16,7 +16,7 @@
       - unless @facade.commentaires.empty?
         %div.commentaires
           - @facade.commentaires.object.sort.each do |commentaire|
-            = render partial: commentaire
+            = render partial: 'dossiers/commentaire', locals: {commentaire: commentaire}
       .row
         .col-lg-12.col-md-12.col-sm-12.col-xs-12
           %div.split-hr

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

@@ -0,0 +1 @@
+= render partial: 'layouts/left_panels/left_panel_users_recapitulatifcontroller_show'

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

@@ -12,7 +12,6 @@
 %div#menu-block
 
 %div#infos-block
-  - if user_signed_in? && current_user.email == @facade.dossier.user.email
   %div.split-hr-left
   %div.dossier-state= @facade.dossier.display_state
   %div.split-hr-left

app/views/users/commentaires/_commentaire.html.haml

@@ -1,14 +0,0 @@
-%div.commentaire
-  .row
-    %div.col-lg-12.col-md-12.col-sm-12.col-xs-12.comment-header
-      = commentaire.header
-  .row
-    %div.col-lg-12.col-md-12.col-sm-12.col-xs-12.content
-      = commentaire.body.html_safe
-  - if file = commentaire.piece_justificative
-    .row
-      %div.col-lg-12.col-md-12.col-sm-12.col-xs-12.file
-        = link_to file.content_url, class: 'link', target: '_blank' do
-          %span.fa.fa-file
-          %div
-            = file.original_filename

spec/controllers/users/dossiers/invites_controller_spec.rb

@@ -21,7 +21,7 @@ describe Users::Dossiers::InvitesController, type: :controller do
           get :show, params: {id: invite.id}
         end
 
-        # it { expect(response.status).to eq 200 }
+        it { expect(response.status).to eq 200 }
       end
     end
 

spec/factories/invite.rb

@@ -6,6 +6,10 @@ FactoryGirl.define do
       if invite.dossier.nil?
         invite.dossier = create(:dossier)
       end
+
+      unless invite.user.nil?
+        invite.email = invite.user.email
+      end
     end
 
     trait :with_user do