Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
Jonne Haß 2012-01-14 21:26:54 +01:00
commit 7e76c55f56
3 changed files with 7 additions and 1 deletions

View file

@ -57,6 +57,10 @@ class CommentsController < ApplicationController
end
end
def new
render :layout => false
end
def index
if user_signed_in?
@post = current_user.find_visible_shareable_by_id(Post, params[:post_id])
@ -68,6 +72,7 @@ class CommentsController < ApplicationController
@comments = @post.comments.includes(:author => :profile).order('created_at ASC')
respond_with do |format|
format.json { render :json => @post.comments.as_api_response(:backbone), :status => 200 }
format.mobile{render :layout => false}
end
else
raise ActiveRecord::RecordNotFound.new

View file

@ -1 +1 @@
= new_comment_form(params[:post_id], current_user)
= render :partial => 'new_comment', :locals =>{:post_id => params[:post_id]}

View file

@ -248,6 +248,7 @@ body {
.comments {
overflow: auto;
position: relative;
text-align: left;
* {
max-width: 100%; }
min-height: 34px;