effective_events 0.24.0 → 2.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 146d98c901aee1e581e5f34ab7e92d67e7e1f96baf2d3c6be875c99cf58de1a1
-  data.tar.gz: 93654dfa9d54f6a4b5be26a31a3462fcab075408c82e8f882a07a0b1081bf0a0
+  metadata.gz: 7653da73f90a91355b58b9da44d32ad5a9c9cfb4cda6c996f08bb052e143714f
+  data.tar.gz: 9f845411770991a68ebd447e7a3007240175489071eb4d21053044414a23e9cd
 SHA512:
-  metadata.gz: 6d2eb4b943572972ab938d8b2223c162ad87c99dfaa36f48f88d8412e9a4fcbeaca82f928523d72a4d20fd49f37ba1cd6c00453b512d1c49e9d9d6a65af394f8
-  data.tar.gz: c09166658be072cb49804dbc12fe7357caeefcfd1f9d1381089789ed767df9af9e5f1377187a726ea6b7743263a946b24c7882c1ef57a9d80cc599cf6547e506
+  metadata.gz: 67d2066762e9fde6cfbec7c4d3ba73140eb1d284e730a45a49a24a6a397b58763a146e4dee5da75069f7405703a97ce2847dba2774c2aed99e056bde5db4687c
+  data.tar.gz: 3bf8b960cead89efb84a40cf3e27c319987eb5e36d49c71a8f32c46411e40280aa0b139e9c52e37da401ac91575b45ce4e61dc40ea7d2b8215a21ac23077262a

data/app/controllers/effective/events_controller.rb

@@ -36,10 +36,6 @@ module Effective
       @event = resource_scope.find(params[:id])
       @upcoming_events = resource_scope.upcoming.where.not(id: @event.id)
 
-      if @event.respond_to?(:roles_permit?)
-        raise Effective::AccessDenied.new('Access Denied', :show, @event) unless @event.roles_permit?(current_user)
-      end
-
       EffectiveResources.authorize!(self, :show, @event)
 
       if EffectiveResources.authorized?(self, :admin, :effective_events)

data/app/helpers/effective_events_helper.rb

@@ -15,6 +15,24 @@ module EffectiveEventsHelper
     ets(Effective::Event)
   end
 
+  def event_status_badge(event)
+    event.roles.map do |role|
+      content_tag(:span, "#{role.to_s.upcase} ONLY", class: 'badge badge-secondary')
+    end.join(' ').html_safe
+  end
+
+  def admin_event_status_badge(event)
+    return nil unless EffectiveResources.authorized?(self, :admin, :effective_events)
+
+    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
+  end
+
   def effective_events_event_schedule(event)
     if event.start_at.beginning_of_day == event.end_at.beginning_of_day
       "#{event.start_at.strftime("%A, %B %d, %Y · %l:%M%P")} - #{event.end_at.strftime("%l:%M%P")}"

data/app/models/effective/event.rb

@@ -113,13 +113,10 @@ module Effective
     scope :events, -> (user: nil, category: nil, unpublished: false) {
       scope = all.deep
 
-      if defined?(EffectiveRoles) && EffectiveEvents.use_effective_roles
-        scope = scope.for_role(user&.roles)
-      end
-
-      if user.blank?
-        scope = scope.where(authenticate_user: false)
-      end
+      # We include member only events for all users
+      # if defined?(EffectiveRoles) && EffectiveEvents.use_effective_roles
+      #   scope = scope.for_role(user&.roles)
+      # end
 
       if category.present?
         scope = scope.where(category: category)

data/app/views/effective/event_registrations/_dashboard.html.haml

@@ -14,7 +14,7 @@
 
     %p
       Please
-      = link_to("Continue registration for #{registration.event}", effective_events.event_event_registration_build_path(registration.event, registration, registration.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+      = link_to("Continue registration", effective_events.event_event_registration_build_path(registration.event, registration, registration.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
       or you can
       = link_to('Abandon registration', effective_events.event_event_registration_path(registration.event, registration), 'data-confirm': "Really delete registration for #{registration.event}?", 'data-method': :delete, class: 'btn btn-danger')
       to register for another event.

data/app/views/effective/events/_event.html.haml

@@ -12,6 +12,9 @@
     - if event.category.present? && EffectiveEvents.categories.length > 1
       = link_to(event.category, effective_events.events_path + '/' + event.category.parameterize, class: "badge badge-primary badge-event mb-2 effective-events-#{event.category.parameterize}")
 
+    = event_status_badge(event)
+    = admin_event_status_badge(event)
+
     %h2.effective-events-title= link_to event.title, effective_events.event_path(event)
     .effective-events-meta= effective_events_event_schedule(event)
     .effective-events-excerpt= event.excerpt.to_s

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.24.0'.freeze
+  VERSION = '2.25.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 2.25.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails