Merge pull request #704 from differentreality/vote_order_events_index

Fix ordering for event.average_voting in events#index
This commit is contained in:
Henne Vogelsang 2015-08-24 11:06:51 +02:00
commit c2af760baf
2 changed files with 2 additions and 2 deletions

View file

@ -77,7 +77,7 @@ class Event < ActiveRecord::Base
@total_rating = @total_rating + vote.rating
end
@total = votes.size
number_with_precision(@total_rating / @total.to_f, precision: 2, strip_insignificant_zeros: true)
@total_rating > 0 ? number_with_precision(@total_rating / @total.to_f, precision: 2, strip_insignificant_zeros: true) : 0
end
def submitter

View file

@ -42,7 +42,7 @@
=link_to event.title, admin_conference_event_path(@conference.short_title, event)
- if @conference.call_for_paper && @conference.call_for_paper.rating && @conference.call_for_paper.rating > 0
%td.col-md-1
%td.col-md-1{'data-order' => "#{event.average_rating}"}
- if event.average_rating.to_f > 0
#{event.average_rating}/#{@conference.call_for_paper.rating}
%br