effective_committees 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40736c7f879ac06a88e47593879009792acf06e842243159c790bc5e70f1e815
-  data.tar.gz: c80bd2a5c4ed9ff27887a6ce78289b07595bd85def56f2830421b7d590920c32
+  metadata.gz: e28282d238abfca45a4fea8be72728d21bafd74aad6b38abb849e9df45a73e30
+  data.tar.gz: 20defd897b8846e1c4f6353a0cddc21e912984bd5b5470b72088729ac79b3b2b
 SHA512:
-  metadata.gz: b2cd0462498e023278e45c9712a7ef4dcf064adf83a508f4a82cbdd573b304000d04a033dfe29d0f23b0b346b322dd4475837d53376c94374be267c7e28b1251
-  data.tar.gz: e7d500cc74280a47f43f3a8826a1e81ffe65b01894af08b1cc6137958ccb1ac2e75f2e7c3358034f88a5c95451e896f0a1f10767037b7defb31ddde75877db91
+  metadata.gz: 6382fab2239e1aeb85b9633d93fff8a9c5e94b8f877282a57990920fbdc6ea2a0c291346627fc966213cac1d2f715d3560b9ae4dbd4853b6348fc38c55d736c9
+  data.tar.gz: 8974e1afaf75472c938be8bb31b0c5ffe2e315341a7031a620f26a5ef173cca7a56fa4857954ef2d8aad5fb306de64e732f7eb65087abddf61c7a46fc86d13c7

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

@@ -9,6 +9,10 @@ class EffectiveCommitteesDatatable < Effective::Datatable
 
     col :committee_members, search: :string, label: 'Members', visible: false
 
+    col :committee_members_count, label: 'Members' do |committee|
+      pluralize(committee.committee_members_count, 'members')
+    end
+
     col :committee_folders, search: :string, label: 'Folders'
 
     col :committee_folders_count, label: 'Folders', visible: false do |committee|

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/admin/committee_files/_form.html.haml

@@ -1,4 +1,8 @@
 = effective_form_with(model: [:admin, committee_file], engine: true) do |f|
+  - f.object.committee_type ||= Effective::Committee.name
+
+  = f.hidden_field :committee_type
+  = f.hidden_field :committee_id
 
   - if inline_datatable? && inline_datatable.attributes[:committee_folder_id].present?
     = f.hidden_field :committee_folder_id

data/app/views/admin/committee_members/_form.html.haml

@@ -2,8 +2,6 @@
   - f.object.user_type ||= current_user.class.name
   - f.object.committee_type ||= Effective::Committee.name
 
-  - committees = Effective::Committee.sorted.all
-
   = f.hidden_field :user_type
   = f.hidden_field :user_id
 
@@ -14,14 +12,13 @@
 
   - if f.object.new_record?
     - if inline_datatable? && inline_datatable.attributes[:committee_id].present?
-      = f.select :user_ids, current_user.class.sorted, label: 'Add user(s)', required: true, ajax_url: ajax_url, hint: 'Add one or more users'
+      = f.select :user_ids, current_user.class.all, label: 'Add user(s)', required: true, ajax_url: ajax_url, hint: 'Add one or more users'
 
     - if inline_datatable? && inline_datatable.attributes[:user_id].present?
-      = f.select :committee_ids, committees, label: 'Add committee(s)', hint: 'Add one or more committees'
+      = f.select :committee_ids, Effective::Committee.sorted.all, label: 'Add committee(s)', hint: 'Add one or more committees'
 
     - unless inline_datatable?
-      = f.select :committee_id, committees, label: 'Committee'
-
+      = f.select :committee_id, Effective::Committee.sorted.all, label: 'Committee'
       = f.select :user_ids, current_user.class.sorted, label: 'User(s)', required: true, ajax_url: ajax_url, hint: 'Add one or more user at a time'
 
   - if f.object.persisted?

data/app/views/effective/committee_folders/_committee_folder.html.haml

@@ -17,7 +17,12 @@
 
     - committee_folder.committee_files.each do |file|
       %tr
-        %td= link_to(icon('download') + file, url_for(file.file), target: '_blank')
+        %td
+          - if file.file.attached?
+            = link_to(icon('download') + file, url_for(file.file), target: '_blank')
+          - else
+            = file
+
         %td= file.created_at.strftime('%F')
         %td= file.notes
 

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

@@ -3,6 +3,6 @@
     = render 'effective/committees/form_committee', committee: committee
 
   - if committee.persisted?
-    - if committee.respond_to?(:log_changes_datatable)
+    - if committee.respond_to?(:logs_datatable)
       = tab 'Logs' do
-        = render_inline_datatable(committee.log_changes_datatable)
+        = render_inline_datatable(committee.logs_datatable)

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.3.5'.freeze
 end

metadata

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