decidim-initiatives 0.11.2 → 0.12.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b49951df772290c17d5dbbcbc158714fd9c7ae3d61367db4a14939af58d4ff
-  data.tar.gz: a235a85a56dc09c438697ef9fb40d6efcbbb5bd82dd189ba8a0a420436499131
+  metadata.gz: 2e4f368e7e323149582fc5f3b1b534f3df4960a0542e62dabd662d7f8b125712
+  data.tar.gz: 5c308bcdb44e01d2da25acffee04de184d2095953c83e43eddc70998b0c643a8
 SHA512:
-  metadata.gz: 37f74292693c899abc25c6724868399d2a5766adfeee672c883fd535c05be90d497766aee0a869139836f180a1e08f163ae42e38dcb41c33a52a64b064afdf6a
-  data.tar.gz: a2f8e3ee32fb82992e330848f809419a21e92af2281cd811b92e43e46f80fbc372b1e8830589f11524f9e3a10c9d6c1248d83a8d1fec7f9aa2a3ce7d7ab6db88
+  metadata.gz: d0ca8ef5da535026a5ff015ef53d63b128ae9c0661d272c9c661758bba7afd38382db99c60f02adaf4c61699e787551bf2a3fb06eaea4ebef5a2eab83ac59a0f
+  data.tar.gz: 92fc692caeda181328619c2ca9a95b2fc427aae50f72d1cfa847bc07f3bd392e53fa2937837cc1bfb7913b599b7d427ef8d5b3e558b8eca4f148637e1538442a

data/README.md

@@ -71,14 +71,14 @@ __Decidim::Initiatives.first_notification_percentage__ and __Decidim::Initiative
 
 Author, members of the promoter committee and followers will receive it.
 
-## Exporting online votes
+## Exporting online signatures
 
-When the supporting method is set to any or face to face it may be necessary to implement
-a mechanism to validate that do not exist duplicated supports. To do so the engine provides
-a functionality that allows exporting the online votes to validate them against physical
-votes.
+When the signature method is set to any or face to face it may be necessary to implement
+a mechanism to validate that there are no duplicated signatures. To do so the engine provides
+a functionality that allows exporting the online signatures to validate them against physical
+signatures.
 
-The votes are exported as a hash string in order to preserve the identity of the voter.
+The signatures are exported as a hash string in order to preserve the identity of the signer together with her privacy.
 Each hash is composed with the following criteria:
 
 * Algorithm used: SHA1

data/app/assets/config/decidim_initiatives_manifest.css

@@ -0,0 +1,4 @@
+/*
+ *= link decidim/initiatives/initiatives.css
+ *= link decidim/initiatives/social_share.css
+ */

data/app/assets/config/decidim_initiatives_manifest.js

@@ -1,7 +1,5 @@
 //= link decidim/initiatives/social_share.js
 //= link decidim/initiatives/application.js
-//= link decidim/initiatives/application.css
-//= link decidim/initiatives/social_share.css
 //= link decidim/initiatives/identity_selector_dialog.js
 //= link decidim/initiatives/scoped_type.js
 //= link decidim/initiatives/admin/invite_users.js

data/app/assets/stylesheet/decidim/initiatives/{application.css.scss → initiatives.scss}

@@ -1,4 +1,3 @@
-@import "decidim/editor";
 @import "popularity_item";
 @import "statistics";
 @import "admin";

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This cell renders the process card for an instance of an Initiative
+    # the default size is the Medium Card (:m)
+    class InitiativeCell < Decidim::ViewModel
+      def show
+        cell card_size, model
+      end
+
+      private
+
+      def card_size
+        "decidim/initiatives/initiative_m"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+<div class="card__author">
+  <%= cell(
+    "decidim/collapsible_list",
+    authors,
+    size: :small,
+    cell_name: "decidim/author",
+    hidden_elements_count_i18n_key: "decidim.initiatives.initiatives.author_list.hidden_authors_count",
+    cell_options: { extra_classes: ["author-data--small"] }
+  ) %>
+</div>

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

