effective_events 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8cc6c3e09002ef40269417ef9caf29ef1acbb9baa60210ffac26b794dd8d1da
-  data.tar.gz: 5570bb360e23a50b107142d6d9f55da9918c934c64d9561c88bb063e4ad66927
+  metadata.gz: 691de43519f18e7e0eb3a3e1455dbd889011acc687656d1a62ee7a714e736ae9
+  data.tar.gz: ff075cc0d7476dca2955b05e714256019e67d17dbf79a052f7577f3feb0fbac8
 SHA512:
-  metadata.gz: 717aca54570d30bdeb9b01366d3a870c719b4c5dea89e506d5814facab6f0340b4174dc278694871d0a5941a89d2d7f96cb86cd2001936dbce37b08b3d74a459
-  data.tar.gz: 6cb9a6114bacd68232470003033e513282587750bc2a43d1eade895b8b2c75623dcdc808afc0bea15160eedc056b2a501cd9e4aaeeb4f61043c50e7f1e485751
+  metadata.gz: 777341e1bbbacdb48f3fc0a00f118a28141760ee2cc45670a347ee475e25a3845fb0b993bccb3e5fc1886dcc1ca9e6c26f9d69dc9a73a1077c854122081ff312
+  data.tar.gz: 7b4d11151cc30e233e39668ab162d34f2e560205e0a863f2631e6dc9c5fe82c80c9fb924b98ee97f3a7d0b5e9510bbe55ae8e12e1ac50e7e88d6a884b4ebc861

data/app/controllers/effective/events_controller.rb

@@ -4,7 +4,9 @@ module Effective
 
     resource_scope -> {
       unpublished = EffectiveResources.authorized?(self, :admin, :effective_events)
-      Effective::Event.events(user: current_user, unpublished: unpublished)
+      scope = Effective::Event.deep
+      scope = scope.published unless unpublished
+      scope
     }
 
     def index
@@ -49,7 +51,8 @@ module Effective
       if EffectiveResources.authorized?(self, :admin, :effective_events)
         flash.now[:warning] = [
           'Hi Admin!',
-          ('You are viewing a hidden event. ' if @event.draft?),
+          ('This event is not published.' if @event.draft?),
+          ('This event is hidden from the events page and sitemap.' if @event.hidden?),
           ("<a href='#{effective_events.edit_admin_event_path(@event)}' class='alert-link'>Edit this event</a>.")
         ].compact.join(' ')
       end

data/app/helpers/effective_events_helper.rb

@@ -24,13 +24,17 @@ module EffectiveEventsHelper
   def admin_event_status_badge(event)
     return nil unless EffectiveResources.authorized?(self, :admin, :effective_events)
 
-    if event.try(:archived?)
+    status = if event.try(:archived?)
       content_tag(:span, 'ARCHIVED', class: 'badge badge-secondary')
     elsif event.draft?
       content_tag(:span, 'NOT PUBLISHED', class: 'badge badge-danger')
     elsif event.published? == false
       content_tag(:span, "TO BE PUBLISHED AT #{event.published_start_at&.strftime('%F %H:%M') || 'LATER'}", class: 'badge badge-danger')
     end
+
+    hidden = content_tag(:span, 'HIDDEN', class: 'badge badge-warning') if event.hidden?
+
+    safe_join([status, hidden].compact, ' ')
   end
 
   def effective_events_event_schedule(event)

data/app/models/effective/event.rb

@@ -59,6 +59,7 @@ module Effective
       published_start_at       :datetime
       published_end_at         :datetime
       legacy_draft             :boolean       # No longer used. To be removed.
+      hidden                   :boolean       # Hidden from Events#index and the sitemap.
 
       start_at               :datetime
       end_at                 :datetime
@@ -86,7 +87,8 @@ module Effective
 
     scope :sorted, -> { order(start_at: :desc) }
 
-    scope :for_sitemap, -> { published }
+    scope :not_hidden, -> { where(hidden: false) }
+    scope :for_sitemap, -> { published.not_hidden }
 
     scope :deep, -> { 
       base = includes(:event_registrants, :rich_texts, event_tickets: :event_registrants)
@@ -126,7 +128,7 @@ module Effective
       end
 
       unless unpublished
-        scope = scope.published
+        scope = scope.published.not_hidden
       end
 
       scope

data/app/views/admin/events/_form_event.html.haml

@@ -2,6 +2,10 @@
   = f.text_field :title, label: "Title"
 
   = acts_as_published_fields(f)
+  .row
+    .col
+      = f.check_box :hidden, label: 'Hide from the events page', hint: 'The event will remain accessible by its direct link and available for registration, but will not appear on the events page or in the sitemap.'
+
   = acts_as_slugged_fields(f, url: (effective_events.event_url(f.object) rescue nil))
 
   .row

data/db/migrate/101_create_effective_events.rb

@@ -9,6 +9,7 @@ class CreateEffectiveEvents < ActiveRecord::Migration[6.0]
       t.datetime :published_start_at
       t.datetime :published_end_at
       t.boolean :legacy_draft, default: false
+      t.boolean :hidden, default: false
 
       t.datetime :start_at
       t.datetime :end_at

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '3.7.0'.freeze
+  VERSION = '3.8.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Code and Effect