aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/chouette
diff options
context:
space:
mode:
authorXinhui2017-05-31 11:26:22 +0200
committerXinhui2017-05-31 11:26:29 +0200
commitb7ed505e00a26ebcf3c1e564cd32abaafee02e38 (patch)
treec96b8c72c7a39ba77e3de18765ee5047121d7fee /app/models/chouette
parent8eb1c7fc424d0801e9322a0c0cfffb6346fe6fc4 (diff)
downloadchouette-core-b7ed505e00a26ebcf3c1e564cd32abaafee02e38.tar.bz2
Fix time_table should keep int_day_types on #actualize
Refs #3445
Diffstat (limited to 'app/models/chouette')
-rw-r--r--app/models/chouette/time_table.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 42879c6d5..85f1e8c6e 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -138,7 +138,10 @@ class Chouette::TimeTable < Chouette::TridentActiveRecord
def actualize
self.dates.clear
self.periods.clear
- self.merge! self.calendar.convert_to_time_table
+ from = self.calendar.convert_to_time_table
+ self.dates = from.dates
+ self.periods = from.periods
+ self.save
end
def month_inspect(date)