From afdb0980b078dbe660edab38af877b91f065951e Mon Sep 17 00:00:00 2001 From: rgarcia Date: Sat, 18 Jul 2015 21:27:56 +0200 Subject: [PATCH] removes empty % sign when there are no votes --- app/helpers/application_helper.rb | 4 ++++ app/models/debate.rb | 6 ------ app/views/debates/show.html.erb | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e3f79f023..32cb386c8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -4,4 +4,8 @@ module ApplicationHelper debate.tag_list.map { |tag| link_to sanitize(tag), debates_path(tag: tag) }.join(', ').html_safe end + def percentage(vote, debate) + return if debate.total_votes == 0 + debate.send(vote).percent_of(debate.total_votes).to_s + "%" + end end diff --git a/app/models/debate.rb b/app/models/debate.rb index 0bebf6b8e..01dfa07c3 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -12,12 +12,6 @@ class Debate < ActiveRecord::Base validates :terms_of_service, acceptance: { allow_nil: false }, on: :create - #vote can be 'likes' or 'dislikes' - def percentage(vote) - return if total_votes == 0 - send(vote).percent_of(total_votes) - end - def likes get_likes.size end diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb index 5efdd833a..84226d926 100644 --- a/app/views/debates/show.html.erb +++ b/app/views/debates/show.html.erb @@ -10,12 +10,12 @@
<%= link_to "up", debate_votes_path(@debate, value: 'yes'), method: "post" %> - <%= @debate.percentage('likes') %>% + <%= percentage('likes', @debate) %>
<%= link_to "down", debate_votes_path(@debate, value: 'no'), method: "post" %> - <%= @debate.percentage('dislikes') %>% + <%= percentage('dislikes', @debate) %>
Votos <%= @debate.total_votes %>