Merge pull request #2176 from MushroomObserver/jdc-license-created_at

Update display of license dates
MushroomObserver · Jun 11, 2024 · 7e43aba · 7e43aba
2 parents bd4e528 + e46e657
commit 7e43aba
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/app/helpers/licenses_helper.rb b/app/helpers/licenses_helper.rb
@@ -2,12 +2,8 @@
 
 # helpers for show License view
 module LicensesHelper
-  def license_updated_at(license)
-    if license.updated_at
-      license.updated_at.strftime("%Y-%m-%d %H:%M:%S")
-    else
-      "nil"
-    end
+  def license_date(date)
+    date.strftime("%Y-%m-%d %H:%M:%S")
   end
 
   def license_table_header

diff --git a/app/views/controllers/licenses/show.html.erb b/app/views/controllers/licenses/show.html.erb
@@ -13,6 +13,6 @@
                 { target: "_blank", rel: "noopener noreferrer" }) %></b>
   </p>
   <p><%= :DEPRECATED.t %>: <b><%= @license.deprecated.to_s %></b></p>
-  <p><%= :CREATED.t %>: <b><%= license_updated_at(@license) %></b></p>
-  <p><%= :UPDATED.t %>: <b><%= license_updated_at(@license) %></b></p>
+  <p><%= :CREATED.t %>: <b><%= license_date(@license.created_at) %></b></p>
+  <p><%= :UPDATED.t %>: <b><%= license_date(@license.updated_at) %></b></p>
 </div>
diff --git a/test/fixtures/licenses.yml b/test/fixtures/licenses.yml
@@ -3,11 +3,13 @@
 # in a fixture on the opposite side of the association.
 # See http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
+DEFAULTS: &DEFAULTS
+  created_at: 2010-07-10 20:00:00
+
 ccnc25:
   display_name: Creative Commons Non-commercial v2.5
   url: https://creativecommons.org/licenses/by-nc-sa/2.5/
   deprecated: true
-  updated_at: nil
 
 ccnc30:
   display_name: Creative Commons Non-commercial v3.0

diff --git a/test/helpers/licenses_helper_test.rb b/test/helpers/licenses_helper_test.rb