app/models/course.rb in mumuki-domain-9.8.1 vs app/models/course.rb in mumuki-domain-9.9.0

- old
+ new

@@ -12,11 +12,11 @@ alias_attribute :name, :code resource_fields :slug, :shifts, :code, :days, :period, :description, :period_start, :period_end def current_invitation - invitations.where('expiration_date > ?', Time.now).first + invitations.where('expiration_date > ?', Time.current).first end def import_from_resource_h!(resource_h) update! self.class.slice_resource_h(resource_h) end @@ -47,10 +47,10 @@ return if period_start || period_end period =~ /^(\d{4})?/ year = $1.to_i - return nil unless year.between? 2014, (DateTime.now.year + 1) + return nil unless year.between? 2014, (Time.current.year + 1) self.period_start = DateTime.new(year).beginning_of_year self.period_end = DateTime.new(year).end_of_year end