Merge pull request #1652 from basecamp/flavorjones/3062-draft-card-creation-time

Change "ADDED" to "DRAFTED" when rendering draft cards

app/helpers/cards_helper.rb

@@ -33,6 +33,10 @@ module CardsHelper
     title.join(" ")
   end
 
+  def card_drafted_or_added(card)
+    card.drafted? ? "Drafted" : "Added"
+  end
+
   def card_social_tags(card)
     tag.meta(property: "og:title", content: "#{card.title} | #{card.board.name}") +
     tag.meta(property: "og:description", content: format_excerpt(@card&.description, length: 200)) +

app/models/card/statuses.rb

@@ -20,7 +20,7 @@ module Card::Statuses
   private
     def update_created_at_on_publication
       if will_save_change_to_status? && status_in_database.inquiry.drafted?
-        self.created_at = Time.now
+        self.created_at = Time.current
       end
     end
 end

app/views/cards/display/common/_meta.html.erb

@@ -4,7 +4,7 @@
   </div>
 
   <span class="card__meta-text card__meta-text--added">
-    Added <%= local_datetime_tag(card.created_at, style: :daysago) %>
+    <%= card_drafted_or_added(card) %> <%= local_datetime_tag(card.created_at, style: :daysago) %>
   </span>
 
   <span class="card__meta-text card__meta-text--author">

app/views/cards/display/preview/_meta.html.erb

@@ -4,8 +4,7 @@
   </div>
 
   <span class="card__meta-text card__meta-text--added">
-    <%= local_datetime_tag(card.created_at, style: :daysago) %>
-    <% "(Draft)" if card.drafted? %>
+    <%= card_drafted_or_added(card) %> <%= local_datetime_tag(card.created_at, style: :daysago) %>
   </span>
 
   <span class="card__meta-text card__meta-text--author">

app/views/cards/display/public_preview/_meta.html.erb

@@ -4,7 +4,7 @@
   </div>
 
   <span class="card__meta-text card__meta-text--added">
-    Added <%= local_datetime_tag(card.created_at, style: :daysago) %>
+    <%= card_drafted_or_added(card) %> <%= local_datetime_tag(card.created_at, style: :daysago) %>
   </span>
 
   <span class="card__meta-text card__meta-text--author">

test/models/card/statuses_test.rb

@@ -65,6 +65,6 @@ class Card::StatusesTest < ActiveSupport::TestCase
 
     card.publish
 
-    assert_equal Time.now, card.created_at
+    assert_equal Time.current, card.created_at
   end
 end