@@ -0,0 +1,28 @@
+<div class="card__footer card__footer--spaces">
+  <div class="card__support">
+    <% if model.published? %>
+      <div class="card__support__data">
+        <%= cell(
+          "decidim/progress_bar",
+          model.supports_count,
+          total: model.scoped_type.supports_required,
+          units_name: "decidim.initiatives.initiatives.signatures_count",
+          element_id: "initiative-#{model.id}-signatures-count",
+          small: true
+        ) %>
+      </div>
+    <% else %>
+      <div class="card__support__data"></div>
+    <% end %>
+
+    <% if model.closed? || model.offline? %>
+      <%= link_to t("initiatives.initiative.check", scope: "layouts.decidim"),
+                  resource_path,
+                  class: "card__button button button--sc small light secondary" %>
+    <% else %>
+      <%= link_to t("initiatives.initiative.check_and_support", scope: "layouts.decidim"),
+                  resource_path,
+                  class: "card__button button button--sc small light secondary" %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,9 @@
+<% if model.hashtag.present? %>
+  <%= link_to_if(
+    "##{model.hashtag}",
+    "https://twitter.com/hashtag/#{model.hashtag}",
+    class: "card__text--category",
+    target: "_blank"
+  ) %>
+<% end %>
+<%= render partial: "decidim/initiatives/initiatives/tags.html", locals: { resource: model } %>

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This cell renders the Medium (:m) initiative card
+    # for an given instance of an Initiative
+    class InitiativeMCell < Decidim::CardMCell
+      include Decidim::Initiatives::Engine.routes.url_helpers
+
+      property :state
+
+      private
+
+      def has_state?
+        true
+      end
+
+      def state_classes
+        case state
+        when "accepted", "published"
+          ["success"]
+        when "rejected", "discarded"
+          ["alert"]
+        when "validating"
+          ["warning"]
+        else
+          ["muted"]
+        end
+      end
+
+      def resource_path
+        initiative_path(model)
+      end
+
+      def resource_icon
+        icon "initiatives", class: "icon--big"
+      end
+
+      def authors
+        [present(model).author] +
+          model.committee_members.approved.non_deleted.map { |member| present(member.user) }
+      end
+    end
+  end
+end

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

@@ -25,8 +25,12 @@ module Decidim
         build_initiative_vote
         return broadcast(:invalid) unless vote.valid?
 
+        percentage_before = @initiative.percentage
         vote.save!
         send_notification
+        percentage_after = @initiative.reload.percentage
+
+        notify_percentage_change(percentage_before, percentage_after)
 
         broadcast(:ok, vote)
       end
@@ -52,6 +56,24 @@ module Decidim
           recipient_ids: @initiative.author.followers.pluck(:id)
         )
       end
+
+      def notify_percentage_change(before, after)
+        percentage = [25, 50, 75, 100].find do |milestone|
+          before < milestone && after >= milestone
+        end
+
+        return unless percentage
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.initiatives.milestone_completed",
+          event_class: Decidim::Initiatives::MilestoneCompletedEvent,
+          resource: @initiative,
+          recipient_ids: @initiative.followers.pluck(:id),
+          extra: {
+            percentage: percentage
+          }
+        )
+      end
     end
   end
 end

data/app/controllers/concerns/decidim/initiatives/admin/initiative_admin.rb

@@ -20,10 +20,6 @@ module Decidim
 
           alias_method :current_participatory_space, :current_initiative
         end
-
-        def current_participatory_space
-          @current_participatory_space ||= Decidim::Initiative.find_by(id: id_from_slug(params[:initiative_slug]))
-        end
       end
     end
   end

data/app/controllers/concerns/decidim/initiatives/needs_initiative.rb

@@ -1,31 +1,20 @@
 # frozen_string_literal: true
 
+require "active_support/concern"
+
 module Decidim
   module Initiatives
     # This module, when injected into a controller, ensures there's an
     # initiative available and deducts it from the context.
     module NeedsInitiative
-      def self.enhance_controller(instance_or_module)
-        instance_or_module.class_eval do
-          helper_method :current_initiative
-        end
-      end
-
-      def self.extended(base)
-        base.extend Decidim::NeedsOrganization, InstanceMethods
+      extend ActiveSupport::Concern
 
-        enhance_controller(base)
-      end
-
-      def self.included(base)
-        base.include Decidim::NeedsOrganization, InstanceMethods
-
-        enhance_controller(base)
-      end
-
-      module InstanceMethods
+      included do
+        include NeedsOrganization
         include InitiativeSlug
 
+        helper_method :current_initiative
+
         # Public: Finds the current Initiative given this controller's
         # context.
         #
@@ -34,14 +23,10 @@ module Decidim
           @current_initiative ||= detect_initiative
         end
 
-        alias current_participatory_space current_initiative
+        alias_method :current_participatory_space, :current_initiative
 
         private
 
-        def ability_context
-          super.merge(current_participatory_space: current_initiative)
-        end
-
         def detect_initiative
           request.env["current_initiative"] ||
             Initiative.find_by(
@@ -49,6 +34,16 @@ module Decidim
               organization: current_organization
             )
         end
+
+        def permission_class_chain
+          list = [
+            Decidim::Initiatives::Permissions,
+            Decidim::Admin::Permissions
+          ]
+
+          return list if permission_scope == :admin
+          list << Decidim::Permissions
+        end
       end
     end
   end

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

@@ -6,6 +6,19 @@ module Decidim
       # The main admin application controller for initiatives
       class ApplicationController < Decidim::Admin::ApplicationController
         layout "decidim/admin/initiatives"
+
+        def permissions_context
+          super.merge(
+            current_participatory_space: try(:current_participatory_space)
+          )
+        end
+
+        def permission_class_chain
+          [
+            Decidim::Initiatives::Permissions,
+            Decidim::Admin::Permissions
+          ]
+        end
       end
     end
   end

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

