effective_memberships 0.9.9 → 0.9.11
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a661f6a2e71839e88147912a2822645b6b659cd8dad6d003e09e627dff721ffc
|
4
|
+
data.tar.gz: 5da930fcdf416bc88a78ef11d8023160428d43aba6c2279da155b17983cea76e
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e38cd2433c53e5b32531e7081f11389981f6ed801a7d6a7328ae5b1fe60b123c075fdf31504e00b61e0d158cc71868f69961fa833958de547010b1eaef9c4d03
|
7
|
+
data.tar.gz: 105ebe2e7ce087697645e2d5553a583d1c2f3bd7d41cba9a99a5184a5c83036fbb2fa307750b770a9996d4bda3798c312e19636665aafbca4c31271c6c47b5d7
|
@@ -190,7 +190,7 @@ module EffectiveMembershipsApplicant
|
|
190
190
|
|
191
191
|
scope :not_draft, -> { where.not(status: :draft) }
|
192
192
|
|
193
|
-
scope :reviewable, -> { where.not(status: [:draft, :declined, :approved]) }
|
193
|
+
scope :reviewable, -> { where.not(status: [:draft, :submitted, :declined, :approved]) }
|
194
194
|
|
195
195
|
scope :for, -> (user) {
|
196
196
|
raise('expected a effective memberships user') unless user.class.try(:effective_memberships_user?)
|
@@ -629,7 +629,7 @@ module EffectiveMembershipsApplicant
|
|
629
629
|
categories.select do |category|
|
630
630
|
category.can_apply_new? ||
|
631
631
|
category.can_apply_existing? ||
|
632
|
-
(category.can_apply_restricted? && (category_ids & category.can_apply_restricted_ids).present?)
|
632
|
+
(category.can_apply_restricted? && (category_ids & category.can_apply_restricted_ids.map(&:to_s)).present?)
|
633
633
|
end
|
634
634
|
end
|
635
635
|
|
@@ -25,7 +25,7 @@
|
|
25
25
|
- if membership.number.present?
|
26
26
|
%p Your membership number is ##{membership.number} and you joined on #{membership.joined_on.strftime('%F')}.
|
27
27
|
- else
|
28
|
-
%p You joined on #{membership.joined_on.strftime('%F')}
|
28
|
+
%p You joined on #{membership.joined_on.strftime('%F')}.
|
29
29
|
|
30
30
|
- if membership.registration_on > membership.joined_on
|
31
31
|
%p Your last category or status change was on #{membership.registration_on.strftime('%F')}.
|