aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2014-11-21 08:50:59 +0100
committerMichel Etienne2014-11-21 08:50:59 +0100
commit705bbe7e92fa7d83c5cdf11e5486ab40d868583b (patch)
tree6e08b6ff77578599524165d4f6d4ec55e4ff328e
parente93186fe5d2344dbb03064fd414256b08f2240fc (diff)
downloadchouette-core-705bbe7e92fa7d83c5cdf11e5486ab40d868583b.tar.bz2
invalid message when no timetable combination operation is selected, Mantis 30106
-rw-r--r--app/models/time_table_combination.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/time_table_combination.rb b/app/models/time_table_combination.rb
index 1fa497d73..783ef53ef 100644
--- a/app/models/time_table_combination.rb
+++ b/app/models/time_table_combination.rb
@@ -6,7 +6,7 @@ class TimeTableCombination
attr_accessor :source_id, :combined_id, :operation
validates_presence_of :source_id, :combined_id, :operation
- validates_inclusion_of :operation, :in => %w( union intersection disjunction)
+ validates_inclusion_of :operation, :in => %w( union intersection disjunction), :allow_nil => true
def clean
self.source_id = nil