@@ -4,17 +4,17 @@ module Decidim
   module Initiatives
     module Admin
       # Controller in charge of managing committee membership
-      class CommitteeRequestsController < Decidim::Admin::ApplicationController
+      class CommitteeRequestsController < Decidim::Initiatives::Admin::ApplicationController
         include InitiativeAdmin
 
         # GET /admin/initiatives/:initiative_id/committee_requests
         def index
-          authorize! :index, InitiativesCommitteeMember
+          enforce_permission_to :index, :initiative_committee_member
         end
 
         # GET /initiatives/:initiative_id/committee_requests/:id/approve
         def approve
-          authorize! :approve, membership_request
+          enforce_permission_to :approve, :initiative_committee_member, request: membership_request
           membership_request.accepted!
 
           redirect_to initiative_committee_requests_path(membership_request.initiative)
@@ -22,7 +22,7 @@ module Decidim
 
         # DELETE /initiatives/:initiative_id/committee_requests/:id/revoke
         def revoke
-          authorize! :revoke, membership_request
+          enforce_permission_to :revoke, :initiative_committee_member, request: membership_request
           membership_request.rejected!
           redirect_to initiative_committee_requests_path(membership_request.initiative)
         end

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

@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     module Admin
       # Controller that allows managing all the attachments for an initiative
-      class InitiativeAttachmentsController < Decidim::Admin::ApplicationController
+      class InitiativeAttachmentsController < Decidim::Initiatives::Admin::ApplicationController
         include InitiativeAdmin
         include Decidim::Admin::Concerns::HasAttachments
 

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

@@ -15,7 +15,7 @@ module Decidim
 
         # GET /admin/initiatives
         def index
-          authorize! :list, Decidim::Initiative
+          enforce_permission_to :list, :initiative
 
           @query = params[:q]
           @state = params[:state]
@@ -32,12 +32,12 @@ module Decidim
 
         # GET /admin/initiatives/:id
         def show
-          authorize! :read, current_initiative
+          enforce_permission_to :read, :initiative, initiative: current_initiative
         end
 
         # GET /admin/initiatives/:id/edit
         def edit
-          authorize! :edit, current_initiative
+          enforce_permission_to :edit, :initiative, initiative: current_initiative
           @form = form(Decidim::Initiatives::Admin::InitiativeForm)
                   .from_model(
                     current_initiative,
@@ -49,7 +49,7 @@ module Decidim
 
         # PUT /admin/initiatives/:id
         def update
-          authorize! :update, current_initiative
+          enforce_permission_to :update, :initiative, initiative: current_initiative
 
           params[:id] = params[:slug]
           @form = form(Decidim::Initiatives::Admin::InitiativeForm)
@@ -70,7 +70,7 @@ module Decidim
 
         # POST /admin/initiatives/:id/publish
         def publish
-          authorize! :publish, current_initiative
+          enforce_permission_to :publish, :initiative, initiative: current_initiative
 
           PublishInitiative.call(current_initiative, current_user) do
             on(:ok) do
@@ -81,7 +81,7 @@ module Decidim
 
         # DELETE /admin/initiatives/:id/unpublish
         def unpublish
-          authorize! :unpublish, current_initiative
+          enforce_permission_to :unpublish, :initiative, initiative: current_initiative
 
           UnpublishInitiative.call(current_initiative, current_user) do
             on(:ok) do
@@ -92,28 +92,28 @@ module Decidim
 
         # DELETE /admin/initiatives/:id/discard
         def discard
-          authorize! :discard, current_initiative
+          enforce_permission_to :discard, :initiative, initiative: current_initiative
           current_initiative.discarded!
           redirect_to decidim_admin_initiatives.initiatives_path
         end
 
         # POST /admin/initiatives/:id/accept
         def accept
-          authorize! :accept, current_initiative
+          enforce_permission_to :accept, :initiative, initiative: current_initiative
           current_initiative.accepted!
           redirect_to decidim_admin_initiatives.initiatives_path
         end
 
         # DELETE /admin/initiatives/:id/reject
         def reject
-          authorize! :reject, current_initiative
+          enforce_permission_to :reject, :initiative, initiative: current_initiative
           current_initiative.rejected!
           redirect_to decidim_admin_initiatives.initiatives_path
         end
 
         # GET /admin/initiatives/:id/send_to_technical_validation
         def send_to_technical_validation
-          authorize! :send_to_technical_validation, current_initiative
+          enforce_permission_to :send_to_technical_validation, :initiative, initiative: current_initiative
 
           SendInitiativeToTechnicalValidation.call(current_initiative, current_user) do
             on(:ok) do
@@ -129,7 +129,7 @@ module Decidim
 
         # GET /admin/initiatives/:id/export_votes
         def export_votes
-          authorize! :export_votes, current_initiative
+          enforce_permission_to :export_votes, :initiative, initiative: current_initiative
 
           votes = current_initiative.votes.votes.map(&:sha1)
           csv_data = CSV.generate(headers: false) do |csv|