effective_events 3.5.1 → 3.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8e2e8e87f25ab847ab6fa04538e4745ddd5f7ec9c4b5477a3beffda30780b718
4
- data.tar.gz: 7cb69cd65710b203a479e97e5d81338acbd5c0fb3f90d0056847f802b140faef
3
+ metadata.gz: 374bd1235fb7e13c4d2bec6460827a8e2666cb7ffd83edcc97e31a89d7b96cc1
4
+ data.tar.gz: 0ea1cff973e09f97046d83ae5115833004610f8c74327d196e08e3481375172f
5
5
  SHA512:
6
- metadata.gz: 913f840356d6a2722d0296b214677afc23c280767cb49183f8cf9b3659dc625518dcec3168d22ff1f2cdbe08c00fe102651ff824c8c3d536d298d8b657b06574
7
- data.tar.gz: 42569a8b3247501c96691e3b819cf2fe6082ab5b105824147ebd16fe1aa590f8e5d942f1907b59afb4725dea0708e7b8a32a43fbea48ac316899126cd32aa182
6
+ metadata.gz: 65ed955bd252da6c2911630df7927f653605d49176fad978ba3148cbe7149c55a721b24507738350f3d2dd5c11c375a2d63025248f6f9cfdc57e02a7a8428364
7
+ data.tar.gz: d0d7e83711ba357042a4cfadd7c7225d07898e01036dbcc266a2d87b81fdc2fcad7106050a26daac42bd67d04d8254715c339942dd0c6aebd061706571a7699b
@@ -29,7 +29,15 @@ module Effective
29
29
  @event_search = build_event_search
30
30
  @event_search.search!
31
31
 
32
- @events = @event_search.results(page: params[:page])
32
+ @events_count = @event_search.events.count
33
+
34
+ page = EffectiveResources.validate_page!(
35
+ params[:page],
36
+ collection_count: @events_count,
37
+ per_page: @event_search.per_page
38
+ )
39
+
40
+ @events = @event_search.results(page: page)
33
41
  end
34
42
 
35
43
  def show
@@ -7,12 +7,11 @@
7
7
  .col.order-1.order-lg-2
8
8
  %h1.effective-title.mb-4= @page_title
9
9
 
10
- - results = @event_search.results(page: params[:page])
11
- - if (@event_search.present? && results.length == 0) || @events.blank?
10
+ - if (@event_search.present? && @events.length == 0) || @events.blank?
12
11
  .alert.alert-warning.mb-3
13
12
  There are no active #{events_label.downcase} for this category.
14
13
  - else
15
- = render(results) # This renders effective/events/event
14
+ = render(@events) # This renders effective/events/event
16
15
 
17
16
  %nav.d-flex.justify-content-center.mb-4
18
- = bootstrap_paginate(results, per_page: @event_search.per_page)
17
+ = bootstrap_paginate(@events, per_page: @event_search.per_page, collection_count: @events_count)
@@ -1,3 +1,3 @@
1
1
  module EffectiveEvents
2
- VERSION = '3.5.1'.freeze
2
+ VERSION = '3.6.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_events
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.1
4
+ version: 3.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect