effective_events 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4f1c6fdc854ef73a51955a8d6384e5c4b92e1351ea77fe452038d9aaf0ea36c
-  data.tar.gz: 8f7a424f52aa2c056969dba54947385e0374b66af5f41a7317dc2b682634e460
+  metadata.gz: 07372f571e5614f2d5d37dacde18ea6b7b57bdec70422e246cad42191c7892fa
+  data.tar.gz: 18e33f7886fc3802be2c013cb6b95f07b51b86926b15bbda239f19431db21a32
 SHA512:
-  metadata.gz: bb906912c0f4bcc169da25ee13b19c1f4403c30fb3019cee51b6a93e161941d48528d8c472e84d37a0eb8873e10151a128a9bd72c9c17ec325efef6baf0ce878
-  data.tar.gz: d10878d80afeb41932d7e79d390d52226c172505bfa031d6a709b22fd564888f33681ff465f644abe2f0ccf5e23f0fe5b91a18c8d29ad207bff1e41769434004
+  metadata.gz: 93e60338d150cfff0fa2543b6c822851e8c6a86468bcf3387eb0fada440a079a5428d8aa597107d2f5483ff8eb822f4f5dcaa2261008d74ae8de3dede84439be
+  data.tar.gz: 668cd366a81fe3b46a988343b725c1bd0bbb9aed30b851dc16627aedf0e667062eb1e64bf9265faeeb6989ed92108914809858cf426733d4e22cb685d2fc9b6f

data/app/datatables/effective_events_datatable.rb

@@ -4,11 +4,13 @@ class EffectiveEventsDatatable < Effective::Datatable
     # Upcoming should be first here, so when displayed as a simple datatable on the dashboard they only see upcoming events
     scope :upcoming
     scope :registerable
+    scope :external
     scope :all
   end
 
   datatable do
-    order :title
+    order :start_at
+
     col :id, visible: false
 
     col :start_at, label: 'Date', as: :date

data/app/models/effective/event.rb

@@ -63,7 +63,7 @@ module Effective
       timestamps
     end
 
-    scope :sorted, -> { order(published_at: :desc).order(:id) }
+    scope :sorted, -> { order(start_at: :desc) }
     scope :deep, -> { includes(:event_registrants, :event_tickets) }
 
     scope :published, -> { where(draft: false).where(arel_table[:published_at].lt(Time.zone.now)) }
@@ -79,6 +79,7 @@ module Effective
 
     # Doesnt consider sold out yet
     scope :registerable, -> { published.not_closed.with_tickets }
+    scope :external, -> { published.where(external_registration: true) }
 
     scope :paginate, -> (page: nil, per_page: nil) {
       page = (page || 1).to_i
@@ -88,7 +89,7 @@ module Effective
     }
 
     scope :events, -> (user: nil, category: nil, unpublished: false) {
-      scope = all.deep.sorted
+      scope = all.deep
 
       if defined?(EffectiveRoles) && EffectiveEvents.use_effective_roles
         scope = scope.for_role(user&.roles)
@@ -113,8 +114,9 @@ module Effective
     validates :published_at, presence: true, unless: -> { draft? }
     validates :start_at, presence: true
     validates :end_at, presence: true
-    validates :registration_start_at, presence: true
-    validates :registration_end_at, presence: true
+
+    validates :registration_start_at, presence: true, unless: -> { external_registration? }
+    validates :registration_end_at, presence: true, unless: -> { external_registration? }
     validates :external_registration_url, presence: true, if: -> { external_registration? }
 
     validate(if: -> { start_at && end_at }) do
@@ -204,8 +206,8 @@ module Effective
         event.slug = event.slug + '-copy'
         event.draft = true
 
-        event.body = body
-        event.excerpt = excerpt
+        event.rich_text_body = rich_text_body
+        event.rich_text_excerpt = rich_text_excerpt
       end
     end
 

data/app/models/effective/event_search.rb

@@ -72,7 +72,7 @@ module Effective
       when 'Sort by Event Date'
         events.reorder(start_at: :desc)
       else
-        events.reorder(published_at: :desc) # Default Sort by Published Date
+        events.reorder(start_at: :desc) # Default Sort by Event Date
       end
 
       events

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

@@ -27,18 +27,20 @@
       %strong Event Date:
       = effective_events_event_schedule(@event)
 
-    %li
-      %strong Registration Opens:
-      = @event.registration_start_at.strftime("%b %d, %Y %I:%M%P")
+    - if @event.registration_start_at.present?
+      %li
+        %strong Registration Opens:
+        = @event.registration_start_at.strftime("%b %d, %Y %I:%M%P")
 
     - if @event.early_bird_end_at.present?
       %li
         %strong Early Bird Rate Ends:
         = @event.early_bird_end_at.strftime("%b %d, %Y %I:%M%P")
 
-    %li
-      %strong Registration Closes:
-      = @event.registration_end_at.strftime('%F %R')
+    - if @event.registration_end_at.present?
+      %li
+        %strong Registration Closes:
+        = @event.registration_end_at.strftime('%F %R')
 
     - if @event.event_tickets.present?
       %li

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.5.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_events
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-30 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails