decidim-initiatives 0.26.8 → 0.27.0.rc1

data/db/migrate/20181003082010_fix_user_groups_ids_on_initiatives.rb

@@ -1,31 +1,16 @@
 # frozen_string_literal: true
 
 class FixUserGroupsIdsOnInitiatives < ActiveRecord::Migration[5.2]
-  class UserGroup < ApplicationRecord
-    self.table_name = :decidim_users
-    self.inheritance_column = nil # disable the default inheritance
-
-    default_scope { where(type: "Decidim::UserGroup") }
-  end
-
-  class Initiative < ApplicationRecord
-    self.table_name = :decidim_initiatives
-  end
-
-  class InitiativesVote < ApplicationRecord
-    self.table_name = :decidim_initiatives_votes
-  end
-
   # rubocop:disable Rails/SkipsModelValidations
   def change
-    UserGroup.find_each do |group|
+    Decidim::UserGroup.find_each do |group|
       old_id = group.extended_data["old_user_group_id"]
       next unless old_id
 
-      Initiative
+      Decidim::Initiative
         .where(decidim_user_group_id: old_id)
         .update_all(decidim_user_group_id: group.id)
-      InitiativesVote
+      Decidim::InitiativesVote
         .where(decidim_user_group_id: old_id)
         .update_all(decidim_user_group_id: group.id)
     end

data/db/migrate/20220518053612_add_comments_enabled_to_initiative_types.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddCommentsEnabledToInitiativeTypes < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_initiatives_types, :comments_enabled, :boolean, null: false, default: true
+  end
+end

data/db/migrate/20220527130640_create_decidim_initiatives_settings.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CreateDecidimInitiativesSettings < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_initiatives_settings do |t|
+      t.string :initiatives_order, default: "random"
+      t.references :decidim_organization, foreign_key: true, index: true
+    end
+  end
+end

data/lib/decidim/initiatives/admin_engine.rb

@@ -19,6 +19,8 @@ module Decidim
           resources :initiatives_type_scopes, except: [:index, :show]
         end
 
+        resources :initiatives_settings, only: [:edit, :update], controller: "initiatives_settings"
+
         resources :initiatives, only: [:index, :edit, :update], param: :slug do
           member do
             get :send_to_technical_validation
@@ -88,8 +90,7 @@ module Decidim
                         decidim_admin_initiatives.initiatives_path,
                         icon_name: "chat",
                         position: 2.4,
-                        active: is_active_link?(decidim_admin_initiatives.initiatives_path) ||
-                                is_active_link?(decidim_admin_initiatives.initiatives_types_path),
+                        active: :inclusive,
                         if: allowed_to?(:enter, :space_area, space_name: :initiatives)
         end
       end
@@ -160,6 +161,20 @@ module Decidim
                         decidim_admin_initiatives.initiatives_types_path,
                         active: is_active_link?(decidim_admin_initiatives.initiatives_types_path),
                         if: allowed_to?(:manage, :initiative_type)
+
+          menu.add_item :initiatives_settings,
+                        I18n.t("menu.initiatives_settings", scope: "decidim.admin"),
+                        decidim_admin_initiatives.edit_initiatives_setting_path(
+                          Decidim::InitiativesSettings.find_or_create_by!(
+                            organization: current_organization
+                          )
+                        ),
+                        active: is_active_link?(
+                          decidim_admin_initiatives.edit_initiatives_setting_path(
+                            Decidim::InitiativesSettings.find_or_create_by!(organization: current_organization)
+                          )
+                        ),
+                        if: allowed_to?(:update, :initiatives_settings)
         end
       end
     end

data/lib/decidim/initiatives/engine.rb

@@ -89,8 +89,7 @@ module Decidim
                         I18n.t("menu.initiatives", scope: "decidim"),
                         decidim_initiatives.initiatives_path,
                         position: 2.4,
-                        active: %r{^/(initiatives|create_initiative)},
-                        if: !Decidim::InitiativesType.joins(:scopes).where(organization: current_organization).all.empty?
+                        active: :inclusive
         end
       end
 

data/lib/decidim/initiatives/participatory_space.rb

@@ -61,7 +61,7 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
         title: Decidim::Faker::Localized.sentence(word_count: 5),
         description: Decidim::Faker::Localized.sentence(word_count: 25),
         organization: organization,
-        banner_image: ActiveStorage::Blob.create_after_upload!(
+        banner_image: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city2.jpeg")),
           filename: "banner_image.jpeg",
           content_type: "image/jpeg",
@@ -90,7 +90,7 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
         signature_type: "online",
         signature_start_date: Date.current - 7.days,
         signature_end_date: Date.current + 7.days,
-        published_at: Time.current - 7.days,
+        published_at: 7.days.ago,
         author: Decidim::User.reorder(Arel.sql("RANDOM()")).first,
         organization: organization
       }
@@ -112,7 +112,7 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: initiative,
         content_type: "image/jpeg",
