decidim-initiatives 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 699b286622c83239c3a945ab5e59955165cf31a2cd3c231f8492a24e98800cb9
-  data.tar.gz: 0cb9e66e1d9cf193cd424ceaba1433ab7219883da8a54ad13ec3eadd46754be5
+  metadata.gz: 7367c256b2e86305e2685b000ac63e4133d017b19dcfd91f2b0c9c1826c2c0cf
+  data.tar.gz: f3e320a998f60d74d6055935a4142ed33d73385bf9589c03b7d531fd1dc0871c
 SHA512:
-  metadata.gz: 7cc40651ab8f1f0a4e30ed6505321ef117ce4497faf0fa33201df40cd8e558b9ea48928650222a8db4f43dbef3366599bdb563ee70f7d395835dede82c10375f
-  data.tar.gz: 0c4f048037a4799f6e27336b64ccf3ac0b356366a2389fbf9f322b47f5c6715f7d37624c09d208546e7112d9702e013ad435d1fd3b66e92b8f3c2c2e9f6ab843
+  metadata.gz: dddf33ddaee2b0b046bf4d5bae38e716534d856ed76f50774d1c2431174512942000ca8c0f63852c13ff132c6b7bc781a7000bbb1ef7e2d281d48043e789769d
+  data.tar.gz: 52ca0692d732601d4ae4b3d8acd263bdf09441995041d6683700138f9be3b23168444974422390491ea338891b9768ccaf17d9047bcaa308e5c4ca5a5a3f9e36

data/app/assets/config/admin_decidim_initiatives_manifest.js

@@ -1,3 +1,4 @@
 //= link decidim/initiatives/admin/invite_users.js
+//= link decidim/initiatives/admin/initiatives_types.js
 //= link decidim/initiatives/scoped_type.js
-//= link decidim/initiatives/print-initiative.css
+//= link decidim/initiatives/print-initiative.css

data/app/assets/javascripts/decidim/initiatives/admin/initiatives_types.js.es6

@@ -0,0 +1,20 @@
+(() => {
+  const $scope = $("#promoting-committee-details");
+
+  const $promotingCommitteeCheckbox = $(
+    "#initiatives_type_promoting_committee_enabled",
+    $scope
+  );
+
+  const toggleVisibility = () => {
+    if ($promotingCommitteeCheckbox.is(":checked")) {
+      $(".minimum-committee-members-details", $scope).show();
+    } else {
+      $(".minimum-committee-members-details", $scope).hide();
+    }
+  };
+
+  $($promotingCommitteeCheckbox).click(() => toggleVisibility());
+
+  toggleVisibility();
+})();

data/app/cells/decidim/initiatives/initiative_m/footer.erb

@@ -15,7 +15,7 @@
       <div class="card__support__data"></div>
     <% end %>
 
-    <% if model.closed? || model.offline? %>
+    <% if model.closed? || model.offline_signature_type? %>
       <%= link_to t("initiatives.initiative.check", scope: "layouts.decidim"),
                   resource_path,
                   class: "card__button button button--sc small light secondary" %>

data/app/commands/decidim/initiatives/admin/create_initiative_type.rb

@@ -40,8 +40,9 @@ module Decidim
             organization: form.current_organization,
             title: form.title,
             description: form.description,
-            online_signature_enabled: form.online_signature_enabled,
+            signature_type: form.signature_type,
             undo_online_signatures_enabled: form.undo_online_signatures_enabled,
+            promoting_committee_enabled: form.promoting_committee_enabled,
             minimum_committee_members: form.minimum_committee_members,
             banner_image: form.banner_image,
             collect_user_extra_fields: form.collect_user_extra_fields,

data/app/commands/decidim/initiatives/admin/update_initiative_type.rb

