aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/chouette/time_table.rb
diff options
context:
space:
mode:
authorXinhui2017-05-26 11:19:39 +0200
committerRobert2017-05-29 08:49:52 +0200
commit4e7d8a4f986aa7092052979155cb623cbd651036 (patch)
tree00549cbf8e48203b071d3b43a68008591079c4b2 /app/models/chouette/time_table.rb
parentb80b15c7cfaa417c5ae26610c2c5ddb563259530 (diff)
downloadchouette-core-4e7d8a4f986aa7092052979155cb623cbd651036.tar.bz2
Fix update calendar association from state
Refs #2913
Diffstat (limited to 'app/models/chouette/time_table.rb')
-rw-r--r--app/models/chouette/time_table.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index eacc5c827..42879c6d5 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -64,7 +64,8 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
def state_update state
update_attributes(self.class.state_permited_attributes(state))
- self.tag_list = state['tags'].collect{|t| t['name']}.join(', ')
+ self.tag_list = state['tags'].collect{|t| t['name']}.join(', ')
+ self.calendar_id = nil unless state['calendar']
days = state['day_types'].split(',')
Date::DAYNAMES.map(&:underscore).each do |name|