effective_events 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4f1c6fdc854ef73a51955a8d6384e5c4b92e1351ea77fe452038d9aaf0ea36c
-  data.tar.gz: 8f7a424f52aa2c056969dba54947385e0374b66af5f41a7317dc2b682634e460
+  metadata.gz: 8f06812e69cf669261f11555462013b8340e0c04a6af24916857d2a94f2aee43
+  data.tar.gz: ead5d60f77ec92e1e00ca5cbb9c6e33b5553177bb953e89c6cd74c171acfca62
 SHA512:
-  metadata.gz: bb906912c0f4bcc169da25ee13b19c1f4403c30fb3019cee51b6a93e161941d48528d8c472e84d37a0eb8873e10151a128a9bd72c9c17ec325efef6baf0ce878
-  data.tar.gz: d10878d80afeb41932d7e79d390d52226c172505bfa031d6a709b22fd564888f33681ff465f644abe2f0ccf5e23f0fe5b91a18c8d29ad207bff1e41769434004
+  metadata.gz: ddd0f95d520222d396e10b9ae9158e0ae717b6d28884e62e87d13b821e926253abfe362ee5e939e39113b1eb93465462475f463087680bc64cecdb481497f164
+  data.tar.gz: 65949637a55a6d50e8266a2e9d9eea77ef1f5d350ea1950aaf4796af4592d99b694517824666092daa30d2f12f2c6cfeb211193268ac54b8a6050d71eefee651

data/app/datatables/effective_events_datatable.rb

@@ -4,6 +4,7 @@ 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
 

data/app/models/effective/event.rb

@@ -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
@@ -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/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.2'.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.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-30 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails