From c362ad00541e4ff7d5e5cf9c1eb18a9bacdf50b4 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Mon, 28 Sep 2015 15:27:09 +0200 Subject: [PATCH] makes spaces consistent --- app/controllers/debates_controller.rb | 10 ++++------ app/controllers/proposals_controller.rb | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index ded2d2aa0..82bb87fd5 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -5,7 +5,6 @@ class DebatesController < ApplicationController has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index load_and_authorize_resource - respond_to :html, :js def index @@ -31,10 +30,6 @@ class DebatesController < ApplicationController load_featured_tags end - def edit - load_featured_tags - end - def create @debate = Debate.new(debate_params) @debate.author = current_user @@ -48,6 +43,10 @@ class DebatesController < ApplicationController end end + def edit + load_featured_tags + end + def update @debate.assign_attributes(debate_params) if @debate.save_with_captcha @@ -92,5 +91,4 @@ class DebatesController < ApplicationController def parse_search_terms @search_terms = params[:search] if params[:search].present? end - end diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 55d6fab0e..c9ce897d1 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -57,6 +57,11 @@ class ProposalsController < ApplicationController end end + def vote + @proposal.register_vote(current_user, 'yes') + set_proposal_votes(@proposal) + end + def flag Flag.flag(current_user, @proposal) respond_with @proposal, template: 'proposals/_refresh_flag_actions' @@ -67,11 +72,6 @@ class ProposalsController < ApplicationController respond_with @proposal, template: 'proposals/_refresh_flag_actions' end - def vote - @proposal.register_vote(current_user, 'yes') - set_proposal_votes(@proposal) - end - private def proposal_params