@@ -42,8 +42,9 @@ module Decidim
           result = {
             title: form.title,
             description: form.description,
-            online_signature_enabled: form.online_signature_enabled,
+            signature_type: form.signature_type,
             undo_online_signatures_enabled: form.undo_online_signatures_enabled,
+            promoting_committee_enabled: form.promoting_committee_enabled,
             minimum_committee_members: form.minimum_committee_members,
             collect_user_extra_fields: form.collect_user_extra_fields,
             extra_fields_legal_information: form.extra_fields_legal_information,
@@ -56,10 +57,8 @@ module Decidim
         end
 
         def upate_initiatives_signature_type
-          unless initiative_type.online_signature_enabled
-            initiative_type.initiatives.signature_type_updatable.each do |initiative|
-              initiative.update!(signature_type: Initiative.signature_types["offline"])
-            end
+          initiative_type.initiatives.signature_type_updatable.each do |initiative|
+            initiative.update!(signature_type: initiative_type.signature_type)
           end
         end
       end

data/app/controllers/decidim/initiatives/create_initiative_controller.rb

@@ -19,6 +19,7 @@ module Decidim
       helper_method :scopes
       helper_method :current_initiative
       helper_method :initiative_type
+      helper_method :promotal_committee_required?
 
       steps :select_initiative_type,
             :previous_form,
@@ -39,7 +40,7 @@ module Decidim
 
       private
 
-      def select_initiative_type_step(_unused)
+      def select_initiative_type_step(_parameters)
         @form = form(Decidim::Initiatives::SelectInitiativeTypeForm).instance
         session[:initiative] = {}
         render_wizard
@@ -117,7 +118,7 @@ module Decidim
       end
 
       def scopes
-        InitiativesType.find(@form.type_id).scopes.includes(:scope)
+        @scopes ||= InitiativesTypeScope.where(decidim_initiatives_types_id: @form.type_id)
       end
 
       def current_initiative
@@ -125,15 +126,18 @@ module Decidim
       end
 
       def initiative_type
-        @initiative_type ||= InitiativesType.find(@form&.type_id)
+        @initiative_type ||= InitiativesType.find(session_initiative[:type_id] || @form&.type_id)
       end
 
       def session_initiative
-        session[:initiative]&.with_indifferent_access
+        session[:initiative] ||= {}
+        session[:initiative].with_indifferent_access
       end
 
       def promotal_committee_required?
-        minimum_committee_members = InitiativesType.find(session_initiative[:type_id]).minimum_committee_members ||
+        return false unless initiative_type.promoting_committee_enabled?
+
+        minimum_committee_members = initiative_type.minimum_committee_members ||
                                     Decidim::Initiatives.minimum_committee_members
         minimum_committee_members.present? && minimum_committee_members.positive?
       end

data/app/forms/decidim/initiatives/admin/initiative_form.rb

@@ -37,7 +37,7 @@ module Decidim
 
         def map_model(model)
           self.type_id = model.type.id
-          self.decidim_scope_id = model.scope.id
+          self.decidim_scope_id = model.scope&.id
         end
 
         def signature_type_updatable?

data/app/forms/decidim/initiatives/admin/initiative_type_form.rb

@@ -12,8 +12,9 @@ module Decidim
         translatable_attribute :title, String
         translatable_attribute :description, String
         attribute :banner_image, String
-        attribute :online_signature_enabled, Boolean
+        attribute :signature_type, String
         attribute :undo_online_signatures_enabled, Boolean
+        attribute :promoting_committee_enabled, Boolean
         attribute :minimum_committee_members, Integer
         attribute :collect_user_extra_fields, Boolean
         translatable_attribute :extra_fields_legal_information, String
@@ -21,16 +22,30 @@ module Decidim
         attribute :document_number_authorization_handler, String
 
         validates :title, :description, translatable_presence: true
-        validates :online_signature_enabled, inclusion: { in: [true, false] }
-        validates :undo_online_signatures_enabled, inclusion: { in: [true, false] }
+        validates :undo_online_signatures_enabled, :promoting_committee_enabled, inclusion: { in: [true, false] }
         validates :minimum_committee_members, numericality: { only_integer: true }, allow_nil: true
-        validates :banner_image, presence: true, if: lambda { |form|
-          form.context.initiative_type.nil?
-        }
+        validates :banner_image, presence: true, if: ->(form) { form.context.initiative_type.nil? }
 
         def minimum_committee_members=(value)
           super(value.presence)
         end
+
+        def minimum_committee_members
+          return 0 unless promoting_committee_enabled?
+
+          super
+        end
+
+        def signature_type_options
+          Initiative.signature_types.keys.map do |type|
+            [
+              I18n.t(
+                type,
+                scope: %w(activemodel attributes initiative signature_type_values)
+              ), type
+            ]
+          end
+        end
       end
     end
   end

data/app/forms/decidim/initiatives/admin/initiative_type_scope_form.rb

@@ -11,7 +11,6 @@ module Decidim
         attribute :supports_required, Integer
         attribute :decidim_scopes_id, Integer
 
-        validates :decidim_scopes_id, presence: true
         validates :supports_required,
                   presence: true,
                   numericality: {

data/app/forms/decidim/initiatives/initiative_form.rb

@@ -20,16 +20,28 @@ module Decidim
       validates :title, length: { maximum: 150 }
       validates :signature_type, presence: true
       validates :type_id, presence: true
-      validates :scope_id, presence: true
+      validate :scope_exists
 
       def map_model(model)
         self.type_id = model.type.id
-        self.scope_id = model.scope.id
+        self.scope_id = model.scope&.id
       end
 
       def signature_type_updatable?
         state == "created" || state.nil?
       end
+
+      def scope_id
+        super.presence
+      end
+
+      private
+
+      def scope_exists
+        return if scope_id.blank?
+
+        errors.add(:scope_id, :invalid) unless InitiativesTypeScope.where(decidim_initiatives_types_id: type_id, decidim_scopes_id: scope_id).exists?
+      end
     end
   end
 end

data/app/helpers/decidim/initiatives/create_initiative_helper.rb

@@ -6,10 +6,17 @@ module Decidim
     module CreateInitiativeHelper
       def signature_type_options(initiative_form)
         return all_signature_type_options unless initiative_form.signature_type_updatable?
-        return online_signature_type_options unless Decidim::Initiatives.face_to_face_voting_allowed
-        return offline_signature_type_options unless online_signature_allowed?(initiative_form)
 
-        all_signature_type_options
+        type = ::Decidim::InitiativesType.find(initiative_form.type_id)
+        allowed_signatures = type.allowed_signature_types_for_initiatives
+
+        if allowed_signatures == %w(online)
+          online_signature_type_options
+        elsif allowed_signatures == %w(offline)
+          offline_signature_type_options
+        else
+          all_signature_type_options
+        end
       end
 
       private
@@ -46,14 +53,6 @@ module Decidim
           ]
         end
       end
-
-      def online_signature_allowed?(initiative_form)
-        Decidim::Initiatives.online_voting_allowed && online_signature_enabled_in_type?(initiative_form)
-      end
-
-      def online_signature_enabled_in_type?(initiative_form)
-        ::Decidim::InitiativesType.find(initiative_form.type_id).online_signature_enabled
-      end
     end
   end
 end

data/app/models/decidim/initiative.rb

@@ -18,6 +18,7 @@ module Decidim
     include Decidim::Resourceable
     include Decidim::HasReference
     include Decidim::Randomable
+    include Decidim::Searchable
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -28,8 +29,8 @@ module Decidim
                class_name: "Decidim::InitiativesTypeScope",
                inverse_of: :initiatives
 
-    delegate :type, to: :scoped_type, allow_nil: true
-    delegate :scope, to: :scoped_type, allow_nil: true
+    delegate :type, :scope, :scope_name, to: :scoped_type, allow_nil: true
+    delegate :promoting_committee_enabled?, to: :type
 
     has_many :votes,
              foreign_key: "decidim_initiative_id",
@@ -53,7 +54,7 @@ module Decidim
              dependent: :destroy,
              as: :participatory_space
 
-    enum signature_type: [:online, :offline, :any]
+    enum signature_type: [:online, :offline, :any], _suffix: true
     enum state: [:created, :validating, :discarded, :published, :rejected, :accepted]
 
     validates :title, :description, :state, presence: true
@@ -95,6 +96,16 @@ module Decidim
     after_save :notify_state_change
     after_create :notify_creation
 
+    searchable_fields({
+                        participatory_space: :itself,
+                        A: :title,
+                        D: :description,
+                        datetime: :published_at
+                      },
+                      index_on_create: ->(_initiative) { false },
+                      # is Resourceable instead of ParticipatorySpaceResourceable so we can't use `visible?`
+                      index_on_update: ->(initiative) { initiative.published? })
+
     def self.future_spaces
       none
     end
@@ -241,8 +252,8 @@ module Decidim
     end
 
     def supports_count
-      face_to_face_votes = offline_votes.nil? || online? ? 0 : offline_votes
-      digital_votes = offline? ? 0 : (initiative_votes_count + initiative_supports_count)
+      face_to_face_votes = offline_votes.nil? || online_signature_type? ? 0 : offline_votes
+      digital_votes = offline_signature_type? ? 0 : (initiative_votes_count + initiative_supports_count)
       digital_votes + face_to_face_votes
     end
 
@@ -291,15 +302,11 @@ module Decidim
     end
 
     def accepts_offline_votes?
-      Decidim::Initiatives.face_to_face_voting_allowed &&
-        (offline? || any?) &&
-        published?
+      published? && (offline_signature_type? || any_signature_type?)
     end
 
     def accepts_online_votes?
-      Decidim::Initiatives.online_voting_allowed &&
-        (online? || any?) &&
-        votes_enabled?
+      votes_enabled? && (online_signature_type? || any_signature_type?)
     end
 
     def accepts_online_unvotes?
@@ -328,7 +335,9 @@ module Decidim
     private
 
     def signature_type_allowed
-      errors.add(:signature_type, :invalid) if !published? && type.allowed_signature_types_for_initiatives.exclude?(signature_type)
+      return if published?
+
+      errors.add(:signature_type, :invalid) if type.allowed_signature_types_for_initiatives.exclude?(signature_type)
     end
 
     def notify_state_change

data/app/models/decidim/initiatives_type.rb

@@ -5,11 +5,6 @@ module Decidim
   class InitiativesType < ApplicationRecord
     include Decidim::HasResourcePermission
 
-    validates :title, :description, presence: true
-    validates :online_signature_enabled, inclusion: { in: [true, false] }
-
-    mount_uploader :banner_image, Decidim::BannerImageUploader
-
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
@@ -20,19 +15,21 @@ module Decidim
              dependent: :destroy,
              inverse_of: :type
 
-    def allowed_signature_types_for_initiatives
-      signature_types = []
+    has_many :initiatives,
+             through: :scopes,
+             class_name: "Decidim::Initiative"
 
-      signature_types << "online" if Decidim::Initiatives.online_voting_allowed && online_signature_enabled
-      signature_types << "offline" if Decidim::Initiatives.face_to_face_voting_allowed
-      signature_types << "any" if signature_types.size == (Initiative.signature_types.size - 1)
+    enum signature_type: [:online, :offline, :any], _suffix: true
 
-      signature_types
-    end
+    validates :signature_type, presence: true
+    validates :title, :description, presence: true
+
+    mount_uploader :banner_image, Decidim::BannerImageUploader
+
+    def allowed_signature_types_for_initiatives
+      return %w(online offline any) if any_signature_type?
 
-    def initiatives
-      initiatives_ids = scopes.map { |scope| scope.initiatives.pluck(:id) }.flatten
-      Initiative.where(id: initiatives_ids)
+      Array(signature_type.to_s)
     end
 
     def allow_resource_permissions?

data/app/models/decidim/initiatives_type_scope.rb

@@ -9,7 +9,8 @@ module Decidim
 
     belongs_to :scope,
                foreign_key: "decidim_scopes_id",
-               class_name: "Decidim::Scope"
+               class_name: "Decidim::Scope",
+               optional: true
 
     has_many :initiatives,
              foreign_key: "scoped_type_id",
@@ -25,7 +26,9 @@ module Decidim
     }
 
     def scope_name
