effective_committees 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 273a03d9378d41c45a5db4debbf70f1df6ff9c2d5cb8030e29ec5cd96aba3b7a
-  data.tar.gz: 7f2a77350d8ad99f96af0ce67fb0c158f3af25285b856df803447b5c1accfc07
+  metadata.gz: 2dbf5431951175c003067b688990bab70bed951ce3ce3789aced0cd086582860
+  data.tar.gz: 21df5777b6941e57da909d5052eab66cd000b4f24ee7c1cc2bac03bbf943372b
 SHA512:
-  metadata.gz: db9ed1a1c1e46673948c6ded274884fc4d29ad3338ebef7dba0f63a23d0b95b7487cc77243d935b1ae0c89cb54f9520fdfa077566498dca67071081b28383e5e
-  data.tar.gz: 7a8d34ba7fdd401d4ce4af0319e459ad06e732927e8d0cddad374c125176fd730990e05269427069b56451661ab34975590d0d646ca9d87704ca55135471a1aa
+  metadata.gz: d468e614bebd4783bfe3ba8a794d0581e6e41936f86a1480dfdd7ca5316068436cfc22d3f53b935fe2d64e43f753916f7ee8305ae2f5f61caa275b931f4e7410
+  data.tar.gz: d19d8a0f10d252b32ce11bbd3346e07c7e33c993862af462d35160a8000eb845861a982402a625d6c91ca04ef692c84c55975c0a00e51be0d016f551b1fd2f96

data/app/datatables/admin/effective_committee_members_datatable.rb

@@ -4,8 +4,8 @@ module Admin
       col :id, visible: false
       col :user_id, visible: false
 
-      col :committee
-      col :user
+      col :committee, search: :string
+      col :user, search: :string
 
       unless attributes[:user_id]
         col :email do |committee_member|

data/app/datatables/effective_committees_datatable.rb

@@ -7,7 +7,7 @@ class EffectiveCommitteesDatatable < Effective::Datatable
 
     col :title, label: 'Committee'
 
-    col :committee_members, search: :string, label: 'Members'
+    col :committee_members, search: :string, label: 'Members', visible: false
 
     col :committee_folders, search: :string, label: 'Folders'
 

data/app/models/effective/committee.rb

@@ -30,7 +30,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:title) }
-    scope :deep, -> { includes(:committee_members, committee_folders: [:committee_files, :rich_text_body]) }
+    scope :deep, -> { includes(committee_members: [:user], committee_folders: [:committee_files, :rich_text_body]) }
 
     validates :title, presence: true, uniqueness: true, length: { maximum: 255 }
 

data/app/models/effective/committee_file.rb

@@ -26,7 +26,7 @@ module Effective
       self.title ||= file.filename.to_s
     end
 
-    scope :deep, -> { with_attached_file }
+    scope :deep, -> { with_attached_file.includes(:committee, :committee_folder) }
     scope :sorted, -> { order(:title) }
 
     validates :title, presence: true

data/app/models/effective/committee_folder.rb

@@ -26,7 +26,7 @@ module Effective
       self.position ||= (committee.committee_folders.map { |obj| obj.position }.compact.max || -1) + 1
     end
 
-    scope :deep, -> { includes(:committee, :committee_files) }
+    scope :deep, -> { includes(:rich_text_body, :committee, :committee_files) }
     scope :sorted, -> { order(:position) }
 
     validates :title, presence: true, length: { maximum: 250 },

data/app/views/effective/committees/_dashboard.html.haml

@@ -1,10 +1,8 @@
 %h2 Committees
 
 - if current_user.committees.present?
-  %p You are a member of #{pluralize(current_user.committees.length, 'committee')}.
-
   - datatable = EffectiveResources.best('EffectiveCommitteesDatatable').new(self, namespace: :effective)
   = render_datatable(datatable, simple: true)
 
 - else
-  %p You are not a committee member. When you join a committee, we'll show it here.
+  %p You aren't assigned to any committees. When you are, we'll show them here.

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2023-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails