Merge pull request #15 from gutschi/rails-7

Fix Time formatting deprecation warnings in Rails 7.0.0 upwards.
holli · Apr 25, 2024 · e500e3e · e500e3e
2 parents e801758 + 299445d
commit e500e3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/action_smser/delivery_report.rb b/app/models/action_smser/delivery_report.rb
@@ -27,7 +27,7 @@ def self.create_from_sms(sms, to, sms_id)
       def status=(stat, skip_log = false)
         self[:status] = stat
         self.status_updated_at = Time.now
-        add_log("#{Time.now.to_s(:db)}: #{stat}") unless skip_log
+        add_log("#{Time.now.to_fs(:db)}: #{stat}") unless skip_log
       end
 
       def add_log(str)

diff --git a/app/views/action_smser/delivery_reports/index.html.erb b/app/views/action_smser/delivery_reports/index.html.erb
@@ -39,7 +39,7 @@
 
 
 <h1>Delivery Reports Summary for
-  (<span style="font-size: smaller"><%= "#{time_span.first.to_s(:db)} => #{time_span.last.to_s(:db)}" %></span>)
+  (<span style="font-size: smaller"><%= "#{time_span.first.to_fs(:db)} => #{time_span.last.to_fs(:db)}" %></span>)
   <%= "for #{params[:gateway]}" unless params[:gateway].blank? %>
 </h1>