From 4891d3e99ce80fae6c97a3f5859a5fca1d714404 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Fri, 12 Jul 2013 16:59:43 -0300 Subject: [PATCH] [comments-refactor-review] Removing obsolete FIXME's --- app/controllers/public/comment_controller.rb | 3 +-- app/helpers/application_helper.rb | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/controllers/public/comment_controller.rb b/app/controllers/public/comment_controller.rb index 053a408..d164b22 100644 --- a/app/controllers/public/comment_controller.rb +++ b/app/controllers/public/comment_controller.rb @@ -48,7 +48,7 @@ class CommentController < ApplicationController if !@comment.valid? || (not pass_without_comment_captcha? and not verify_recaptcha(:model => @comment, :message => _('Please type the words correctly'))) respond_to do |format| format.js do - render :json => { + render :json => { :render_target => 'form', :html => render_to_string(:partial => 'comment_form', :object => @comment, :locals => {:comment => @comment, :display_link => true, :show_form => true}) } @@ -150,7 +150,6 @@ class CommentController < ApplicationController end end - #FIXME make this test def check_actions comment = profile.comments_received.find(params[:id]) ids = @plugins.dispatch(:check_comment_actions, comment).collect do |action| diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5465217..198c9f5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1387,14 +1387,12 @@ module ApplicationHelper end def expirable_button(content, action, text, url, options = {}) - #FIXME Leandro see if it's needed the options class parameter - options[:class] = "button with-text icon-#{action.to_s}" + (options[:class].nil? ? '' : " " + options[:class]) + options[:class] = ["button with-text icon-#{action.to_s}", options[:class]].compact.join(' ') expirable_content_reference content, action, text, url, options end def expirable_comment_link(content, action, text, url, options = {}) - #FIXME Leandro see if it's needed the options class parameter - options[:class] = "comment-footer comment-footer-link comment-footer-hide" + (options[:class].nil? ? '' : " " + options[:class]) + options[:class] = ["comment-footer comment-footer-link comment-footer-hide", options[:class]].compact.join(' ') expirable_content_reference content, action, text, url, options end -- libgit2 0.21.2