From 89179ecbd3158efbb44ea7f871ae7ad057021059 Mon Sep 17 00:00:00 2001
From: Diaspora Europe <info@diasp.eu>
Date: Fri, 24 Feb 2012 09:39:40 +0100
Subject: [PATCH] conversations should return JSON #2833

---
 app/controllers/conversations_controller.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index ecfa5076e..adcfc5bf7 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -19,6 +19,11 @@ class ConversationsController < ApplicationController
 
     @conversation = Conversation.joins(:conversation_visibilities).where(
       :conversation_visibilities => {:person_id => current_user.person.id, :conversation_id => params[:conversation_id]}).first
+
+    respond_with do |format|
+      format.html
+      format.json { render :json => @conversations, :status => 200 }
+    end
   end
 
   def create
@@ -56,6 +61,7 @@ class ConversationsController < ApplicationController
       respond_to do |format|
         format.html { redirect_to conversations_path(:conversation_id => @conversation.id) }
         format.js
+        format.json { render :json => @conversation, :status => 200 }
       end
     else
       redirect_to conversations_path