-      scope&.name.presence || I18n.t("decidim.initiatives.unavailable_scope")
+      return { I18n.locale.to_s => I18n.t("decidim.scopes.global") } if decidim_scopes_id.nil?
+
+      scope&.name.presence || { I18n.locale.to_s => I18n.t("decidim.initiatives.unavailable_scope") }
     end
   end
 end

data/app/permissions/decidim/initiatives/admin/permissions.rb

@@ -140,7 +140,7 @@ module Decidim
           when :export_pdf_signatures
             toggle_allow(initiative.published? || initiative.accepted? || initiative.rejected?)
           when :export_votes
-            toggle_allow(initiative.offline? || initiative.any?)
+            toggle_allow(initiative.offline_signature_type? || initiative.any_signature_type?)
           when :accept
             allowed = initiative.published? &&
                       initiative.signature_end_date < Date.current &&
@@ -187,7 +187,7 @@ module Decidim
 
             toggle_allow(allowed)
           when :manage_membership
-            allow!
+            toggle_allow(initiative.promoting_committee_enabled?)
           else
             disallow!
           end

data/app/permissions/decidim/initiatives/permissions.rb

@@ -79,6 +79,7 @@ module Decidim
                       permission_action.action == :request_membership
 
         can_request = !initiative.published? &&
