Merge pull request #2839 from diasp/2036-fix-private-messages-navigation

#2036 Fix private messages are sometimes displayed without navigation

app/controllers/conversations_controller.rb

@@ -53,7 +53,10 @@ class ConversationsController < ApplicationController
         @visibility.save
       end
 
-      respond_with @conversation
+      respond_to do |format|
+        format.html { redirect_to conversations_path(:conversation_id => @conversation.id) }
+        format.js
+      end
     else
       redirect_to conversations_path
     end

spec/controllers/conversations_controller_spec.rb

@@ -136,13 +136,19 @@ describe ConversationsController do
       }
       @conversation = Conversation.create(hash)
     end
-
+    
     it 'succeeds' do
-      get :show, :id => @conversation.id
+      get :show, :id => @conversation.id, :format => :js
       response.should be_success
       assigns[:conversation].should == @conversation
     end
 
+    it 'redirects to index' do
+      get :show, :id => @conversation.id
+      response.should redirect_to(conversations_path(:conversation_id => @conversation.id))
+      assigns[:conversation].should == @conversation
+    end
+    
     it 'does not let you access conversations where you are not a recipient' do
       sign_in :user, eve