decidim-initiatives 0.22.0 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c17f1f5c3ad33e6ca352c73fc8e551b3e58e486a223598804acfd6819671bb31
-  data.tar.gz: b6cce6c33ad0ddb6a82473190b019a6808ddbf105fe1644df72b9589032a74b7
+  metadata.gz: 57cf106ea81ae642f11134155871a66b640f1c95a6f37094331fd20aff08c389
+  data.tar.gz: d558c3358e41320d4fb44387f3a1ba33926412c04abe9a6e6be4a014b7095df7
 SHA512:
-  metadata.gz: 077066ebe56b6f9f8fdb094afe847261f70809c23d37d79a90c75aa67107e52dad6f7d875269531198e3a28a5cbea1960484ac04ed7557e03cb4fd4b4d4dc417
-  data.tar.gz: c5eba0295d92b0be850c4ab997f2bbc3fb854641a57eb44893bbbcfbac25b6fc8a0c74bc7f5e102e1ef6b2650345e3122d74d955c63a79bea0105dbe39a5d296
+  metadata.gz: 21bdd6144f748fb7e6c90304a1f92237d1f5e59a158d9032a84ff27b6e0788b314b5382ce70268d95fe8f0878bbc2171f3aefadf3ccff13f73b9aa4285d363d2
+  data.tar.gz: de778406deee7f218ccdb2f9f91de5c429434e7d8917fa0b8f13b1ce1ff9894e096bbe0f0cb10c59a14f502334977089eb5ec8dfba1c66d8c411eec290275f94

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

@@ -6,15 +6,33 @@
     $scope
   );
 
+  const $signatureType = $("#initiatives_type_signature_type");
+
+  const $collectUserDataCheckbox = $("#initiatives_type_collect_user_extra_fields");
+
   const toggleVisibility = () => {
     if ($promotingCommitteeCheckbox.is(":checked")) {
       $(".minimum-committee-members-details", $scope).show();
     } else {
       $(".minimum-committee-members-details", $scope).hide();
     }
+
+    if ($signatureType.val() === "offline") {
+      $("#initiatives_type_undo_online_signatures_enabled").parent().parent().hide();
+    } else {
+      $("#initiatives_type_undo_online_signatures_enabled").parent().parent().show();
+    }
+
+    if ($collectUserDataCheckbox.is(":checked")) {
+      $("#initiatives_type-extra_fields_legal_information-tabs").parent().parent().show()
+    } else {
+      $("#initiatives_type-extra_fields_legal_information-tabs").parent().parent().hide()
+    }
   };
 
   $($promotingCommitteeCheckbox).click(() => toggleVisibility());
+  $($signatureType).change(() => toggleVisibility());
+  $($collectUserDataCheckbox).click(() => toggleVisibility());
 
   toggleVisibility();
 })();

data/app/assets/stylesheet/decidim/initiatives/initiatives.scss

@@ -51,3 +51,9 @@
 .legal_text{
   font-size: 8pt;
 }
+
+.progress__bar--horizontal{
+  &:last-of-type{
+    margin-bottom: 1.5rem;
+  }
+}

data/app/cells/decidim/initiatives/initiative_m_cell.rb

@@ -59,6 +59,20 @@ module Decidim
         [present(model).author] +
           model.committee_members.approved.non_deleted.excluding_author.map { |member| present(member.user) }
       end
+
+      def has_image?
+        image.present?
+      end
+
+      def image
+        @image ||= model.attachments.find do |attachment|
+          attachment.file.content_type.start_with?("image")
+        end
+      end
+
+      def resource_image_path
+        image.url if has_image?
+      end
     end
   end
 end

data/app/cells/decidim/initiatives_votes/vote/show.erb

@@ -1,30 +1,33 @@
 <br>
 <div class="initiatives-votes-table-row" style="width: 100%; display: inline-block; min-height: 33pt; border-bottom: 1pt solid black;">
-  <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
     <%= initiative_id %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
     <%= initiative_title %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
     <%= name_and_surname %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
     <%= document_number %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
     <%= date_of_birth %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
     <%= postal_code %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
     <%= time_and_date %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
     <%= timestamp %>
   </div>
-  <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
     <%= hash_id %>
   </div>
+  <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <%= scope %>
+  </div>
 </div>

data/app/cells/decidim/initiatives_votes/vote_cell.rb

@@ -37,6 +37,13 @@ module Decidim
         model.created_at
       end
 
