effective_resources 2.25.9 → 2.25.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5e923e218d9738cf726a638f0d850c3b2b86e4177b040bc50b0a8a1665e4ba1
-  data.tar.gz: 4d362460cea6561d38058ec8764e9e98c7e1b9a0899f49244de71a17a0e11942
+  metadata.gz: e7440ef830150c8ec4c369c08cb58cc5bb3415caab9db4faea965c3cb7e11e0c
+  data.tar.gz: bf4772a488fd33850bcc4c516ff9b46091a257d1ebbe2549a84dfc09b15f011f
 SHA512:
-  metadata.gz: 2770956df98832a7d08471d6182643f3317daf85924d9797f0ac4e1863a26222bf9d4a16730e21a15d364a1fb04d0f88f26833ff198b201e1a2bc9a36bb7b881
-  data.tar.gz: 979ca1c1afc1d8a2645072e3710b5d68436259082f16fb92e8d786953f5f027401fcb07e23afeeba97cc7b66af73d86803de412030341269298377d3224248d5
+  metadata.gz: fee2257076e00d82dbf4a09a012a8a6a8030555bcaf99686830870a75789ecea932c2d935191936c074515c0b94c0008c8a06e351559cf7696b7c04bc3bf8778
+  data.tar.gz: fb387e13667ba8ca83f0a6101e3fed16dbf2f484f03391edebec5c4786d38f1f3f73b071d72598292ed3c3e16313749606314e59155290832db74d44c604a0e9

data/app/helpers/effective_resources_helper.rb

@@ -278,7 +278,7 @@ module EffectiveResourcesHelper
     raise("expected a title for step #{step}") unless title.present?
 
     link = if edit_effective_wizard? && resource.is_a?(controller.resource_klass) && resource.can_visit_step?(step)
-      link_to('Edit', wizard_path(step), title: "Edit #{title}")
+      link_to('Edit', wizard_path(step), title: "Edit #{title}", class: 'btn btn-secondary')
     end
 
     content_tag(:div, class: 'card mb-4') do
@@ -327,4 +327,19 @@ module EffectiveResourcesHelper
     EffectiveResources.masked_email(resource)
   end
 
+  def acts_as_published_fields(form)
+    raise('expected an acts_as_published form object') unless form.object.class.try(:acts_as_published?)
+    render('effective/acts_as_published/fields', form: form)
+  end
+
+  def acts_as_slugged_fields(form, url: nil)
+    raise('expected an acts_as_slugged form object') unless form.object.class.try(:acts_as_slugged?)
+
+    current_url = if url.present?
+      'Currently accessible via ' + link_to(url.gsub(form.object.slug, '<strong>' + form.object.slug + '</strong>').html_safe, url, target: :_blank)
+    end
+
+    render('effective/acts_as_slugged/fields', form: form, current_url: current_url)
+  end
+
 end

data/app/models/concerns/acts_as_slugged.rb

@@ -26,6 +26,8 @@ module ActsAsSlugged
   end
 
   module ClassMethods
+    def acts_as_slugged?; true; end
+
     def relation
       super.tap { |relation| relation.extend(FinderMethods) }
     end

data/app/models/effective/attribute.rb

@@ -80,7 +80,7 @@ module Effective
         raise('expected an ActiveSupport::OrderedOptions') unless value.kind_of?(ActiveSupport::OrderedOptions)
         parse_ordered_options(value)
       when :date, :datetime
-        date = Time.zone.parse(value) if value.to_s.include?('T')
+        date = Time.zone.parse(value) if value.kind_of?(String) && value.include?('T')
 
         date ||= if (digits = value.to_s.scan(/(\d+)/).flatten).present?
           if digits.first.length == 4  # 2017-01-10

data/app/models/effective/resources/i18n.rb

@@ -27,7 +27,7 @@ module Effective
           return value unless value.include?(key) # missing translation
         end
 
-        "Really #{human_action_name(action)} @resource?"
+        "Are you sure you want to #{human_action_name(action).downcase}?"
       end
 
       def human_name

data/app/views/effective/acts_as_email_notification/_fields.html.haml

@@ -12,7 +12,7 @@
     .col-md-10
       = form.select :from, mailer_froms_collection(), label: 'From', value: email_from
     .col-md-2.my-4
-      %a{href: "#acts-as-email-notification-collapse-#{uid}", 'data-toggle': 'collapse', role: 'button', 'aria-expanded': expanded, 'aria-controls': "acts-as-email-notification-collapse-#{uid}"} more...
+      %a{href: "#acts-as-email-notification-collapse-#{uid}", 'data-toggle': 'collapse', role: 'button', 'aria-expanded': expanded, 'aria-controls': "acts-as-email-notification-collapse-#{uid}"} Add CC or BCC
 
   .collapse{id: "acts-as-email-notification-collapse-#{uid}", class: ('show' if expanded)}
     = form.text_field :cc, label: 'CC', value: email_cc
@@ -30,7 +30,7 @@
     .col-md-10
       = form.select :from, mailer_froms_collection(), label: 'From'
     .col-md-2.my-4
-      %a{href: "#acts-as-email-notification-collapse-#{uid}", 'data-toggle': 'collapse', role: 'button', 'aria-expanded': expanded, 'aria-controls': "acts-as-email-notification-collapse-#{uid}"} more...
+      %a{href: "#acts-as-email-notification-collapse-#{uid}", 'data-toggle': 'collapse', role: 'button', 'aria-expanded': expanded, 'aria-controls': "acts-as-email-notification-collapse-#{uid}"} Add CC or BCC
 
   .collapse{id: "acts-as-email-notification-collapse-#{uid}", class: ('show' if expanded)}
     = form.text_field :cc, label: 'CC'

data/app/views/effective/acts_as_published/_fields.html.haml

@@ -0,0 +1,9 @@
+-# acts_as_published
+= form.hide_if(:save_as_draft, true) do
+  .row
+    .col-md-6
+      = form.datetime_field :published_start_at, label: 'Published start', hint: 'Will appear on the website after this date and time. Leave blank to publish immediately.'
+    .col-md-6
+      = form.datetime_field :published_end_at, label: 'Published end', hint: 'Will not appear on the website after this date and time. Leave blank for no end date.', date_linked: false
+
+= form.check_box :save_as_draft, label: "Save as a draft. It will not appear on the website and can only be accessed by admin users."

data/app/views/effective/acts_as_slugged/_fields.html.haml

@@ -0,0 +1,3 @@
+- if form.object.persisted? || form.object.errors.include?(:slug)
+  - hint = "The slug controls the internet address for this item. Be careful, changing the slug will break links that other websites may have to the old address."
+  = form.text_field :slug, hint: [hint, current_url].compact.join("<br>")

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.25.9'.freeze
+  VERSION = '2.25.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.25.9
+  version: 2.25.11
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -259,6 +259,8 @@ files:
 - app/views/application/update.js.erb
 - app/views/effective/acts_as_email_form/_fields.html.haml
 - app/views/effective/acts_as_email_notification/_fields.html.haml
+- app/views/effective/acts_as_published/_fields.html.haml
+- app/views/effective/acts_as_slugged/_fields.html.haml
 - app/views/effective/acts_as_wizard/_wizard_step.html.haml
 - app/views/effective/resource/_actions.html.haml
 - app/views/effective/resource/_actions_dropleft.html.haml