+                      initiative.promoting_committee_enabled? &&
                       !initiative.has_authorship?(user) &&
                       (
                         Decidim::Initiatives.do_not_require_authorization ||
@@ -160,7 +161,7 @@ module Decidim
       end
 
       def can_user_support?(initiative)
-        !initiative.offline? && (
+        !initiative.offline_signature_type? && (
           Decidim::Initiatives.do_not_require_authorization ||
           UserAuthorizations.for(user).any?
         )

data/app/views/decidim/initiatives/admin/initiatives/_form.html.erb

@@ -64,7 +64,7 @@
       </div>
     </div>
 
-    <% if  current_initiative.accepts_offline_votes? && current_user.admin? %>
+    <% if current_initiative.accepts_offline_votes? && current_user.admin? %>
       <div class="row">
         <div class="columns xlarge-6">
           <%= form.number_field :offline_votes, min: 1 %>

data/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb

@@ -13,15 +13,19 @@
     </div>
 
     <div class="row column">
-      <%= form.check_box :online_signature_enabled %>
+      <%= form.select :signature_type, form.object.signature_type_options %>
     </div>
 
     <div class="row column">
       <%= form.check_box :undo_online_signatures_enabled %>
     </div>
 
-    <div class="row column">
-      <%= form.number_field :minimum_committee_members, min: 0, step: 1 %>
+    <div class="row column" id="promoting-committee-details">
+      <%= form.check_box :promoting_committee_enabled %>
+
+      <div class="row column minimum-committee-members-details">
+        <%= form.number_field :minimum_committee_members, min: 0, step: 1 %>
+      </div>
     </div>
 
     <div class="row column">
@@ -56,3 +60,5 @@
 
   </div>
 </div>
+
+<%= javascript_include_tag "decidim/initiatives/admin/initiatives_types.js" %>

data/app/views/decidim/initiatives/create_initiative/fill_data.html.erb

@@ -36,15 +36,24 @@
               <%= f.editor :description, lines: 8, toolbar: :full, required: true %>
             </div>
 
-            <div class="field">
-              <%= f.select :signature_type, signature_type_options(f.object) %>
-            </div>
+            <% signature_type_options = signature_type_options(f.object) %>
+            <% if signature_type_options.length == 1 %>
+              <%= f.hidden_field :signature_type, value: signature_type_options.first.last %>
+            <% else %>
+              <div class="field">
+                <%= f.select :signature_type, signature_type_options %>
+              </div>
+            <% end %>
 
-            <div class="field">
-              <%= f.select :scope_id,
-                           scopes.map { |scoped_type| [translated_attribute(scoped_type.scope.name), scoped_type.scope.id]},
-                           prompt: t(".select_scope") %>
-            </div>
+            <% if scopes.length == 1 %>
+              <%= f.hidden_field :scope_id, value: scopes.first.scope&.id %>
+            <% else %>
+              <div class="field">
+                <%= f.select :scope_id,
+                            scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id]},
+                            prompt: t(".select_scope") %>
+              </div>
+            <% end %>
 
             <% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
               <div class="field">

data/app/views/decidim/initiatives/initiatives/_index_header.html.erb

@@ -3,7 +3,7 @@
     <%= render partial: "count" %>
   </h2>
   <% if allowed_to? :create, :initiative %>
-    <%= link_to create_initiative_path(:select_initiative_type), class: "title-action__action button small hollow" do %>
+    <%= link_to create_initiative_path(:select_initiative_type), class: "title-action__action button small" do %>
         <%= t(".new_initiative") %>
         <%= icon "plus" %>
     <% end %>

data/app/views/decidim/initiatives/initiatives/_tags.html.erb

@@ -1,4 +1,4 @@
 <ul class="tags tags--initiative">
   <li><%= link_to translated_attribute(resource.type.title), initiatives_path(filter: { type: [resource.type.id] }) %></li>
-  <li><%= link_to translated_attribute(resource.scope.name), initiatives_path(filter: { scope_id: [resource.scope.id] }) %></li>
+  <li><%= link_to translated_attribute(resource.scope_name), initiatives_path(filter: { scope_id: [resource.scope&.id] }) %></li>
 </ul>

data/app/views/decidim/initiatives/initiatives/show.html.erb

@@ -20,12 +20,12 @@ edit_link(
 <% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
 <% provide :meta_image_url, current_initiative.type.banner_image.url %>
 <div class="row">
-  <% unless current_initiative.online? %>
+  <% unless current_initiative.online_signature_type? %>
     <div class="column">
       <div class="callout secondary">
         <p>
-          <%= t ".any_vote_method" if current_initiative.any? %>
-          <%= t ".offline_method" if current_initiative.offline? %>
+          <%= t ".any_vote_method" if current_initiative.any_signature_type? %>
+          <%= t ".offline_method" if current_initiative.offline_signature_type? %>
         </p>
       </div>
     </div>

data/app/views/decidim/initiatives/initiatives/signature_identities.html.erb

@@ -9,7 +9,7 @@
                unvote_label: current_user.name,
                verification_label: current_user.name,
                steps: signature_has_steps?
-           } unless current_initiative.offline? %>
+           } unless current_initiative.offline_signature_type? %>
 
 <% Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.each do |g| %>
   <br>

data/app/views/decidim/initiatives/initiatives_type_scopes/search.html.erb

@@ -1 +1 @@
-<%= options_for_select scoped_types.map { |s| [translated_attribute(s.scope.name), s.scope.id] }, params[:selected] %>
+<%= options_for_select scoped_types.map { |s| [translated_attribute(s.scope_name), s&.scope&.id] }, params[:selected] %>

data/app/views/layouts/decidim/_initiative_creation_header.html.erb

@@ -12,6 +12,7 @@
   <div class="show-for-large">
     <ol class="wizard__steps">
       <% wizard_steps.each do |wizard_step| %>
+        <% next if wizard_step.to_s == "promotal_committee" && !promotal_committee_required? %>
         <% if step == wizard_step %>
           <li class="step--active">
             <%= t(".#{wizard_step}") %>

