app/views/comments/_new_with_image.rhtml app/views/comments/new_with_image.rjs db/migrate/20090228023843_image_comments_woot.rb @@ -4,24 +4,29 @@ class CommentsController < ApplicationController def new @comment = Comment.new - - respond_to do |format| - format.html # new.rhtml - format.js # new.rjs - end + if params[:with_image] + render :action => "new_with_image" + end end - + def create @comment = Comment.new(params[:comment]) @comment.user = User.find(session[:user_id]) @comment.post = @post - + @comment.save @post.commented_on = Time.now @post.save + if params[:image] + image = params[:image]["file_data"] + if image != "" + @image = Image.create(:file_data => image, :owner_id => @comment.id, :owner_type => 'Comment', :filename => image.original_filename) + end + end + respond_to do |format| - if @comment.duplicate? or @post.comments << @comment - format.html { redirect_to "/" } + if @comment.duplicate? or true + format.html { redirect_to "/posts/" + @post.id.to_s } format.js # create.rjs else format.html { redirect_to new_comment_url(@post.blog, @post) } app/controllers/comments_controller.rb @@ -88,7 +88,7 @@ class PostsController < ApplicationController counter = 0 for image in params[:images]["file_data"] if image != "" - @image = Image.create(:file_data => image, :post_id => @post.id, :filename => image.original_filename, + @image = Image.create(:file_data => image, :owner_id => @post.id, :owner_type => 'Post', :filename => image.original_filename, :body => params[:images]["body"][counter] ) counter = counter + 1 end @@ -116,7 +116,7 @@ class PostsController < ApplicationController counter = 0 for image in params[:images]["file_data"] if image != "" - @image = Image.create(:file_data => image, :post_id => @post.id, :filename => image.original_filename, + @image = Image.create(:file_data => image, :owner_id => @post.id, :owner_type => 'Post', :filename => image.original_filename, :body => params[:images]["body"][counter] ) counter = counter + 1 end app/controllers/posts_controller.rb @@ -2,6 +2,7 @@ class Comment < ActiveRecord::Base belongs_to :post belongs_to :user +has_one :image, :as => :owner, :dependent => :destroy validates_presence_of :body, :post, :user app/models/comment.rb @@ -1,7 +1,7 @@ class Image < ActiveRecord::Base - belongs_to :post - acts_as_list :scope => :post + belongs_to :owner, :polymorphic => true + acts_as_list :scope => :owner DIRECTORY = 'public/uploaded_images' THUMB_MAX_SIZE = 268 app/models/image.rb @@ -1,7 +1,7 @@ class Post < ActiveRecord::Base belongs_to :user has_many :comments, :order => "created_on", :dependent => :destroy - has_many :images, :order => "position", :dependent => :destroy + has_many :images, :as => :owner, :order => "position", :dependent => :destroy def authorized?(userid) if (self.user_id == userid) && editable? app/models/post.rb @@ -2,15 +2,25 @@ <p> <span class="userstamp"><%= link_to comment.user.login, "/home/" + comment.user.login %>: </span> <%= auto_link sanitize comment.body %> - </p> - <% if logged_in? and comment.authorized?(session[:user_id]) %> - <span class="edit_link" style="float: right"> - <%= link_to_remote "remove", + <span class="edit_link" style=""> + <%= link_to_remote "Remove Comment", :url => post_comment_url( comment.post, comment), :method => :delete, :confirm => 'Are you sure?' %> </span> <% end %> + + + </p> + + <% if comment.image %> +<% image = comment.image %> + <div class="thumb" id="image_<%= image.id %>"> + <%= link_to image_tag(image.url("thumb")), image.url,{ :title => image.filename, :onclick => "return hs.expand(this, { slideshowGroup: #{post.id.to_s} });", :class => "highslide" } %> +</div> + <br clear="both"/> + <% end %> + </div> app/views/comments/_comment.rhtml @@ -1,14 +1,18 @@ -<% remote_form_for(:comment, :url => post_comments_path) do |form| %> +<% remote_form_for(:comment, :url => post_comments_path, :html => { :multipart => true }) do |form| %> <fieldset><ol> -<li><%= form.text_area :body, :rows => 10, :cols => 50, :id => "new_comment_body_" + @post.id.to_s %></li> +<li><%= form.text_area :body, :rows => 10, :cols => 50, :id => "new_comment_body_" + post.id.to_s %></li> +<li> + + +</li> </ol> </fieldset> <fieldset class="comment_submit"> <%= submit_tag "Create" %> <%= button_to_function "Cancel" do |page| - page.hide "new_comment_form_for_post_#{@post.id}" - page.show "add_comment_link_for_post_#{@post.id}" + page.hide "new_comment_form_for_post_#{post.id}" + page.show "add_comment_link_for_post_#{post.id}" end %> </fieldset> app/views/comments/_new.rhtml @@ -1,6 +1,7 @@ page.visual_effect :blind_up, "new_comment_form_for_post_#{@post.id}" page.replace_html "comments_for_post_#{@post.id}", :partial => "comments/comment", - :collection => @post.comments + :collection => @post.comments, + :locals => { :post => @post } page.show "add_comment_link_for_post_#{@post.id}" #page.visual_effect :highlight, "comment_#{@comment.id}", :duration => 2 app/views/comments/create.rjs @@ -1,7 +1,7 @@ page.hide "add_comment_link_for_post_#{@post.id}" form_div = "new_comment_form_for_post_#{@post.id}" #page.hide form_div -page.replace_html form_div, :partial => "new" +page.replace_html form_div, :partial => "new", :locals => { :post => @post } page << "$('new_comment_body_#{@post.id}').focus()" page.show form_div app/views/comments/new.rjs @@ -39,17 +39,15 @@ <% end %> <div class="comments" id="comments_for_post_<%= post.id %>"> - <%= render :partial => "comments/comment", :collection => post.comments %> + <%= render :partial => "comments/comment", :collection => post.comments, :locals => { :post => post } %> </div> <% if logged_in? %> <div id="comment_link_wrapper" style="min-height: 20px;"> <div id="add_comment_link_for_post_<%= post.id %>"> - <%= link_to_remote "Comment", - { :url => new_post_comment_path( post), - :method => :get }, - :href => new_post_comment_path( post) %> + <a href="/posts/<%= post.id %>/comments/new" onclick="new Ajax.Request('/posts/<%= post.id %>/comments/new', {asynchronous:true, evalScripts:true, method:'get'}); return false;">Comment</a> - + <a href="/posts/<%= post.id %>/comments/new" onclick="new Ajax.Request('/posts/<%= post.id %>/comments/new?with_image=true', {asynchronous:true, evalScripts:true, method:'get'}); return false;">Comment with Image</a> </div> </div> <div id="new_comment_form_for_post_<%= post.id %>"> app/views/posts/_post.rhtml @@ -1,7 +1,7 @@ ActionController::Routing::Routes.draw do |map| # The priority is based upon order of creation: first created -> highest priority. map.resources :posts do |post| - post.resources :comments + post.resources :comments end # Sample of regular route: # map.connect 'products/:id', :controller => 'catalog', :action => 'view' config/routes.rb @@ -1,5 +1,5 @@ # This file is auto-generated from the current state of the database. Instead of editing this file, -# please use the migrations feature of ActiveRecord to incrementally modify your database, and +# please use the migrations feature of Active Record to incrementally modify your database, and # then regenerate this schema definition. # # Note that this schema.rb definition is the authoritative source for your database schema. If you need @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 9) do +ActiveRecord::Schema.define(:version => 20090228023843) do create_table "comments", :force => true do |t| t.integer "user_id" @@ -20,12 +20,13 @@ ActiveRecord::Schema.define(:version => 9) do end create_table "images", :force => true do |t| - t.integer "post_id" + t.integer "owner_id" t.integer "position" t.string "filename" t.text "body" t.datetime "created_on" t.integer "oldid" + t.string "owner_type" end create_table "messages", :force => true do |t| db/schema.rb 7d86f87d8cf4ca9af6aa10eeae52954a374d55e2 rawdod rawdod@blackbox.(none) http://github.com/oneman/rawdod/commit/dead01ea947f8b648abb91f19ac298246feb6ba2 dead01ea947f8b648abb91f19ac298246feb6ba2 2009-02-27T22:18:42-08:00 2009-02-27T22:18:42-08:00 image comments 848d4da18f9b5b36472adb80d7ba2d916345308a rawdod rawdod@blackbox.(none)