effective_events 3.5.1 → 3.7.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 +4 -4
- data/app/controllers/effective/events_controller.rb +9 -1
- data/app/datatables/effective_event_registrations_datatable.rb +1 -1
- data/app/views/effective/event_registrations/_dashboard.html.haml +1 -1
- data/app/views/effective/events/index.html.haml +3 -4
- data/lib/effective_events/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f8cc6c3e09002ef40269417ef9caf29ef1acbb9baa60210ffac26b794dd8d1da
|
|
4
|
+
data.tar.gz: 5570bb360e23a50b107142d6d9f55da9918c934c64d9561c88bb063e4ad66927
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 717aca54570d30bdeb9b01366d3a870c719b4c5dea89e506d5814facab6f0340b4174dc278694871d0a5941a89d2d7f96cb86cd2001936dbce37b08b3d74a459
|
|
7
|
+
data.tar.gz: 6cb9a6114bacd68232470003033e513282587750bc2a43d1eade895b8b2c75623dcdc808afc0bea15160eedc056b2a501cd9e4aaeeb4f61043c50e7f1e485751
|
|
@@ -29,7 +29,15 @@ module Effective
|
|
|
29
29
|
@event_search = build_event_search
|
|
30
30
|
@event_search.search!
|
|
31
31
|
|
|
32
|
-
@
|
|
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
|
|
@@ -23,7 +23,7 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
|
|
|
23
23
|
|
|
24
24
|
actions_col(actions: []) do |er|
|
|
25
25
|
if er.draft? || er.submitted?
|
|
26
|
-
dropdown_link_to('Continue', effective_events.event_event_registration_build_path(er.event, er, er.next_step), 'data-turbolinks' => false)
|
|
26
|
+
dropdown_link_to('Continue', effective_events.event_event_registration_build_path(er.event, er, er.next_step), 'data-turbolinks' => false, 'data-turbo' => false)
|
|
27
27
|
elsif er.completed?
|
|
28
28
|
if EffectiveResources.authorized?(self, :update_blank_registrants, er)
|
|
29
29
|
dropdown_link_to('Continue', effective_events.event_event_registration_path(er.event, er))
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
|
|
15
15
|
%p
|
|
16
16
|
Please
|
|
17
|
-
= link_to("Continue registration", effective_events.event_event_registration_build_path(registration.event, registration, registration.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
|
|
17
|
+
= link_to("Continue registration", effective_events.event_event_registration_build_path(registration.event, registration, registration.next_step), 'data-turbolinks' => false, 'data-turbo' => false, class: 'btn btn-primary')
|
|
18
18
|
- if EffectiveResources.authorized?(self, :destroy, registration)
|
|
19
19
|
or you can
|
|
20
20
|
= 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')
|
|
@@ -7,12 +7,11 @@
|
|
|
7
7
|
.col.order-1.order-lg-2
|
|
8
8
|
%h1.effective-title.mb-4= @page_title
|
|
9
9
|
|
|
10
|
-
-
|
|
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(
|
|
14
|
+
= render(@events) # This renders effective/events/event
|
|
16
15
|
|
|
17
16
|
%nav.d-flex.justify-content-center.mb-4
|
|
18
|
-
= bootstrap_paginate(
|
|
17
|
+
= bootstrap_paginate(@events, per_page: @event_search.per_page, collection_count: @events_count)
|