app/views/comments/create.js.rjs @@ -22,7 +22,7 @@ class CommentsController < BaseController #don't use the get_type, as we want the specific case where the user typed /User/username/comments redirect_to user_comments_path(params[:commentable_id]) and return if (params[:commentable_type] && params[:commentable_type].camelize == "User") - unless logged_in? || @commentable && @commentable.owner.profile_public? + unless logged_in? || @commentable && (@commentable.owner && @commentable.owner.profile_public?) flash.now[:error] = :this_users_profile_is_not_public_youll_need_to_create_an_account_and_log_in_to_access_it.l redirect_to :controller => 'sessions', :action => 'new' and return end @@ -91,20 +91,12 @@ class CommentsController < BaseController @comment.send_notifications flash.now[:notice] = :comment_was_successfully_created.l - format.html { - redirect_to commentable_url(@comment) - } - format.js { - render :partial => 'comments/comment.html.haml', :locals => {:comment => @comment, :highlighted => true} - } + format.html { redirect_to commentable_url(@comment) } + format.js else flash.now[:error] = :comment_save_error.l_with_args(:error => @comment.errors.full_messages.to_sentence) - format.html { - redirect_to :controller => comment_type.underscore.pluralize, :action => 'show', :id => comment_id - } - format.js{ - render :inline => flash[:error], :status => 500 - } + format.html { redirect_to :controller => comment_type.underscore.pluralize, :action => 'show', :id => comment_id } + format.js end end end app/controllers/comments_controller.rb @@ -108,6 +108,7 @@ class PostsController < BaseController @post = Post.new(params[:post]) @post.user = @user @post.tag_list = params[:tag_list] || '' + respond_to do |format| if @post.save @post.create_poll(params[:poll], params[:choices]) if params[:poll] @@ -120,8 +121,10 @@ class PostsController < BaseController redirect_to manage_user_posts_path(@user) end } + format.js else format.html { render :action => "new" } + format.js end end end app/controllers/posts_controller.rb @@ -93,7 +93,7 @@ class Comment < ActiveRecord::Base end def notify_previous_anonymous_commenters - anonymous_commenters_emails = commentable.comments.map{|c| c.author_email if ( !c.user && !c.author_email.eql?(self.author_email) && c.author_email) }.uniq.compact + anonymous_commenters_emails = commentable.comments.map{|c| c.author_email if ( !c.user_id && !c.author_email.eql?(self.author_email) && c.author_email) }.uniq.compact anonymous_commenters_emails.each do |email| UserNotifier.deliver_follow_up_comment_notice_anonymous(email, self) end app/models/comment.rb @@ -11,6 +11,8 @@ class Event < ActiveRecord::Base named_scope :upcoming, :order => 'start_time DESC' + acts_as_commentable + def time_and_date if spans_days? string = "#{start_time.strftime("%B %d")} to #{end_time.strftime("%B %d %Y")}" app/models/event.rb @@ -1,17 +1,19 @@ - if logged_in? || AppConfig.allow_anonymous_commenting - %script{"type"=>"text/javascript"} - function scrollToNewestComment(){ - loc = document.location.toString(); - if (loc.indexOf("#") != -1){ - parts = loc.split('#') - loc = parts[0] + "#newest_comment" - } else { - loc = loc + "#newest_comment"; - } - document.location.href = loc; - } + %script{:type=>"text/javascript"} + :plain + function scrollToNewestComment(){ + loc = document.location.toString(); + if (loc.indexOf("#") != -1){ + parts = loc.split('#') + loc = parts[0] + "#newest_comment" + } else { + loc = loc + "#newest_comment"; + } + document.location.href = loc; + } + .errors - - form_remote_for(:comment, :loading => "$$('div#comments div.errors')[0].innerHTML = ''; $('comment_spinner').show();", :before => "tinyMCE.activeEditor.save();", :url => comments_url(commentable.class.to_s.underscore, commentable.id ), 500 => "$$('div#comments div.errors')[0].update(request.responseText);new Effect.Highlight($$('div#comments div.errors')[0]); return false;", :success => "new Insertion.#{commentable.class.to_s.eql?('User') ? 'After': 'After' }('newest_comment', request.responseText); tinyMCE.activeEditor.setContent(\'\'); scrollToNewestComment();$('emptycomments').hide();", :complete => "$('comment_spinner').hide(); if($('dynamic_recaptcha')){Recaptcha.create('#{AppConfig.recaptcha_pub_key}', $('dynamic_recaptcha') )}", :html => {:class => "MainForm"}) do |f| + - form_remote_for(:comment, :loading => "$$('div#comments div.errors')[0].innerHTML = ''; $('comment_spinner').show();", :before => "tinyMCE.activeEditor.save();", :url => comments_url(commentable.class.to_s.underscore, commentable.id ), :html => {:id => 'new_comment_form', :class => "MainForm"}) do |f| %label %em="(2000 character limit)".l :comment_character_limit = text_area :comment, :comment, {:size => "86x5", :class => "rich_text_editor"} app/views/comments/_comment_form.html.haml @@ -1,3 +1,5 @@ +=render :partial => "facebooker/feed_dialog", :locals => {:type => 'post'} + .yui-b .box#category_tips -if @post.contest app/views/posts/new.html.haml @@ -6,4 +6,4 @@ %li= :see_you_back_here_in_a_short_while.l %h3= :no_activation_email.l - = link_to(:resend_activation_email.l, "/resend_activation?email=#{@user.email}", :method => 'post') \ No newline at end of file + = link_to(:resend_my_activation_e_mail.l, "/resend_activation?email=#{@user.email}", :method => 'post') \ No newline at end of file app/views/users/signup_completed.html.haml @@ -291,7 +291,7 @@ #en: location: Location #en: locked: Locked #en: locked2: (locked) -#en: look_for_a_message_from: "Look for a message from:" +#en: look_for_a_message_from: "Look for a message from: {{from}}" #en: looking_for_most_x: Looking for {{link}} #en: make_moderator: Make moderator #en: make_my_profile_public: Make my profile public @@ -604,7 +604,7 @@ #en: watch_ing: ing #en: watch_topic: Watch topic #en: watching_topic: Watching topic -#en: we_just_sent_an_e_mail_to: "We just sent an e-mail to:" +#en: we_just_sent_an_e_mail_to: "We just sent an e-mail to: {{email}}" #en: we_need_you: We need you #en: welcome_message: Welcome! {{login_link}} or {{signup_link}} #en: what_are_tags: 'What are "Tags"?' lang/base.yml @@ -68,7 +68,7 @@ en: #en: advertise_on: Advertise on advertise_on: Advertise on #en: after_signing_up_youll_receive_an_e_mail_confirmation_message: After signing up, you'll receive an e-mail confirmation message. - after_signing_up_youll_receive_an_e_mail_confirmation_message: After signing up, you'll receive an e-mail confirmation message. + after_signing_up_youll_receive_an_e_mail_confirmation_message: "After signing up, you'll receive an e-mail confirmation message." #en: all_clippings_tagged: All clippings tagged {{tag_name}} all_clippings_tagged: All clippings tagged {{tag_name}} #en: all_comments: All comments @@ -260,7 +260,7 @@ en: #en: dashboard: Dashboard dashboard: Dashboard #en: dashboard_friends: Once you start adding friends, you'll be able to track their activity on {{site}} here - dashboard_friends: Once you start adding friends, you'll be able to track their activity on {{site}} here + dashboard_friends: "Once you start adding friends, you'll be able to track their activity on {{site}} here" #en: date: Date date_title: Date #en: date_created: Date Created @@ -534,7 +534,7 @@ en: #en: invited_friends: invited some friends to join! invited_friends: invited some friends to join! #en: is_great_check_it_out_youll_love_it: is great, check it out you'll love it! - is_great_check_it_out_youll_love_it: is great, check it out you'll love it! + is_great_check_it_out_youll_love_it: "is great, check it out you'll love it!" #en: items: Items items: Items #en: joined: joined @@ -593,8 +593,8 @@ en: locked: Locked #en: locked2: (locked) locked2: (locked) - #en: look_for_a_message_from: "Look for a message from:" - look_for_a_message_from: "Look for a message from:" + #en: look_for_a_message_from: "Look for a message from: {{from}}" + look_for_a_message_from: "Look for a message from: {{from}}" #en: looking_for_most_x: Looking for {{link}} looking_for_most_x: Looking for {{link}} #en: make_moderator: Make moderator @@ -713,8 +713,10 @@ en: next: next #en: next_page: Next page next_page: Next page + #en: no_activation_email: No activation e-mail? + no_activation_email: No activation e-mail? #en: no_comments_found: Sorry, we couldn't find any comments for that {{type}} - no_comments_found: Sorry, we couldn't find any comments for that {{type}} + no_comments_found: "Sorry, we couldn't find any comments for that {{type}}" #en: no_images_uploaded_yet: No images uploaded yet. no_images_uploaded_yet: No images uploaded yet. #en: no_messages: no messages @@ -1225,8 +1227,8 @@ en: watch_topic: Watch topic #en: watching_topic: Watching topic watching_topic: Watching topic - #en: we_just_sent_an_e_mail_to: "We just sent an e-mail to:" - we_just_sent_an_e_mail_to: "We just sent an e-mail to:" + #en: we_just_sent_an_e_mail_to: "We just sent an e-mail to: {{email}}" + we_just_sent_an_e_mail_to: "We just sent an e-mail to: {{email}}" #en: we_need_you: We need you we_need_you: We need you #en: welcome_message: Welcome! {{login_link}} or {{signup_link}} lang/ui/en-US.yml @@ -25,7 +25,7 @@ module CommunityEngine def guess_current_ce_version # DUMB: checks your db/migrate and parses out the last CE migration to find out which version you're at - last_version = Dir["#{RAILS_ROOT}/db/migrate/[0-9]*_community_engine_*.rb"].sort.last + last_version = Dir["#{RAILS_ROOT}/db/migrate/[0-9]*_community_engine_to*.rb"].sort.last if last_version last_version[/.*_community_engine_to_version_(\d+)/, 1].to_i else lib/community_engine.rb abe8c7d89d101673a63faf6d4a35945f9885bf5b bborn bruno.bornsztein@gmail.com http://github.com/bborn/communityengine/commit/e1739b9e8a85abed446e97ff249f83f62a612744 e1739b9e8a85abed446e97ff249f83f62a612744 2009-03-02T14:34:44-08:00 2009-03-02T14:34:44-08:00 updated some of the commenting ajax to use rjs 23d9b691176b93c18975023e6c545bad455d2533 bborn bruno.bornsztein@gmail.com