-        file: ActiveStorage::Blob.create_after_upload!(
+        file: ActiveStorage::Blob.create_and_upload!(
           io: File.open(File.join(seeds_root, "city.jpeg")),
           filename: "city.jpeg",
           content_type: "image/jpeg",

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

@@ -8,7 +8,14 @@ FactoryBot.define do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     organization
-    banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
+    # Keep banner_image after organization
+    banner_image do
+      ActiveStorage::Blob.create_and_upload!(
+        io: File.open(Decidim::Dev.test_file("city2.jpeg", "image/jpeg")),
+        filename: "city2.jpeg",
+        content_type: "image/jpeg"
+      ).signed_id
+    end
     signature_type { :online }
     attachments_enabled { true }
     undo_online_signatures_enabled { true }
@@ -18,6 +25,11 @@ FactoryBot.define do
     minimum_committee_members { 3 }
     child_scope_threshold_enabled { false }
     only_global_scope_enabled { false }
+    comments_enabled { true }
+
+    trait :with_comments_disabled do
+      comments_enabled { false }
+    end
 
     trait :attachments_enabled do
       attachments_enabled { true }
@@ -264,4 +276,25 @@ FactoryBot.define do
       state { "rejected" }
     end
   end
+
+  factory :initiatives_settings, class: "Decidim::InitiativesSettings" do
+    initiatives_order { "random" }
+    organization
+
+    trait :most_recent do
+      initiatives_order { "date" }
+    end
+
+    trait :most_signed do
+      initiatives_order { "signatures" }
+    end
+
+    trait :most_commented do
+      initiatives_order { "comments" }
+    end
+
+    trait :most_recently_published do
+      initiatives_order { "publication_date" }
+    end
+  end
 end

data/lib/decidim/initiatives/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-initiatives version.
   module Initiatives
     def self.version
-      "0.26.8"
+      "0.27.0.rc1"
     end
   end
 end

data/lib/gem_overrides/origami/date.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: false
+
+module Origami
+  class Date < LiteralString
+    def self.parse(str)
+      #:nodoc:
+      raise InvalidDateError, "Not a valid Date string" unless str =~ REGEXP_TOKEN
+
+      date =
+        {
+          year: $~['year'].to_i
+        }
+
+      date[:month] = $~['month'].to_i if $~['month']
+      date[:day] = $~['day'].to_i if $~['day']
+      date[:hour] = $~['hour'].to_i if $~['hour']
+      date[:min] = $~['min'].to_i if $~['min']
+      date[:sec] = $~['sec'].to_i if $~['sec']
+
+      if %w[+ -].include?($~['ut'])
+        utc_offset = $~['ut_hour_off'].to_i * 3600 + $~['ut_min_off'].to_i * 60
+        utc_offset = -utc_offset if $~['ut'] == '-'
+
+        date[:utc_offset] = utc_offset
+      end
+
+      Origami::Date.new(**date)
+    end
+
+    def self.now
+      now = Time.now.utc
+
+      date =
+        {
+          year: now.strftime("%Y").to_i,
+          month: now.strftime("%m").to_i,
+          day: now.strftime("%d").to_i,
+          hour: now.strftime("%H").to_i,
+          min: now.strftime("%M").to_i,
+          sec: now.strftime("%S").to_i,
+          utc_offset: now.utc_offset
+        }
+
+      Origami::Date.new(**date)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.26.8
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2022-06-27 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.26.8
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: origami
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: virtus-multiparams
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: wicked
   requirement: !ruby/object:Gem::Requirement
@@ -142,29 +128,15 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
-- !ruby/object:Gem::Dependency
-  name: decidim-meetings
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.26.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.26.8
-description: Citizen initiatives plugin for decidim.
+        version: 0.27.0.rc1
+description: Participants initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
 executables: []
@@ -194,6 +166,7 @@ files:
 - app/commands/decidim/initiatives/admin/update_initiative_answer.rb
 - app/commands/decidim/initiatives/admin/update_initiative_type.rb
 - app/commands/decidim/initiatives/admin/update_initiative_type_scope.rb
+- app/commands/decidim/initiatives/admin/update_initiatives_settings.rb
 - app/commands/decidim/initiatives/approve_membership_request.rb
 - app/commands/decidim/initiatives/attachment_methods.rb
 - app/commands/decidim/initiatives/create_initiative.rb
@@ -218,10 +191,10 @@ files:
 - app/controllers/decidim/initiatives/admin/committee_requests_controller.rb
 - app/controllers/decidim/initiatives/admin/component_permissions_controller.rb
 - app/controllers/decidim/initiatives/admin/components_controller.rb
-- app/controllers/decidim/initiatives/admin/exports_controller.rb
 - app/controllers/decidim/initiatives/admin/initiative_attachments_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_permissions_controller.rb
+- app/controllers/decidim/initiatives/admin/initiatives_settings_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_type_scopes_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_types_controller.rb
 - app/controllers/decidim/initiatives/admin/initiatives_types_permissions_controller.rb
@@ -253,6 +226,7 @@ files:
 - app/forms/decidim/initiatives/admin/initiative_form.rb
 - app/forms/decidim/initiatives/admin/initiative_type_form.rb
 - app/forms/decidim/initiatives/admin/initiative_type_scope_form.rb
+- app/forms/decidim/initiatives/admin/initiatives_settings_form.rb
 - app/forms/decidim/initiatives/committee_member_form.rb
 - app/forms/decidim/initiatives/initiative_form.rb
 - app/forms/decidim/initiatives/previous_form.rb
@@ -260,14 +234,15 @@ files:
 - app/forms/decidim/initiatives/vote_form.rb
 - app/helpers/decidim/initiatives/admin/initiatives_helper.rb
 - app/helpers/decidim/initiatives/application_helper.rb
+- app/helpers/decidim/initiatives/create_initiative_helper.rb
 - app/helpers/decidim/initiatives/initiative_helper.rb
 - app/helpers/decidim/initiatives/initiatives_helper.rb
-- app/helpers/decidim/initiatives/signature_type_options_helper.rb
 - app/jobs/decidim/initiatives/export_initiatives_job.rb
 - app/mailers/decidim/initiatives/initiatives_mailer.rb
 - app/models/concerns/decidim/initiatives/has_area.rb
 - app/models/decidim/initiative.rb
 - app/models/decidim/initiatives_committee_member.rb
+- app/models/decidim/initiatives_settings.rb
 - app/models/decidim/initiatives_type.rb
 - app/models/decidim/initiatives_type_scope.rb
 - app/models/decidim/initiatives_vote.rb
@@ -294,6 +269,8 @@ files:
 - app/permissions/decidim/initiatives/permissions.rb
 - app/presenters/decidim/initiative_presenter.rb
 - app/presenters/decidim/initiatives/admin_log/initiative_presenter.rb
+- app/presenters/decidim/initiatives/admin_log/initiatives_settings_presenter.rb
+- app/presenters/decidim/initiatives/admin_log/initiatives_type_presenter.rb
 - app/presenters/decidim/initiatives/initiative_stats_presenter.rb
 - app/queries/decidim/initiatives/admin/admin_users.rb
 - app/queries/decidim/initiatives/admin/manageable_initiatives.rb
@@ -324,6 +301,8 @@ files:
 - app/views/decidim/initiatives/admin/initiatives/edit.html.erb
 - app/views/decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb
 - app/views/decidim/initiatives/admin/initiatives/index.html.erb
+- app/views/decidim/initiatives/admin/initiatives_settings/_form.html.erb
+- app/views/decidim/initiatives/admin/initiatives_settings/edit.html.erb
 - app/views/decidim/initiatives/admin/initiatives_type_scopes/_form.html.erb
 - app/views/decidim/initiatives/admin/initiatives_type_scopes/edit.html.erb
 - app/views/decidim/initiatives/admin/initiatives_type_scopes/new.html.erb
@@ -391,7 +370,6 @@ files:
 - app/views/layouts/decidim/initiative_creation.html.erb
 - app/views/layouts/decidim/initiative_signature_creation.html.erb
 - config/assets.rb
-- config/environment.rb
 - config/initializers/wicked_pdf.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
@@ -415,7 +393,6 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
-- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -424,7 +401,6 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
-- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -433,13 +409,10 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
-- config/locales/ka-GE.yml
-- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
-- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -447,7 +420,6 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
-- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -527,6 +499,8 @@ files:
 - db/migrate/20200528151456_remove_user_groups_from_initiative_votes.rb
 - db/migrate/20200827154214_add_commentable_counter_cache_to_initiatives.rb
 - db/migrate/20210310120720_add_followable_counter_cache_to_initiatives.rb
+- db/migrate/20220518053612_add_comments_enabled_to_initiative_types.rb
+- db/migrate/20220527130640_create_decidim_initiatives_settings.rb
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
 - lib/decidim/api/initiative_api_type.rb
@@ -545,6 +519,7 @@ files:
 - lib/decidim/initiatives/query_extensions.rb
 - lib/decidim/initiatives/test/factories.rb
 - lib/decidim/initiatives/version.rb
+- lib/gem_overrides/origami/date.rb
 - lib/tasks/decidim_initiatives.rake
 homepage: https://github.com/decidim/decidim
 licenses:
@@ -558,14 +533,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim initiatives module

data/app/controllers/decidim/initiatives/admin/exports_controller.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Initiatives
-    module Admin
-      # This controller allows exporting things.
-      # It is targeted for customizations for exporting things that lives under
-      # a participatory process.
-      class ExportsController < Decidim::Admin::ExportsController
-        include InitiativeAdmin
-      end
-    end
-  end
-end

data/config/locales/fa-IR.yml

@@ -1 +0,0 @@
-fa:

data/config/locales/gn-PY.yml

@@ -1 +0,0 @@
-gn:

data/config/locales/ka-GE.yml

@@ -1 +0,0 @@
-ka:

data/config/locales/kaa.yml

@@ -1 +0,0 @@
-kaa:

data/config/locales/lo-LA.yml

@@ -1 +0,0 @@
-lo:

data/config/locales/oc-FR.yml

@@ -1 +0,0 @@
-oc: