decidim-consultations 0.20.0 → 0.23.1.rc1

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20200320105916_index_foreign_keys_in_decidim_consultations_votes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimConsultationsVotes < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_consultations_votes, :decidim_user_group_id
+  end
+end

data/db/migrate/20200827154143_add_commentable_counter_cache_to_consultations.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddCommentableCounterCacheToConsultations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_consultations_questions, :comments_count, :integer, null: false, default: 0, index: true
+    Decidim::Consultations::Question.reset_column_information
+    Decidim::Consultations::Question.find_each(&:update_comments_count)
+  end
+end

data/lib/decidim/consultations/admin_engine.rb

@@ -32,6 +32,7 @@ module Decidim
             member do
               put :publish
               put :unpublish
+              get :share
             end
             resources :exports, only: :create
           end

data/lib/decidim/consultations/participatory_space.rb

@@ -10,6 +10,8 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
     Decidim::Consultation.where(organization: organization)
   end
 
+  participatory_space.query_type = "Decidim::Consultations::ConsultationType"
+
   participatory_space.context(:public) do |context|
     context.engine = Decidim::Consultations::Engine
     context.layout = "layouts/decidim/question"
@@ -47,10 +49,10 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       published_at: Time.now.utc,
       start_voting_date: Time.zone.today,
       end_voting_date: Time.zone.today + 1.month,
-      banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+      organization: organization,
+      banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
-      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
-      organization: organization
+      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id
     }
 
     active_consultation = Decidim.traceability.perform_action!(
@@ -74,10 +76,10 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       results_published_at: Time.zone.today - 1.month,
       start_voting_date: Time.zone.today - 2.months,
       end_voting_date: Time.zone.today - 1.month,
-      banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+      organization: organization,
+      banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
-      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
-      organization: organization
+      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id
     }
 
     finished_consultation = Decidim.traceability.perform_action!(
@@ -100,10 +102,10 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       published_at: Time.zone.today + 1.month,
       start_voting_date: Time.zone.today + 1.month + 1.day,
       end_voting_date: Time.zone.today + 2.months,
-      banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+      organization: organization,
+      banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
-      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
-      organization: organization
+      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id
     }
 
     upcoming_consultation = Decidim.traceability.perform_action!(
@@ -130,12 +132,12 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
           question_context: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(3)
           end,
-          hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-          banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+          organization: organization,
+          hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
+          banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
           promoter_group: Decidim::Faker::Localized.sentence(3),
           participatory_scope: Decidim::Faker::Localized.sentence(3),
-          published_at: Time.now.utc,
-          organization: organization
+          published_at: Time.now.utc
         }
 
         question = Decidim.traceability.perform_action!(
@@ -159,15 +161,15 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "city.jpeg")),
-          attached_to: question
+          attached_to: question,
+          file: File.new(File.join(seeds_root, "city.jpeg")) # Keep after attached_to
         )
 
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
-          attached_to: question
+          attached_to: question,
+          file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
         )
       end
     end

data/lib/decidim/consultations/test/factories.rb

@@ -22,6 +22,7 @@ FactoryBot.define do
     published_at { Time.current }
     start_voting_date { Time.zone.today }
     end_voting_date { Time.zone.today + 1.month }
+    introductory_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     introductory_video_url { "https://www.youtube.com/embed/zhMMW0TENNA" }
     decidim_highlighted_scope_id { create(:scope, organization: organization).id }
     results_published_at { nil }

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.20.0"
+      "0.23.1.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.23.1.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 description: Extends Decidim adding a first level public consultation component
 email:
 - jsperezg@gmail.com
@@ -131,6 +131,7 @@ files:
 - app/constraints/decidim/consultations/current_component.rb
 - app/constraints/decidim/consultations/current_question.rb
 - app/controllers/concerns/decidim/consultations/admin/consultation_admin.rb
+- app/controllers/concerns/decidim/consultations/admin/filterable.rb
 - app/controllers/concerns/decidim/consultations/admin/question_admin.rb
 - app/controllers/concerns/decidim/consultations/needs_consultation.rb
 - app/controllers/concerns/decidim/consultations/needs_question.rb
@@ -184,6 +185,8 @@ files:
 - app/queries/decidim/consultations/organization_consultations.rb
 - app/queries/decidim/consultations/organization_questions.rb
 - app/services/decidim/consultations/consultation_search.rb
+- app/types/decidim/consultations/consultation_question_type.rb
+- app/types/decidim/consultations/consultation_type.rb
 - app/views/decidim/consultations/_consultation.html.erb
 - app/views/decidim/consultations/admin/consultations/_form.html.erb
 - app/views/decidim/consultations/admin/consultations/edit.html.erb
@@ -243,35 +246,72 @@ files:
 - app/views/layouts/decidim/consultation_choose.html.erb
 - app/views/layouts/decidim/question.html.erb
 - app/views/layouts/decidim/question_multivote.html.erb
+- config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
+- config/locales/da.yml
 - config/locales/de.yml
+- config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
+- config/locales/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
+- config/locales/et.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
+- config/locales/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
+- config/locales/is-IS.yml
+- config/locales/is.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/ja.yml
+- config/locales/ko-KR.yml
+- config/locales/ko.yml
+- config/locales/lt-LT.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/mt-MT.yml
+- config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/so-SO.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/vi-VN.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20180109092205_create_decidim_consultations.rb
 - db/migrate/20180112053247_create_decidim_consultations_questions.rb
 - db/migrate/20180115132000_add_end_voting_date_to_decidim_consultations.rb
@@ -305,6 +345,8 @@ files:
 - db/migrate/20190708120345_add_response_groups_count_to_decidim_consultations_questions.rb
 - db/migrate/20190708121643_add_response_groups_to_decidim_consultations_responses.rb
 - db/migrate/20190710121122_add_free_instructions_field_to_consultations_questions.rb
+- db/migrate/20200320105916_index_foreign_keys_in_decidim_consultations_votes.rb
+- db/migrate/20200827154143_add_commentable_counter_cache_to_consultations.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -328,12 +370,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: