nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conversations should return JSON #2833

Browse source
This commit is contained in:
Diaspora Europe 2012-02-24 09:39:40 +01:00
parent 2e3d70f5ae
commit 89179ecbd3
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/conversations_controller.rb
View file

@ -19,6 +19,11 @@ class ConversationsController < ApplicationController
@conversation = Conversation.joins(:conversation_visibilities).where( @conversation = Conversation.joins(:conversation_visibilities).where(
:conversation_visibilities => {:person_id => current_user.person.id, :conversation_id => params[:conversation_id]}).first :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 end
def create def create
@ -56,6 +61,7 @@ class ConversationsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { redirect_to conversations_path(:conversation_id => @conversation.id) } format.html { redirect_to conversations_path(:conversation_id => @conversation.id) }
format.js format.js
format.json { render :json => @conversation, :status => 200 }
end end
else else
redirect_to conversations_path redirect_to conversations_path