effective_events 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f06812e69cf669261f11555462013b8340e0c04a6af24916857d2a94f2aee43
-  data.tar.gz: ead5d60f77ec92e1e00ca5cbb9c6e33b5553177bb953e89c6cd74c171acfca62
+  metadata.gz: 569c49b04014de818642e164da4ef47325b13b8fed83b1bbedb784561463e106
+  data.tar.gz: 9b8997c85d23c620adcceafe4bf2ab006e5dc1c8412b0e21e2a2f9cc31bed427
 SHA512:
-  metadata.gz: ddd0f95d520222d396e10b9ae9158e0ae717b6d28884e62e87d13b821e926253abfe362ee5e939e39113b1eb93465462475f463087680bc64cecdb481497f164
-  data.tar.gz: 65949637a55a6d50e8266a2e9d9eea77ef1f5d350ea1950aaf4796af4592d99b694517824666092daa30d2f12f2c6cfeb211193268ac54b8a6050d71eefee651
+  metadata.gz: 724b0d2767459dcb3f2d51507175110d3c5e846bb8a5444b5ed1b3768a3abb0f1f1272a7d5b1fa838a41f769cdd13ccd7b540a2bdced273b7c9eae6b7ad7d8ba
+  data.tar.gz: aaa83c634752e12c8d72008986db445a6eef8938d57d93604e6033133c6d4f738c152a23ce8064df410d72f41518377b981f30da199f8f4f6bc47a8d8ca00fba

data/app/datatables/effective_events_datatable.rb

@@ -9,7 +9,8 @@ class EffectiveEventsDatatable < Effective::Datatable
   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)) }
@@ -89,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)

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/event_registrations/submitted.html.haml

@@ -7,10 +7,10 @@
   .alert.alert-warning.mb-4
     Successfully paid on #{resource.submit_order.purchased_at.strftime('%F')}.
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary mb-4'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
 
   = render 'effective/event_registrations/summary', event_registration: resource
   = render 'effective/event_registrations/event_registration', event_registration: resource
   = render 'effective/event_registrations/orders', event_registration: resource
 
-  = link_to "Return to Dashboard", root_path, class: 'btn btn-lg btn-primary'
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

data/lib/effective_events/version.rb

@@ -1,3 +1,3 @@
 module EffectiveEvents
-  VERSION = '0.5.2'.freeze
+  VERSION = '0.5.4'.freeze
 end

metadata

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