data/app/views/layouts/decidim/admin/initiative.html.erb

@@ -8,7 +8,7 @@
         </li>
       <% end %>
 
-      <% if allowed_to? :manage_membership, :initiative, initiative: current_participatory_space %>
+      <% if current_participatory_space.promoting_committee_enabled? && allowed_to?(:manage_membership, :initiative, initiative: current_participatory_space) %>
         <li <% if is_active_link?(decidim_admin_initiatives.initiative_committee_requests_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t(".committee_members"), decidim_admin_initiatives.initiative_committee_requests_path(current_participatory_space) %>
         </li>

data/config/locales/ca.yml

@@ -33,6 +33,7 @@ ca:
         extra_fields_legal_information: Informació legal sobre la recollida de dades personals
         minimum_committee_members: Mínim de membres de la comissió
         online_signature_enabled: S'ha activat la signatura digital
+        promoting_committee_enabled: Habilita el comitè promotor
         title: Títol
         undo_online_signatures_enabled: Permetre a les participants desfer les seves signatures digitals
         validate_sms_code_on_votes: Afegeix el pas de validació mitjançant SMS al procés de signatura

data/config/locales/cs.yml

@@ -33,6 +33,7 @@ cs:
         extra_fields_legal_information: Právní informace o shromažďování osobních údajů
         minimum_committee_members: Minimální počet členů výboru
         online_signature_enabled: Online podpis povolen
+        promoting_committee_enabled: Povolit podporu výboru
         title: Titul
         undo_online_signatures_enabled: Povolit uživatelům vrátit své podpisy online
         validate_sms_code_on_votes: Přidejte krok ověření SMS kódu do procesu podpisu

data/config/locales/en.yml

@@ -34,6 +34,7 @@ en:
         extra_fields_legal_information: Legal information about the collection of personal data
         minimum_committee_members: Minimum of committee members
         online_signature_enabled: Online signature enabled
+        promoting_committee_enabled: Enable promoting committee
         title: Title
         undo_online_signatures_enabled: Enable participants to undo their online signatures
         validate_sms_code_on_votes: Add SMS code validation step to signature process

data/config/locales/fi-plain.yml

@@ -33,6 +33,7 @@ fi-pl:
         extra_fields_legal_information: Oikeudelliset tiedot koskien henkilötietojen keräämistä
         minimum_committee_members: Komitean jäsenten vähimmäismäärä
         online_signature_enabled: Online-allekirjoitus on käytössä
+        promoting_committee_enabled: Ota käyttöön kannatuskomitea
         title: Otsikko
         undo_online_signatures_enabled: Salli käyttäjien peruuttaa verkossa tehdyt allekirjoitukset
         validate_sms_code_on_votes: Lisää tekstiviestikoodin validointivaihe allekirjoitusprosessiin

data/config/locales/fi.yml

@@ -33,6 +33,7 @@ fi:
         extra_fields_legal_information: Oikeudelliset tiedot koskien henkilötietojen keräämistä
         minimum_committee_members: Komitean jäsenten vähimmäismäärä
         online_signature_enabled: Online-allekirjoitus on käytössä
+        promoting_committee_enabled: Ota käyttöön kannatuskomitea
         title: Otsikko
         undo_online_signatures_enabled: Verkossa tehtyjen allekirjoitusten peruuttaminen käytössä
         validate_sms_code_on_votes: Lisää tekstiviestikoodin validointivaihe allekirjoitusprosessiin

data/config/locales/fr.yml

@@ -33,6 +33,7 @@ fr:
         extra_fields_legal_information: Informations juridiques sur la collecte de données personnelles
         minimum_committee_members: Minimum de membres du comité
         online_signature_enabled: Signature en ligne activée
+        promoting_committee_enabled: Activer les comités de promotion sur ce type d'initiative (témoin. s dont l'invitation par l'auteur est obligatoire pour la validation de l'initiative si cette fonctionnalité est activée)
         title: Titre
         undo_online_signatures_enabled: Autoriser les utilisateurs à annuler leurs signatures en ligne
         validate_sms_code_on_votes: Ajouter une étape de validation du code SMS au processus de signature

data/config/locales/hu.yml

@@ -33,6 +33,7 @@ hu:
         extra_fields_legal_information: Jogi információk a személyes adatok gyűjtéséről
         minimum_committee_members: Bizottsági tagok minimális száma
         online_signature_enabled: Online aláírás engedélyezve
+        promoting_committee_enabled: Előléptetési bizottság engedélyezése
         title: Cím
         undo_online_signatures_enabled: Engedélyezze a felhasználók számára az online aláírások visszavonását
         validate_sms_code_on_votes: SMS-kód érvényesítési lépés hozzáadása az aláíráshoz

