diff options
| author | Zog | 2018-04-13 15:39:27 +0200 | 
|---|---|---|
| committer | Zog | 2018-04-13 15:39:27 +0200 | 
| commit | cffda5d84f8793b513b1bdb53ddd93d49745c0cd (patch) | |
| tree | bdecdacb87acfeb72f975ea19eb1b2cf748456bc | |
| parent | 94090e82bfb5f875f70aa1e8bffb8a51724eb760 (diff) | |
| download | chouette-core-6450-fix-timetable-form.tar.bz2 | |
Refs #6450; Don't consider the empty string as a valid color for Timetables6450-fix-timetable-form
Same for PurchazeWindows
| -rw-r--r-- | app/models/chouette/purchase_window.rb | 7 | ||||
| -rw-r--r-- | app/models/chouette/time_table.rb | 5 | 
2 files changed, 9 insertions, 3 deletions
| diff --git a/app/models/chouette/purchase_window.rb b/app/models/chouette/purchase_window.rb index e10b106ec..d22674637 100644 --- a/app/models/chouette/purchase_window.rb +++ b/app/models/chouette/purchase_window.rb @@ -46,8 +46,9 @@ module Chouette        ]      end -    # def checksum_attributes -    # end - +    def color +      _color = read_attribute(:color) +      _color.present? ? _color : nil +    end    end  end diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb index b59c95665..ccfdff254 100644 --- a/app/models/chouette/time_table.rb +++ b/app/models/chouette/time_table.rb @@ -81,6 +81,11 @@ module Chouette        chunk.values.delete_if {|dates| dates.count < 2}      end +    def color +      _color = read_attribute(:color) +      _color.present? ? _color : nil +    end +      def convert_continuous_dates_to_periods        chunks = self.continuous_dates | 
