makes spaces consistent

This commit is contained in:
rgarcia
2015-09-28 15:27:09 +02:00
parent c221ec505c
commit c362ad0054
2 changed files with 9 additions and 11 deletions

View File

@@ -5,7 +5,6 @@ class DebatesController < ApplicationController
has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index has_orders %w{hot_score confidence_score created_at most_commented random}, only: :index
load_and_authorize_resource load_and_authorize_resource
respond_to :html, :js respond_to :html, :js
def index def index
@@ -31,10 +30,6 @@ class DebatesController < ApplicationController
load_featured_tags load_featured_tags
end end
def edit
load_featured_tags
end
def create def create
@debate = Debate.new(debate_params) @debate = Debate.new(debate_params)
@debate.author = current_user @debate.author = current_user
@@ -48,6 +43,10 @@ class DebatesController < ApplicationController
end end
end end
def edit
load_featured_tags
end
def update def update
@debate.assign_attributes(debate_params) @debate.assign_attributes(debate_params)
if @debate.save_with_captcha if @debate.save_with_captcha
@@ -92,5 +91,4 @@ class DebatesController < ApplicationController
def parse_search_terms def parse_search_terms
@search_terms = params[:search] if params[:search].present? @search_terms = params[:search] if params[:search].present?
end end
end end

View File

@@ -57,6 +57,11 @@ class ProposalsController < ApplicationController
end end
end end
def vote
@proposal.register_vote(current_user, 'yes')
set_proposal_votes(@proposal)
end
def flag def flag
Flag.flag(current_user, @proposal) Flag.flag(current_user, @proposal)
respond_with @proposal, template: 'proposals/_refresh_flag_actions' respond_with @proposal, template: 'proposals/_refresh_flag_actions'
@@ -67,11 +72,6 @@ class ProposalsController < ApplicationController
respond_with @proposal, template: 'proposals/_refresh_flag_actions' respond_with @proposal, template: 'proposals/_refresh_flag_actions'
end end
def vote
@proposal.register_vote(current_user, 'yes')
set_proposal_votes(@proposal)
end
private private
def proposal_params def proposal_params