gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #893 from nishanthvijayan/fix-tooltip-track

Browse source 
Proposal submitter should be asked to add track only if conf has track
This commit is contained in:
Henne Vogelsang 2016-03-30 17:30:36 +02:00
commit 483f1ccd85
4 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/event.rb
View file

@ -190,7 +190,7 @@ class Event < ActiveRecord::Base
commercials: self.commercials.any?,
biography: !self.submitter.biography.blank?,
subtitle: !self.subtitle.blank?,
track: !self.track.blank?,
track: (!self.track.blank? unless self.program.tracks.empty?),
difficulty_level: !self.difficulty_level.blank?,
title: true,
abstract: true
@ -204,7 +204,7 @@ class Event < ActiveRecord::Base
# * +String+ -> Progress in Percent
def calculate_progress
result = self.progress_status
(100 * result.values.count(true) / result.values.count).to_s
(100 * result.values.count(true) / result.values.compact.count).to_s
end
private