+      def scope
+        return I18n.t("decidim.scopes.global") if model.decidim_scope_id.nil?
+        return I18n.t("decidim.initiatives.unavailable_scope") if model.scope.blank?
+
+        translated_attribute(model.scope.name)
+      end
+
       protected
 
       def encryptor

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

@@ -51,7 +51,9 @@ module Decidim
             collect_user_extra_fields: form.collect_user_extra_fields,
             extra_fields_legal_information: form.extra_fields_legal_information,
             validate_sms_code_on_votes: form.validate_sms_code_on_votes,
-            document_number_authorization_handler: form.document_number_authorization_handler
+            document_number_authorization_handler: form.document_number_authorization_handler,
+            child_scope_threshold_enabled: form.child_scope_threshold_enabled,
+            only_global_scope_enabled: form.only_global_scope_enabled
           )
 
           return initiative_type unless initiative_type.valid?

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

@@ -52,7 +52,9 @@ module Decidim
             collect_user_extra_fields: form.collect_user_extra_fields,
             extra_fields_legal_information: form.extra_fields_legal_information,
             validate_sms_code_on_votes: form.validate_sms_code_on_votes,
-            document_number_authorization_handler: form.document_number_authorization_handler
+            document_number_authorization_handler: form.document_number_authorization_handler,
+            child_scope_threshold_enabled: form.child_scope_threshold_enabled,
+            only_global_scope_enabled: form.only_global_scope_enabled
           }
 
           result[:banner_image] = form.banner_image unless form.banner_image.nil?

data/app/commands/decidim/initiatives/attachment_methods.rb

@@ -5,11 +5,14 @@ module Decidim
     module AttachmentMethods
       private
 
-      def build_attachment
+      def build_attachment(attached_to = nil)
+        attached_to = @attached_to if attached_to.blank?
+        attached_to = form.current_organization if attached_to.blank? && form.respond_to?(:current_organization)
+
         @attachment = Attachment.new(
-          title: @form.attachment.title,
-          file: @form.attachment.file,
-          attached_to: @attached_to
+          title: { I18n.locale => @form.attachment.title },
+          attached_to: attached_to,
+          file: @form.attachment.file # Define attached_to before this
         )
       end
 
@@ -26,7 +29,8 @@ module Decidim
       end
 
       def process_attachments?
-        @form.attachment && @form.attachment.file.present?
+        @form.attachment && @form.attachment.file.present? &&
+          !@form.attachment.file.is_a?(Decidim::ApplicationUploader)
       end
     end
   end

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -78,8 +78,8 @@ module Decidim
 
       def scoped_type
         InitiativesTypeScope.find_by(
-          decidim_initiatives_types_id: form.type_id,
-          decidim_scopes_id: form.scope_id
+          type: form.initiative_type,
+          scope: form.scope
         )
       end
 

data/app/commands/decidim/initiatives/unvote_initiative.rb

@@ -8,11 +8,9 @@ module Decidim
       #
       # initiative   - A Decidim::Initiative object.
       # current_user - The current user.
-      # group_id     - Decidim user group id
-      def initialize(initiative, current_user, group_id)
+      def initialize(initiative, current_user)
         @initiative = initiative
         @current_user = current_user
-        @decidim_user_group_id = group_id
       end
 
       # Executes the command. Broadcasts these events:
@@ -29,13 +27,9 @@ module Decidim
       private
 
       def destroy_initiative_vote
-        @initiative
-          .votes
-          .where(
-            author: @current_user,
-            decidim_user_group_id: @decidim_user_group_id
-          )
-          .destroy_all
+        Initiative.transaction do
+          @initiative.votes.where(author: @current_user).destroy_all
+        end
       end
     end
   end

data/app/commands/decidim/initiatives/vote_initiative.rb

@@ -7,11 +7,8 @@ module Decidim
       # Public: Initializes the command.
       #
       # form - A form object with the params.
-      # current_user - The current user.
-      def initialize(form, current_user)
+      def initialize(form)
         @form = form
-        @initiative = form.initiative
-        @current_user = current_user
       end
 
       # Executes the command. Broadcasts these events:
@@ -23,41 +20,45 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        build_initiative_vote
-        set_vote_timestamp
+        percentage_before = initiative.percentage
 
-        percentage_before = @initiative.percentage
-        vote.save!
-        send_notification
-        percentage_after = @initiative.reload.percentage
+        Initiative.transaction do
+          create_votes
+        end
+
+        percentage_after = initiative.reload.percentage
 