data/config/locales/it.yml

@@ -33,6 +33,7 @@ it:
         extra_fields_legal_information: Informazioni legali sulla raccolta di dati personali
         minimum_committee_members: Minimo dei membri del comitato
         online_signature_enabled: Firma online abilitata
+        promoting_committee_enabled: Abilita la commissione promozionale
         title: Titolo
         undo_online_signatures_enabled: Consenti agli utenti di annullare le loro firme online
         validate_sms_code_on_votes: Aggiungi il passaggio di convalida del codice SMS al processo di firma

data/config/locales/nl.yml

@@ -33,6 +33,7 @@ nl:
         extra_fields_legal_information: Juridische informatie over het verzamelen van persoonlijke gegevens
         minimum_committee_members: Minimaal aantal commissieleden
         online_signature_enabled: Online handtekening ingeschakeld
+        promoting_committee_enabled: Inschakelen bevorderingscommissie
         title: Titel
         undo_online_signatures_enabled: Gebruikers in staat stellen hun online handtekeningen ongedaan te maken
         validate_sms_code_on_votes: Voeg een sms-codevalidatiestap toe aan het handtekeningproces

data/db/migrate/20190925145648_add_promoting_committee_option.rb

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

data/db/migrate/20191002082220_move_signature_type_to_initative_type.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class MoveSignatureTypeToInitativeType < ActiveRecord::Migration[5.2]
+  class InitiativesType < ApplicationRecord
+    self.table_name = :decidim_initiatives_types
+  end
+
+  def change
+    if !ActiveRecord::Base.connection.table_exists?("decidim_initiatives_types")
+      Rails.logger.info "Skipping migration since there's no InitiativesType table"
+      return
+    elsif InitiativesType.count.positive?
+      raise "You need to edit this migration to continue"
+    end
+
+    # This flag says when mixed and face-to-face voting methods
+    # are allowed. If set to false, only online voting will be
+    # allowed
+    # face_to_face_voting_allowed = true
+
+    add_column :decidim_initiatives_types, :signature_type, :integer, null: false, default: 0
+
+    InitiativesType.reset_column_information
+
+    Decidim::Initiatives::InitiativesType.find_each do |type|
+      type.signature_type = if type.online_signature_enabled && face_to_face_voting_allowed
+                              :any
+                            elsif type.online_signature_enabled && !face_to_face_voting_allowed
+                              :online
+                            else
+                              :offline
+                            end
+      type.save!
+    end
+
+    remove_column :decidim_initiatives_types, :online_signature_enabled
+  end
+end

data/lib/decidim/initiatives.rb

@@ -77,13 +77,6 @@ module Decidim
       true
     end
 
-    # This flag says when mixed and face-to-face voting methods
-    # are allowed. If set to false, only online voting will be
-    # allowed
-    config_accessor :face_to_face_voting_allowed do
-      true
-    end
-
     # Set a service to generate a timestamp on each vote. The
     # attribute is the name of a class whose instances are
     # initialized with a string containing the data to be
@@ -96,13 +89,6 @@ module Decidim
     # signed_pdf method with the signature added
     config_accessor :pdf_signature_service
 
-    # This flag says when mixed and online voting methods
-    # are allowed. If set to false, only offline voting will be
-    # allowed
-    config_accessor :online_voting_allowed do
-      true
-    end
-
     # This flag allows creating authorizations to unauthorized users.
     config_accessor :do_not_require_authorization do
       false

data/lib/decidim/initiatives/admin_engine.rb

@@ -79,7 +79,7 @@ module Decidim
         )
       end
 
-      initializer "decidim_assemblies.admin_menu" do
+      initializer "decidim_initiaves.admin_menu" do
         Decidim.menu :admin_menu do |menu|
           menu.item I18n.t("menu.initiatives", scope: "decidim.admin"),
                     decidim_admin_initiatives.initiatives_path,

data/lib/decidim/initiatives/participatory_space.rb

@@ -21,6 +21,7 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
   participatory_space.register_resource(:initiative) do |resource|
     resource.model_class_name = "Decidim::Initiative"
     resource.card = "decidim/initiatives/initiative"
+    resource.searchable = true
   end
 
   participatory_space.register_resource(:initiatives_type) do |resource|
@@ -85,6 +86,7 @@ Decidim.register_participatory_space(:initiatives) do |participatory_space|
       ) do
         Decidim::Initiative.create!(params)
       end
+      initiative.add_to_index_as_search_resource
 
       Decidim::Comments::Seed.comments_for(initiative)
 

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

@@ -4,21 +4,22 @@ require "decidim/faker/localized"
 require "decidim/dev"
 
 FactoryBot.define do
