effective_events 0.1.3 → 0.1.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/effective/event_registrations_controller.rb +1 -5
- data/app/datatables/effective_event_registrations_datatable.rb +1 -3
- data/app/models/concerns/effective_events_event_registration.rb +1 -4
- data/lib/effective_events/version.rb +1 -1
- data/lib/generators/effective_events/install_generator.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: b2a6d166ba053eb00016f2ea09e4f9fe64ebf8e2ddd3778261553891f664b81b
|
|
4
|
+
data.tar.gz: ebb4c682a522a196dcc9714cacd50cfb9cac974e8f92b3412fca65ea7a470f7c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c44d5e9c255466984eda2b7470f7690810982d176ca4ef8c6c29225c3703ceb25d6c263e9ebc7792aa710450a54ad0370899a5295182665743e725ebe1d6b2c4
|
|
7
|
+
data.tar.gz: 726518bd5c9fb10b52d4d1b92d03ff1ca7f08a8c474b0494fbc6c55cf4da9d573dbd43d13905076305415f0208a6ea17a9c0a42e4332fe1a4884e2103d5c9397
|
|
@@ -6,7 +6,7 @@ module Effective
|
|
|
6
6
|
|
|
7
7
|
resource_scope -> {
|
|
8
8
|
event = Effective::Event.find(params[:event_id])
|
|
9
|
-
EffectiveEvents.EventRegistration.deep.where(owner:
|
|
9
|
+
EffectiveEvents.EventRegistration.deep.where(owner: current_user, event: event)
|
|
10
10
|
}
|
|
11
11
|
|
|
12
12
|
# Allow only 1 in-progress event registration at a time
|
|
@@ -37,10 +37,6 @@ module Effective
|
|
|
37
37
|
|
|
38
38
|
private
|
|
39
39
|
|
|
40
|
-
def current_owner
|
|
41
|
-
(current_user.class.respond_to?(:effective_memberships_owner?) ? current_user.effective_memberships_owners : current_user)
|
|
42
|
-
end
|
|
43
|
-
|
|
44
40
|
def permitted_params
|
|
45
41
|
model = (params.key?(:effective_event_registration) ? :effective_event_registration : :event_registration)
|
|
46
42
|
|
|
@@ -30,9 +30,7 @@ class EffectiveEventRegistrationsDatatable < Effective::Datatable
|
|
|
30
30
|
end
|
|
31
31
|
|
|
32
32
|
collection do
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
EffectiveEvents.EventRegistration.deep.where(owner: owner)
|
|
33
|
+
EffectiveEvents.EventRegistration.deep.where(owner: current_user)
|
|
36
34
|
end
|
|
37
35
|
|
|
38
36
|
end
|
|
@@ -78,10 +78,7 @@ module EffectiveEventsEventRegistration
|
|
|
78
78
|
scope :in_progress, -> { where.not(status: [:submitted]) }
|
|
79
79
|
scope :done, -> { where(status: [:submitted]) }
|
|
80
80
|
|
|
81
|
-
scope :for, -> (user) {
|
|
82
|
-
owner = (user.respond_to?(:effective_memberships_owners) ? user.effective_memberships_owners : user)
|
|
83
|
-
where(owner: owner)
|
|
84
|
-
}
|
|
81
|
+
scope :for, -> (user) { where(owner: user) }
|
|
85
82
|
|
|
86
83
|
# All Steps validations
|
|
87
84
|
validates :owner, presence: true
|