+        send_notification
         notify_percentage_change(percentage_before, percentage_after)
-        notify_support_threshold_reached(percentage_after)
+        notify_support_threshold_reached(percentage_before, percentage_after)
 
-        broadcast(:ok, vote)
+        broadcast(:ok, votes)
       end
 
-      attr_reader :vote
+      attr_reader :votes
 
       private
 
-      attr_reader :form, :current_user
+      attr_reader :form
 
-      def build_initiative_vote
-        @vote = @initiative.votes.build(
-          author: @current_user,
-          decidim_user_group_id: form.group_id,
-          encrypted_metadata: form.encrypted_metadata,
-          hash_id: form.hash_id
-        )
+      delegate :initiative, to: :form
+
+      def create_votes
+        @votes = form.authorized_scopes.map do |scope|
+          initiative.votes.create!(
+            author: form.signer,
+            encrypted_metadata: form.encrypted_metadata,
+            timestamp: timestamp,
+            hash_id: form.hash_id,
+            scope: scope
+          )
+        end
       end
 
-      def set_vote_timestamp
+      def timestamp
         return unless timestamp_service
 
-        @vote.assign_attributes(
-          timestamp: timestamp_service.new(document: vote.encrypted_metadata).timestamp
-        )
+        @timestamp ||= timestamp_service.new(document: form.encrypted_metadata).timestamp
       end
 
       def timestamp_service
@@ -65,13 +66,11 @@ module Decidim
       end
 
       def send_notification
-        return if vote.user_group.present?
-
         Decidim::EventsManager.publish(
           event: "decidim.events.initiatives.initiative_endorsed",
           event_class: Decidim::Initiatives::EndorseInitiativeEvent,
-          resource: @initiative,
-          followers: @initiative.author.followers
+          resource: initiative,
+          followers: initiative.author.followers
         )
       end
 
@@ -85,28 +84,29 @@ module Decidim
         Decidim::EventsManager.publish(
           event: "decidim.events.initiatives.milestone_completed",
           event_class: Decidim::Initiatives::MilestoneCompletedEvent,
-          resource: @initiative,
-          affected_users: [@initiative.author],
-          followers: @initiative.followers - [@initiative.author],
+          resource: initiative,
+          affected_users: [initiative.author],
+          followers: initiative.followers - [initiative.author],
           extra: {
             percentage: percentage
           }
         )
       end
 
-      def notify_support_threshold_reached(percentage)
-        return unless percentage >= 100
+      def notify_support_threshold_reached(before, after)
+        # Don't need to notify if threshold has already been reached
+        return if before == after || after != 100
 
         Decidim::EventsManager.publish(
           event: "decidim.events.initiatives.support_threshold_reached",
           event_class: Decidim::Initiatives::Admin::SupportThresholdReachedEvent,
-          resource: @initiative,
+          resource: initiative,
           followers: organization_admins
         )
       end
 
       def organization_admins
-        Decidim::User.where(organization: @initiative.organization, admin: true)
+        Decidim::User.where(organization: initiative.organization, admin: true)
       end
     end
   end

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

@@ -24,7 +24,6 @@ module Decidim
         def update
           enforce_permission_to :answer, :initiative, initiative: current_initiative
 
-          params[:id] = params[:slug]
           @form = form(Decidim::Initiatives::Admin::InitiativeAnswerForm)
                   .from_params(params, initiative: current_initiative)
 
@@ -35,8 +34,8 @@ module Decidim
             end
 
             on(:invalid) do
-              flash.now[:alert] = I18n.t("initiatives.update.error", scope: "decidim.initiatives.admin")
-              render :edit
+              flash[:alert] = I18n.t("initiatives.update.error", scope: "decidim.initiatives.admin")
+              redirect_to edit_initiative_answer_path
             end
           end
         end

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

@@ -136,7 +136,7 @@ module Decidim
         def export_votes
           enforce_permission_to :export_votes, :initiative, initiative: current_initiative
 
-          votes = current_initiative.votes.votes.map(&:sha1)
+          votes = current_initiative.votes.map(&:sha1)
           csv_data = CSV.generate(headers: false) do |csv|
             votes.each do |sha1|
               csv << [sha1]
@@ -152,7 +152,7 @@ module Decidim
         def export_pdf_signatures
           enforce_permission_to :export_pdf_signatures, :initiative, initiative: current_initiative
 
