effective_committees 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bc2c949cff1b747488c7c18ea3def8acb9541e3278b5ae7e6f82cccf6d45c60
-  data.tar.gz: ea5794494521b25fa243a7c9bce9cf491cbeb49204c1d8405f0cd1a87b67ae07
+  metadata.gz: b0b2195404483ec93cb13fb7f17348c27f0433cbb6a6f0c94533cf8b8f0a98b2
+  data.tar.gz: f9ec6c5d7bb9d128f84411fc0d00d5f4df4607bb82064e0be57a655eabbfb852
 SHA512:
-  metadata.gz: 7ba1a02a5ae937c6d409c7828038e2217ea94c03ef545b01d530e1309738f03a520f7cf173a0d697cbfe92daffc8202998093c29a8d3187a3bfcddced5dfde35
-  data.tar.gz: dfe2891d1b287231ac3a987503eb16f3b00d4a55508a073abf9ee3eaa2b444b5d43a4a8c2e44dd578e96283fe971b16bab17c87a11c262b9ad177150f5fab79e
+  metadata.gz: 4ac652618bd32cc6336df7b2122f28b741df5e735ebb556e9a0410a5036f3ddf011df0657a6316c041e62eb1a6bf4d938f09661791482dadc8095f6aec9e5736
+  data.tar.gz: 294969d8a9a2714403a6064bdc18c3decc8db3150b92c8da3451919794217f136fef7eea199dcd613d47ed178b5e11800f3467cc8b4bed68daacd7b301ea0533

data/app/datatables/admin/effective_committee_files_datatable.rb

@@ -14,7 +14,10 @@ module Admin
         admin_committees_parents(committee_file.committee_folder)
       end
 
-      col :file, label: "Files"
+      col(:to_s, label: 'Files') do |committee_file|
+        link_to(committee_file.to_s, url_for(committee_file.file), title: committee_file.to_s, target: '_blank')
+      end
+
       col :title, visible: false
       col :notes
 

data/app/models/effective/committee_file.rb

@@ -29,18 +29,26 @@ module Effective
     end
 
     before_validation(if: -> { file.attached? }) do
-      assign_attributes(title: file.filename.to_s, file_id: file.attachment.blob.id, file_created_at: file.attachment.blob.created_at)
+      assign_attributes(file_id: file.attachment.blob.id, file_created_at: file.attachment.blob.created_at)
+    end
+
+    validate(if: -> { title.present? }) do
+      errors.add(:title, 'must end with a file extension') unless title.include?('.')
+    end
+
+    before_save(if: -> { title.present? && file.attached? }) do
+      file.update(filename: title)
     end
 
     scope :deep, -> { with_attached_file.includes(:committee, :committee_folder) }
     scope :sorted, -> { order(:position) }
 
-    validates :title, presence: true
+    validates :title, uniqueness: { scope: :committee_folder_id, allow_blank: true }
     validates :file, presence: true
     validates :position, presence: true, if: -> { committee_folder.present? }
 
     def to_s
-      title.presence || 'file'
+      title.presence || file&.filename.to_s.presence || 'file'
     end
 
     def parents

data/app/models/effective/committee_folder.rb

@@ -47,6 +47,10 @@ module Effective
       true
     end
 
+    def top_level?
+      committee_folder.blank?
+    end
+
     def parent
       committee_folder || committee
     end

data/app/views/admin/committee_files/_form_committee_file.html.haml

@@ -18,6 +18,10 @@
       = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.where(committee: f.object.committee), label: "Folder"
 
   = f.file_field :file
+
+  - if f.object.persisted?
+    = f.text_field :title
+
   = f.text_area :notes
 
   = effective_submit(f)

data/app/views/admin/committees/_parents.html.haml

@@ -2,9 +2,9 @@
   - if parent.kind_of?(Effective::CommitteeFolder)
     = link_to(parent.title, effective_committees.edit_admin_committee_folder_path(parent))
   - elsif parent.kind_of?(Effective::Committee)
-    = link_to(parent.title, effective_committees.edit_admin_committee_path(parent))
+    = link_to(parent.to_s, effective_committees.edit_admin_committee_path(parent))
   - elsif parent.kind_of?(Effective::CommitteeFile)
-    = link_to(parent.title, effective_committees.edit_admin_committee_file_path(parent))
+    = link_to(parent.to_s, effective_committees.edit_admin_committee_file_path(parent))
   - else
     - raise("unexpected parent")
 

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

@@ -6,13 +6,15 @@
       - log = logs.first
 
       - committee = log.changes_to
-      - link_to_committee = link_to(committee, effective_committees.committee_path(committee))
+      - committee_folder = log.associated.try(:committee_folder) || (log.associated if log.associated_type == 'Effective::CommitteeFolder')
+      - committee_file = (log.associated if log.associated_type == 'Effective::CommitteeFile')
 
-      - committee_folder = log.associated.try(:committee_folder) || log.associated
-      - link_to_committee_folder = link_to(committee_folder, effective_committees.committee_committee_folder_path(committee, committee_folder))
+      - next if committee.blank?
+      - next if committee_folder.blank?
 
-      - committee_file = log.associated.try(:file).try(:blob)
-      - link_to_file = link_to(log.associated, (committee_file ? url_for(committee_file) : '#'))
+      - link_to_committee = link_to(committee, effective_committees.committee_path(committee))
+      - link_to_committee_folder = link_to(committee_folder, effective_committees.committee_committee_folder_path(committee, committee_folder))
+      - link_to_file = link_to(committee_file.to_s, (committee_file ? url_for(committee_file.file) : '#'))
 
       - if logs.length == 1 && log.associated_type == 'Effective::CommitteeFolder'
         %li Folder #{link_to_committee_folder} was added to #{link_to_committee}.

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

@@ -22,10 +22,12 @@
             .mb-5
               %h3= link_to(committee.to_s, effective_committees.committee_path(committee), style: "text-decoration: none;")
 
-              - if committee.committee_folders.present?
+              - committe_folders = committee.committee_folders.select(&:top_level?)
+
+              - if committe_folders.present?
                 .card
-                  .list-group.list-grou-flush
-                    - committee.committee_folders.each do |folder|
+                  .list-group.list-group-flush
+                    - committe_folders.each do |folder|
                       = link_to(folder.to_s, effective_committees.committee_committee_folder_path(committee, folder), class: 'list-group-item list-group-action')
               - else
                 %p No files or folders.

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.2'.freeze
 end

metadata

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