effective_committees 0.3.10 → 0.3.12
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/datatables/admin/effective_committee_files_datatable.rb +2 -2
- data/app/datatables/admin/effective_committee_folders_datatable.rb +2 -2
- data/app/datatables/admin/effective_committee_members_datatable.rb +9 -3
- data/app/datatables/admin/effective_committees_datatable.rb +3 -3
- data/app/datatables/effective_committee_members_datatable.rb +4 -0
- data/app/datatables/effective_committees_datatable.rb +3 -3
- data/lib/effective_committees/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cb57ff09347fa9dc9c9dfdb9dc9a9023c18c0506177ad29c7329233697b77125
|
|
4
|
+
data.tar.gz: 4ccb6386e71cdcc1bec574838d3a1a58fa86b74b9a05ed40319e9f43b6d10f6d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4f9cd193eb49f307b450f83e2ab2aae84232bc762bdde37599652d1607372b0f5e9feb076381fffc68b129e14563d27a27e7da037e8da3131eb56fde8fe9e29a
|
|
7
|
+
data.tar.gz: f2d18efb9ab7dab1ee1b0ab56309fd706be2a32675ab0bb7cbbd1cb15ed1eb35631d884e0235997f2b03746eb08f66978602aee445e7c74e8d667cb1438f9c30
|
|
@@ -8,13 +8,13 @@ module Admin
|
|
|
8
8
|
|
|
9
9
|
col :id, visible: false
|
|
10
10
|
|
|
11
|
-
col :committee
|
|
11
|
+
col :committee
|
|
12
12
|
|
|
13
13
|
col :title, label: 'Folder'
|
|
14
14
|
col :slug, visible: false
|
|
15
15
|
col :body
|
|
16
16
|
|
|
17
|
-
col :committee_files, label: 'Files'
|
|
17
|
+
col :committee_files, label: 'Files'
|
|
18
18
|
col :committee_files_count, label: 'Files Count', visible: false
|
|
19
19
|
|
|
20
20
|
actions_col
|
|
@@ -4,8 +4,8 @@ module Admin
|
|
|
4
4
|
col :id, visible: false
|
|
5
5
|
col :user_id, visible: false
|
|
6
6
|
|
|
7
|
-
col :committee
|
|
8
|
-
col :user
|
|
7
|
+
col :committee
|
|
8
|
+
col :user
|
|
9
9
|
|
|
10
10
|
if defined?(EffectiveMemberships)
|
|
11
11
|
col(:member_number, label: 'Member #', sort: false) do |committee_member|
|
|
@@ -37,7 +37,13 @@ module Admin
|
|
|
37
37
|
end
|
|
38
38
|
|
|
39
39
|
collection do
|
|
40
|
-
Effective::CommitteeMember.deep.all
|
|
40
|
+
scope = Effective::CommitteeMember.deep.all
|
|
41
|
+
|
|
42
|
+
if current_user.class.try(:effective_memberships_user?)
|
|
43
|
+
scope = scope.includes(user: :membership)
|
|
44
|
+
end
|
|
45
|
+
|
|
46
|
+
scope
|
|
41
47
|
end
|
|
42
48
|
|
|
43
49
|
def roles_collection
|
|
@@ -11,13 +11,13 @@ module Admin
|
|
|
11
11
|
col :slug, visible: false
|
|
12
12
|
col :body, visible: false
|
|
13
13
|
|
|
14
|
-
col :committee_members, label: 'Members'
|
|
14
|
+
col :committee_members, label: 'Members'
|
|
15
15
|
col :committee_members_count, label: 'Members Count', visible: false
|
|
16
16
|
|
|
17
|
-
col :committee_folders, label: 'Folders',
|
|
17
|
+
col :committee_folders, label: 'Folders', visible: false
|
|
18
18
|
col :committee_folders_count, label: 'Folders Count', visible: false
|
|
19
19
|
|
|
20
|
-
col :committee_files, label: 'Files',
|
|
20
|
+
col :committee_files, label: 'Files', visible: false
|
|
21
21
|
col :committee_files_count, label: 'Files Count', visible: false
|
|
22
22
|
|
|
23
23
|
actions_col do |committee|
|
|
@@ -27,6 +27,10 @@ class EffectiveCommitteeMembersDatatable < Effective::Datatable
|
|
|
27
27
|
collection do
|
|
28
28
|
scope = Effective::CommitteeMember.deep.all.where(committee: current_user.committees)
|
|
29
29
|
|
|
30
|
+
if current_user.class.try(:effective_memberships_user?)
|
|
31
|
+
scope = scope.includes(user: :membership)
|
|
32
|
+
end
|
|
33
|
+
|
|
30
34
|
if attributes[:committee_id]
|
|
31
35
|
scope = scope.where(committee_id: attributes[:committee_id])
|
|
32
36
|
end
|
|
@@ -7,19 +7,19 @@ class EffectiveCommitteesDatatable < Effective::Datatable
|
|
|
7
7
|
|
|
8
8
|
col :title, label: 'Committee'
|
|
9
9
|
|
|
10
|
-
col :committee_members,
|
|
10
|
+
col :committee_members, label: 'Members', visible: false
|
|
11
11
|
|
|
12
12
|
col :committee_members_count, label: 'Members' do |committee|
|
|
13
13
|
pluralize(committee.committee_members_count, 'members')
|
|
14
14
|
end
|
|
15
15
|
|
|
16
|
-
col :committee_folders,
|
|
16
|
+
col :committee_folders, label: 'Folders'
|
|
17
17
|
|
|
18
18
|
col :committee_folders_count, label: 'Folders', visible: false do |committee|
|
|
19
19
|
pluralize(committee.committee_folders_count, 'folders')
|
|
20
20
|
end
|
|
21
21
|
|
|
22
|
-
col :committee_files,
|
|
22
|
+
col :committee_files, label: 'Files', visible: false
|
|
23
23
|
|
|
24
24
|
col :committee_files_count, label: 'Files' do |committee|
|
|
25
25
|
pluralize(committee.committee_files_count, 'files')
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: effective_committees
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.
|
|
4
|
+
version: 0.3.12
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Code and Effect
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2025-04-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|