effective_resources 2.25.10 → 2.25.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e25889bc1a891db68c75ce05df4bf02110c9a03cd03d7a121b8cde7487f2d14
-  data.tar.gz: 475f27329c8c866aa64b903fcbc23b92d5a39cdc8cd2dac71db473c194ef7dd0
+  metadata.gz: 7189c9b0628e5f84b362ccfc62a80e26bf349fb0477dcdaef239f1eabbd3b3f4
+  data.tar.gz: 8a4a392131be33cd557d9d752698125b735610685bbb10c9035102d8c7cd624a
 SHA512:
-  metadata.gz: d206a7a34f2f7bb9850d77328085606719ac5c8f2f2f4cddbeff3c0d124957dc9f5d1efdf7dddc841d7795f8b63ae6b164f037e29f60c03159aea922a7cc2252
-  data.tar.gz: a87a21a1eb27e79e550ec29b31a54fb889b0bf21c318b928dd10fdaa164a039b639fe3180e36fef86b98ed864870c2cd35066ff218820c38fb7d94cf14781d17
+  metadata.gz: 58b7e2293d65db01e5683cc9505e0bca06d97be8cf32c9d48246882a747ff35d4c3c4b920150264e5ee98ea8353e4c5710d6dc6607505b372be005d374fcd8ed
+  data.tar.gz: 1f1ce662f557191eb973733ae430ba5a5563bc740d4bb8b8041b25bdfeceea559ee05b37d256b89f0828f9ac79d59dfd232201eb8979c08bf2d324a650513466

data/app/controllers/concerns/effective/flash_messages.rb

@@ -56,7 +56,7 @@ module Effective
 
       messages << e.message if messages.blank? && e && e.respond_to?(:message)
 
-      messages.to_sentence.presence
+      messages.uniq.to_sentence.presence
     end
 
     def action_verb(action)

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 mb-2')
     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/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.10'.freeze
+  VERSION = '2.25.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.25.10
+  version: 2.25.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-29 00:00:00.000000000 Z
+date: 2024-08-20 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