effective_committees 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 687b287a684219a3c2f0214c4639db991e8a5cb02566179c555326f4436e5a3d
-  data.tar.gz: 28fb6cf8554ada01a148d4ceac2bb2abc453f8a20c8122ba2aee226f95b7c479
+  metadata.gz: 4a528b08eb7dc0d58d450aaa85a537a2795b1eee6f2786d98c76f32fd1570fa8
+  data.tar.gz: f2d84ed3da7694d91d49035852da6a9a2da0c036fb0343845426032d178068fe
 SHA512:
-  metadata.gz: d9614f730cfc7c9bf4aa56ceb4363235e8082016273bee4c3623fac416d1ec8cdd9790f3e230bef4b20491c817ad960ff7c38c3341780dbb7136f36721f4fa0a
-  data.tar.gz: 55379c626f837d6ed6f69698c2c7cac186af00d12021c6e1e800dd3caedb39286d66f0896f3f32db6d18e0ec923293693dd7bf0b9cf87c0fbfe6302a1750138f
+  metadata.gz: 0f66144da2d5716c7a0bd7e0be84f7da454200f3b9933bfb574924b67e73cf40d12f48f6b3e2f3cb6c09253a97d437c41def61cc53a64bb79ea280cbd4fb2051
+  data.tar.gz: 7ca4214b46b4ac71deaf33e9725fd7b798ba7b511781ca99d4a999bef28f063119a8f10d776f77044763ede1b4f5b9db6d7ee2570defd98464816f00c1aa8d93

data/app/controllers/admin/committee_folders_controller.rb

@@ -5,6 +5,8 @@ module Admin
 
     include Effective::CrudController
 
+    submit :bulk_upload, 'Bulk upload'
+
     private
 
     def permitted_params

data/app/models/effective/committee_folder.rb

@@ -12,6 +12,8 @@ module Effective
     has_rich_text :body
     has_many :committee_files, -> { Effective::CommitteeFile.sorted.deep }, dependent: :destroy, inverse_of: :committee_folder
 
+    has_many_attached :files
+
     effective_resource do
       title         :string
       slug          :string
@@ -38,5 +40,9 @@ module Effective
       title.presence || 'folder'
     end
 
+    def bulk_upload!
+      files.each { |file| committee_files.create(file: file.blob) }
+      true
+    end
   end
 end

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

@@ -6,11 +6,16 @@
 
   - if inline_datatable? && inline_datatable.attributes[:committee_folder_id].present?
     = f.hidden_field :committee_folder_id
-  - elsif inline_datatable?
-    = f.select :committee_folder_id, Effective::CommitteeFolder.deep.where(committee: committee_file.committee_id), label: "Folder"
+  - elsif f.object.persisted?
+    = f.static_field :committee
+    = f.select :committee_folder_id, Effective::CommitteeFolder.where(committee: f.object.committee), label: "Folder"
   - else
-    = f.select :committee_id, Effective::Committee.sorted.all
-    = f.select :committee_folder_id, Effective::CommitteeFolder.sorted.all, label: "Folder"
+    = f.select :committee_id, Effective::Committee.sorted.all,
+      'data-load-ajax-url': effective_committees.new_admin_committee_file_path,
+      'data-load-ajax-div': '#effective-committees-ajax'
+
+    #effective-committees-ajax
+      = f.select :committee_folder_id, Effective::CommitteeFolder.where(committee: f.object.committee), label: "Folder"
 
   = f.file_field :file
   = f.text_area :notes

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

@@ -1,6 +1,8 @@
 = tabs do
   - if committee_folder.persisted?
     = tab 'Folder Files' do
+      = render('admin/committee_folders/form_bulk_upload', committee_folder: committee_folder)
+
       - datatable = Admin::EffectiveCommitteeFilesDatatable.new(committee_folder: committee_folder, committee: committee_folder.committee)
       = render_inline_datatable(datatable)
 

data/app/views/admin/committee_folders/_form_bulk_upload.html.haml

@@ -0,0 +1,3 @@
+= effective_form_with(model: [:admin, committee_folder], engine: true, autosave: true) do |f|
+  = f.file_field :files, multiple: true, label: 'Bulk upload', hint: 'Select or drag and drop multiple files to upload'
+  %div{style: 'display: none;'}= f.save 'Bulk upload'

data/app/views/admin/committee_folders/_form_committee_folder.html.haml

@@ -1,7 +1,7 @@
 = effective_form_with(model: [:admin, committee_folder], engine: true) do |f|
   - if inline_datatable?
-    = f.hidden_field :committee_id
     = f.hidden_field :committee_type
+    = f.hidden_field :committee_id
   - else
     = f.select :committee, { committees_label => Effective::Committee.sorted }, polymorphic: true
 
@@ -14,4 +14,4 @@
   - else
     = f.rich_text_area :body, hint: "Displayed on the #{committee_folder_label} page"
 
-  = effective_submit(f)
+  = f.submit

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

@@ -2,8 +2,8 @@
 
 = acts_as_slugged_fields(f, url: (effective_committees.committee_url(f.object) rescue nil))
 
-= f.check_box :display_on_index, label: "Show on the member-only #{link_to "Volunteers and Committees", effective_committees.volunteers_and_committees_path} page"
-= f.check_box :display_on_dashboard, label: "Show on the <a href='/committees'>My #{committee_label.pluralize}</a> page".html_safe
+= f.check_box :display_on_index, label: "Show on the member-only #{link_to "Volunteers and Committees", effective_committees.volunteers_and_committees_path, target: '_blank'} page"
+= f.check_box :display_on_dashboard, label: "Show on the #{link_to "My #{committee_label.pluralize}", effective_committees.committees_path, target: '_blank'} page".html_safe
 
 - if defined?(EffectiveArticleEditor)
   = f.article_editor :body, hint: "Shown on the #{committee_label} page."

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Code and Effect
@@ -202,6 +202,7 @@ files:
 - app/views/admin/committee_files/_form.html.haml
 - app/views/admin/committee_files/_form_committee_file.html.haml
 - app/views/admin/committee_folders/_form.html.haml
+- app/views/admin/committee_folders/_form_bulk_upload.html.haml
 - app/views/admin/committee_folders/_form_committee_folder.html.haml
 - app/views/admin/committee_members/_form.html.haml
 - app/views/admin/committee_members/_form_committee_member.html.haml