From b804bdc220ae47c7f2661d19cef66c5883722341 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <mbs348@gmail.com>
Date: Sat, 26 Jun 2010 15:40:33 -0700
Subject: [PATCH] forgot to take out a debug line. i kept comments in, but
they prevent a new post to be sent from the database to the view. on refresh
everything works. also moved comments to its own partial so we can add it to
all posts
---
app/controllers/dashboard_controller.rb | 4 +---
app/views/comments/_new_comment.html.haml | 3 +--
app/views/layouts/application.html.haml | 2 +-
app/views/status_messages/_status_message.html.haml | 7 +------
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 183d0db99c..4bf1ade9de 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -9,9 +9,7 @@ class DashboardController < ApplicationController
def receive
- xml = CGI::unescape(params[:xml])
- puts xml
- store_objects_from_xml xml
+ store_objects_from_xml CGI::unescape(params[:xml])
render :nothing => true
end
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index 0480c968f8..b377602e31 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -1,7 +1,6 @@
= form_for Comment.new, :remote => true do |f|
= f.error_messages
%p
- /= f.label :message
= f.text_field :text, :value => "dislike!"
= f.hidden_field :post_id, :value => post.id
- = f.submit 'comment', :class => 'button'
\ No newline at end of file
+ = f.submit 'comment', :class => 'button'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8377906d27..ed68a43bef 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,7 +2,7 @@
%html
%head
%title
- = yield(:title) || "diaspora"
+ = "diaspora"
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
%meta{"http-equiv"=> "X-UA-Compatible", :content =>"chrome=1" }
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index 0eb914fafa..d1c6611c13 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -4,12 +4,7 @@
= post.message
%div.time
= link_to "#{time_ago_in_words(post.updated_at)} ago", status_message_path(post)
- %div.comments
- = render "comments/new_comment", :post => post
- %ul.comment_set
- - for comment in post.comments
- = render "comments/comment", :comment => comment
-
+ = render "comments/comments", :post => post
- if mine?(post)
= link_to 'Destroy', status_message_path(post), :confirm => 'Are you sure?', :method => :delete
--
GitLab