diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-05 23:10:07 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-05 23:10:07 +0100 |
| commit | 3862734b5e0833ed108300102c68159e40ffd93a (patch) | |
| tree | 4491044dbf48aea515303382e7664cf9be2cb182 /app/models/conference.rb | |
| parent | 380a4cdfe5cfa573fb916ca7c2145a6062ef8198 (diff) | |
| parent | 57196d838691aeba38ad7e088e83c0881a213861 (diff) | |
Merge branch 'replace_constants' into develop
Diffstat (limited to 'app/models/conference.rb')
| -rw-r--r-- | app/models/conference.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/conference.rb b/app/models/conference.rb index 8be9f21..16b646c 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -15,7 +15,7 @@ class Conference < ActiveRecord::Base validates_presence_of :max_members validates_numericality_of :max_members, :only_integer => true, :greater_than => 0, - :less_than => (MAXIMUM_NUMBER_OF_PEOPLE_IN_A_CONFERENCE + 1), + :less_than => ((GsParameter.get('MAXIMUM_NUMBER_OF_PEOPLE_IN_A_CONFERENCE').nil? ? 10 : GsParameter.get('MAXIMUM_NUMBER_OF_PEOPLE_IN_A_CONFERENCE')) + 1), :allow_nil => false, :allow_blank => false @@ -25,7 +25,7 @@ class Conference < ActiveRecord::Base :greater_than => 0, :allow_nil => true, :allow_blank => true - validates_length_of :pin, :minimum => MINIMUM_PIN_LENGTH, + validates_length_of :pin, :minimum => (GsParameter.get('MINIMUM_PIN_LENGTH').nil? ? 4 : GsParameter.get('MINIMUM_PIN_LENGTH')), :allow_nil => true, :allow_blank => true |