-          @votes = current_initiative.votes.votes
+          @votes = current_initiative.votes
 
           output = render_to_string(
             pdf: "votes_#{current_initiative.id}",

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

@@ -144,7 +144,7 @@ module Decidim
       end
 
       def scopes
-        @scopes ||= InitiativesTypeScope.where(decidim_initiatives_types_id: @form.type_id)
+        @scopes ||= @form.available_scopes
       end
 
       def current_initiative

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

@@ -20,39 +20,34 @@ module Decidim
 
       # GET /initiatives/:initiative_id/initiative_signatures/:step
       def show
-        group_id = params[:group_id] || (session[:initiative_vote_form] ||= {})["group_id"]
-        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, group_id: group_id, signature_has_steps: signature_has_steps?
+        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, signature_has_steps: signature_has_steps?
         send("#{step}_step", initiative_vote_form: session[:initiative_vote_form])
       end
 
       # PUT /initiatives/:initiative_id/initiative_signatures/:step
       def update
-        group_id = params.dig(:initiatives_vote, :group_id) || session[:initiative_vote_form]["group_id"]
-        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, group_id: group_id, signature_has_steps: signature_has_steps?
+        enforce_permission_to :sign_initiative, :initiative, initiative: current_initiative, signature_has_steps: signature_has_steps?
         send("#{step}_step", params)
       end
 
       # POST /initiatives/:initiative_id/initiative_signatures
       def create
-        group_id = params[:group_id] || session[:initiative_vote_form]&.dig("group_id")
-        enforce_permission_to :vote, :initiative, initiative: current_initiative, group_id: group_id
+        enforce_permission_to :vote, :initiative, initiative: current_initiative
+
         @form = form(Decidim::Initiatives::VoteForm)
                 .from_params(
-                  initiative_id: current_initiative.id,
-                  author_id: current_user.id,
-                  group_id: group_id
+                  initiative: current_initiative,
+                  signer: current_user
                 )
 
-        VoteInitiative.call(@form, current_user) do
+        VoteInitiative.call(@form) do
           on(:ok) do
             current_initiative.reload
             render :update_buttons_and_counters
           end
 
           on(:invalid) do
-            render json: {
-              error: I18n.t("create.error", scope: "decidim.initiatives.initiative_votes")
-            }, status: :unprocessable_entity
+            render :error_on_vote, status: :unprocessable_entity
           end
         end
       end
@@ -62,11 +57,11 @@ module Decidim
       def fill_personal_data_step(_unused)
         @form = form(Decidim::Initiatives::VoteForm)
                 .from_params(
-                  initiative_id: current_initiative.id,
-                  author_id: current_user.id,
-                  group_id: params[:group_id]
+                  initiative: current_initiative,
+                  signer: current_user
                 )
-        session[:initiative_vote_form] = { group_id: @form.group_id }
+
+        session[:initiative_vote_form] = {}
         skip_step unless initiative_type.collect_user_extra_fields
         render_wizard
       end
@@ -128,7 +123,7 @@ module Decidim
           end
         end
 
-        VoteInitiative.call(@vote_form, current_user) do
+        VoteInitiative.call(@vote_form) do
           on(:ok) do
             session[:initiative_vote_form] = {}
           end
@@ -139,25 +134,24 @@ module Decidim
             jump_to previous_step
           end
         end
+
         render_wizard
       end
 
       def build_vote_form(parameters)
         @vote_form = form(Decidim::Initiatives::VoteForm).from_params(parameters).tap do |form|
-          form.initiative_id = current_initiative.id
-          form.author_id = current_user.id
+          form.initiative = current_initiative
+          form.signer = current_user
         end
 
-        session[:initiative_vote_form] = session[:initiative_vote_form].merge(@vote_form.attributes_with_values)
+        session[:initiative_vote_form] ||= {}
+        session[:initiative_vote_form] = session[:initiative_vote_form].merge(@vote_form.attributes_with_values.except(:initiative, :signer))
       end
 
       def session_vote_form
-        raw_birth_date = session[:initiative_vote_form]["date_of_birth"]
-        return unless raw_birth_date
+        attributes = session[:initiative_vote_form].merge(initiative: current_initiative, signer: current_user)
 
-        @vote_form = form(Decidim::Initiatives::VoteForm).from_params(
-          session[:initiative_vote_form].merge("date_of_birth" => Date.parse(raw_birth_date))
-        )
+        @vote_form = form(Decidim::Initiatives::VoteForm).from_params(attributes)
       end
 
       def initiative_type