-  factory :initiatives_type, class: "Decidim::InitiativesType" do
+  factory :initiatives_type, class: Decidim::InitiativesType do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
     organization
-    online_signature_enabled { true }
+    signature_type { :online }
     undo_online_signatures_enabled { true }
+    promoting_committee_enabled { true }
     minimum_committee_members { 3 }
 
     trait :online_signature_enabled do
-      online_signature_enabled { true }
+      signature_type { :online }
     end
 
     trait :online_signature_disabled do
-      online_signature_enabled { false }
+      signature_type { :offline }
     end
 
     trait :undo_online_signatures_enabled do
@@ -29,6 +30,15 @@ FactoryBot.define do
       undo_online_signatures_enabled { false }
     end
 
+    trait :promoting_committee_enabled do
+      promoting_committee_enabled { true }
+    end
+
+    trait :promoting_committee_disabled do
+      promoting_committee_enabled { false }
+      minimum_committee_members { 0 }
+    end
+
     trait :with_user_extra_fields_collection do
       collect_user_extra_fields { true }
       extra_fields_legal_information { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
@@ -39,7 +49,7 @@ FactoryBot.define do
     end
   end
 
-  factory :initiatives_type_scope, class: "Decidim::InitiativesTypeScope" do
+  factory :initiatives_type_scope, class: Decidim::InitiativesTypeScope do
     type { create(:initiatives_type) }
     scope { create(:scope, organization: type.organization) }
     supports_required { 1000 }
@@ -49,7 +59,7 @@ FactoryBot.define do
     end
   end
 
-  factory :initiative, class: "Decidim::Initiative" do
+  factory :initiative, class: Decidim::Initiative do
     title { generate_localized_title }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     organization
@@ -62,7 +72,7 @@ FactoryBot.define do
 
     scoped_type do
       create(:initiatives_type_scope,
-             type: create(:initiatives_type, organization: organization))
+             type: create(:initiatives_type, organization: organization, signature_type: signature_type))
     end
 
     after(:create) do |initiative|
@@ -88,6 +98,10 @@ FactoryBot.define do
       state { "published" }
     end
 
+    trait :unpublished do
+      published_at { nil }
+    end
+
     trait :accepted do
       state { "accepted" }
     end
@@ -136,12 +150,12 @@ FactoryBot.define do
     end
   end
 
-  factory :initiative_user_vote, class: "Decidim::InitiativesVote" do
+  factory :initiative_user_vote, class: Decidim::InitiativesVote do
     initiative { create(:initiative) }
     author { create(:user, :confirmed, organization: initiative.organization) }
   end
 
-  factory :organization_user_vote, class: "Decidim::InitiativesVote" do
+  factory :organization_user_vote, class: Decidim::InitiativesVote do
     initiative { create(:initiative) }
     author { create(:user, :confirmed, organization: initiative.organization) }
     decidim_user_group_id { create(:user_group).id }
@@ -150,7 +164,7 @@ FactoryBot.define do
     end
   end
 
-  factory :initiatives_committee_member, class: "Decidim::InitiativesCommitteeMember" do
+  factory :initiatives_committee_member, class: Decidim::InitiativesCommitteeMember do
     initiative { create(:initiative) }
     user { create(:user, :confirmed, organization: initiative.organization) }
     state { "accepted" }

data/lib/decidim/initiatives/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-initiatives
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-01-08 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.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: decidim-verifications
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.20.0
 description: Citizen initiatives plugin for decidim.
 email:
 - jsperezg@gmail.com
@@ -178,6 +178,7 @@ files:
 - app/assets/config/decidim_initiatives_manifest.js
 - app/assets/images/decidim/gamification/badges/initiatives.svg
 - app/assets/images/decidim/initiatives/icon.svg
+- app/assets/javascripts/decidim/initiatives/admin/initiatives_types.js.es6
 - app/assets/javascripts/decidim/initiatives/admin/invite_users.js
 - app/assets/javascripts/decidim/initiatives/application.js
 - app/assets/javascripts/decidim/initiatives/identity_selector_dialog.js
@@ -431,6 +432,8 @@ files:
 - db/migrate/20190124170442_add_validate_sms_code_on_votes_to_initiatives_types.rb
 - db/migrate/20190125131847_add_document_number_authorization_handler_to_initiatives_types.rb
 - db/migrate/20190213184301_add_undo_online_signatures_enabled_to_initiatives_types.rb
+- db/migrate/20190925145648_add_promoting_committee_option.rb
+- db/migrate/20191002082220_move_signature_type_to_initative_type.rb
 - db/seeds/city2.jpeg
 - lib/decidim/initiatives.rb
 - lib/decidim/initiatives/admin.rb