decidim-initiatives 0.26.0.rc2 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8915a0a9a8ad07a8ebd338377d28f6dbd434f15fd51377b8f31d3474486e827
-  data.tar.gz: 52323c7a2787dd94c7500e3a0e2ec2cf4004424ea936f0500b357a5b3ffe85eb
+  metadata.gz: 69fc6ffef72993607c5315d6493dce7779fda12587d681825afb949dc760e27f
+  data.tar.gz: f25a94094ea82027a0c9ca45f5daf620934702d516acb19a7d6c8ec69a9cec26
 SHA512:
-  metadata.gz: b16f19d31d46cb72c2a8eaa3af05eb736752426ae982ebb8d978a10e1a3b7489e51d23c03939f522f264d1e0987fdea2c0ee8ba0eea51d5be3bebdce535b8099
-  data.tar.gz: 33327b6b28864965687c96be216dd647acc987540aed7941cdbdcebd3bd61e0ee9eb12addb13024ad4a2107af1946a033cece3dbaae5efd8950120d3043435c1
+  metadata.gz: 3fe96ffb51d38cdd870106dbe109b19734c0f88b3162244d47e65424a2dc14281c4a0143c8505084ebf251677442c6d617ee0c417ced4bfe6d7e8b3de225c9b4
+  data.tar.gz: f5abf4851d109d4d1f396a2467c2990e123d26cb72213e4a13a01c4a867b713df4c6c678dbed64ed1a9972679c7d2b43a64cc345e9caeb477c55406914c95180

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

@@ -1,6 +1,6 @@
 <div class="card__footer card__footer--spaces">
   <div class="card__support">
-    <% if model.published? %>
+    <% if model.published? || model.rejected? || model.accepted? %>
       <div class="card__support__data">
         <%= cell(
           "decidim/progress_bar",

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

@@ -1,7 +1,7 @@
 <% if model.hashtag.present? %>
   <%= link_to(
     "##{hashtag}",
-    "https://twitter.com/hashtag/#{hashtag}",
+    twitter_hashtag_url(hashtag),
     class: "card__text--category",
     target: "_blank"
   ) %>

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

@@ -6,6 +6,7 @@ module Decidim
     # for an given instance of an Initiative
     class InitiativeMCell < Decidim::CardMCell
       include Decidim::Initiatives::Engine.routes.url_helpers
+      include Decidim::TwitterSearchHelper
 
       property :state
 

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

@@ -22,11 +22,6 @@ module Decidim
           @initiatives = filtered_collection
         end
 
-        # GET /admin/initiatives/:id
-        def show
-          enforce_permission_to :read, :initiative, initiative: current_initiative
-        end
-
         # GET /admin/initiatives/:id/edit
         def edit
           enforce_permission_to :edit, :initiative, initiative: current_initiative

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

@@ -19,7 +19,7 @@ module Decidim
         attribute :signature_start_date, Decidim::Attributes::LocalizedDate
         attribute :signature_end_date, Decidim::Attributes::LocalizedDate
         attribute :hashtag, String
-        attribute :offline_votes, Hash[String => Integer]
+        attribute :offline_votes, Hash[Symbol => Integer]
         attribute :state, String
         attribute :attachment, AttachmentForm
 
@@ -38,31 +38,11 @@ module Decidim
         validate :notify_missing_attachment_if_errored
         validate :area_is_not_removed
 
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/PerceivedComplexity
         def map_model(model)
           self.type_id = model.type.id
           self.decidim_scope_id = model.scope&.id
-          self.offline_votes = model.offline_votes
-
-          if offline_votes.empty?
-            self.offline_votes = model.votable_initiative_type_scopes.each_with_object({}) do |initiative_scope_type, all_votes|
-              all_votes[initiative_scope_type.decidim_scopes_id || "global"] = [0, initiative_scope_type.scope_name]
-            end
-          else
-            offline_votes.delete("total")
-            self.offline_votes = offline_votes.each_with_object({}) do |(decidim_scope_id, votes), all_votes|
-              scope_name = model.votable_initiative_type_scopes.find do |initiative_scope_type|
-                initiative_scope_type.global_scope? && decidim_scope_id == "global" ||
-                  initiative_scope_type.decidim_scopes_id == decidim_scope_id.to_i
-              end.scope_name
-
-              all_votes[decidim_scope_id || "global"] = [votes, scope_name]
-            end
-          end
+          self.offline_votes = offline_votes.empty? ? zero_offine_votes_with_scopes_names(model) : offline_votes_with_scopes_names(model)
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
-        # rubocop:enable Metrics/PerceivedComplexity
 
         def signature_type_updatable?
           @signature_type_updatable ||= begin
@@ -91,6 +71,26 @@ module Decidim
 
         private
 
+        # Private: set the in-person signatures to zero for every scope
+        def zero_offine_votes_with_scopes_names(model)
+          model.votable_initiative_type_scopes.each_with_object({}) do |initiative_scope_type, all_votes|
+            all_votes[initiative_scope_type.decidim_scopes_id&.to_s&.to_sym || "global"] = [0, initiative_scope_type.scope_name]
+          end
+        end
+
+        # Private: set the in-person signatures for every scope
+        def offline_votes_with_scopes_names(model)
+          model.offline_votes.delete("total")
+          model.offline_votes.each_with_object({}) do |(decidim_scope_id, votes), all_votes|
+            scope_name = model.votable_initiative_type_scopes.find do |initiative_scope_type|
+              initiative_scope_type.global_scope? && decidim_scope_id == "global" ||
+                initiative_scope_type.decidim_scopes_id == decidim_scope_id.to_i
+            end.scope_name
+
+            all_votes[decidim_scope_id || "global"] = [votes, scope_name]
+          end
+        end
+
         def type
           @type ||= type_id ? Decidim::InitiativesType.find(type_id) : context.initiative.type
         end

data/app/models/decidim/initiative.rb

@@ -62,8 +62,7 @@ module Decidim
     enum signature_type: [:online, :offline, :any], _suffix: true
     enum state: [:created, :validating, :discarded, :published, :rejected, :accepted]
 
-    validates :title, :description, :state, presence: true
-    validates :signature_type, presence: true
+    validates :title, :description, :state, :signature_type, presence: true
     validates :hashtag,
               uniqueness: true,
               allow_blank: true,
@@ -128,37 +127,30 @@ module Decidim
     delegate :document_number_authorization_handler, :promoting_committee_enabled?, to: :type
     delegate :type, :scope, :scope_name, to: :scoped_type, allow_nil: true
 
-    # PUBLIC banner image
-    #
-    # Overrides participatory space's banner image with the banner image defined
+    # Public: Overrides participatory space's banner image with the banner image defined
     # for the initiative type.
     #
-    # RETURNS Decidim::BannerImageUploader
+    # Returns Decidim::BannerImageUploader
     def banner_image
       type.attached_uploader(:banner_image)
     end
 
-    # PUBLIC
-    #
-    # Returns true when an initiative has been created by an individual person.
-    # False in case it has been created by an authorized organization.
+    # Public: Check if an initiative has been created by an individual person.
+    # If it's false, then it has been created by an authorized organization.
     #
-    # RETURN boolean
+    # Returns a Boolean
     def created_by_individual?
       decidim_user_group_id.nil?
     end
 
-    # PUBLIC
+    # Public: check if an initiative is open
     #
-    # RETURN boolean TRUE when the initiative is open, false in case its
-    # not closed.
+    # Returns a Boolean
     def open?
       !closed?
     end
 
-    # PUBLIC
-    #
-    # Returns when an initiative is closed. An initiative is closed when
+    # Public: Checks if an initiative is closed. An initiative is closed when
     # at least one of the following conditions is true:
     #
     # * It has been discarded.
@@ -166,17 +158,15 @@ module Decidim
     # * It has been accepted.
     # * Signature collection period has finished.
     #
-    # RETURNS BOOLEAN
+    # Returns a Boolean
     def closed?
       discarded? || rejected? || accepted? || !votes_enabled?
     end
 
-    # PUBLIC
-    #
-    # Returns the author name. If it has been created by an organization it will
+    # Public: Returns the author name. If it has been created by an organization it will
     # return the organization's name. Otherwise it will return author's name.
     #
-    # RETURN string
+    # Returns a string
     def author_name
       user_group&.name || author.name
     end
@@ -196,7 +186,7 @@ module Decidim
 
     # Public: Checks if the organization has given an answer for the initiative.
     #
-    # Returns Boolean.
+    # Returns a Boolean.
     def answered?
       answered_at.present?
     end
@@ -271,14 +261,12 @@ module Decidim
 
     # Public: Returns the percentage of required supports reached
     def percentage
-      return 100 if supports_goal_reached?
-
-      supports_count * 100 / supports_required
+      [supports_count * 100 / supports_required, 100].min
     end
 
     # Public: Whether the supports required objective has been reached
     def supports_goal_reached?
-      initiative_type_scopes.map(&:scope).all? { |scope| supports_goal_reached_for?(scope) }
+      votable_initiative_type_scopes.map(&:scope).all? { |scope| supports_goal_reached_for?(scope) }
     end
 
     # Public: Whether the supports required objective has been reached for a scope
@@ -330,9 +318,9 @@ module Decidim
     end
 
     def set_offline_votes_total
-      return if offline_votes.blank? || scope.nil?
+      return if offline_votes.blank?
 
-      offline_votes["total"] = offline_votes[scope.id.to_s]
+      offline_votes["total"] = offline_votes[scope&.id.to_s] || offline_votes["global"]
     end
 
     # Public: Finds all the InitiativeTypeScopes that are eligible to be voted by a user.
@@ -407,13 +395,11 @@ module Decidim
       nil
     end
 
-    # PUBLIC
-    #
-    # Checks if the type the initiative belongs to enables SMS code
+    # Public: Checks if the type the initiative belongs to enables SMS code
     # verification step. Tis configuration is ignored if the organization
     # doesn't have the sms authorization available
     #
-    # RETURNS boolean
+    # Returns a Boolean
     def validate_sms_code_on_votes?
       organization.available_authorizations.include?("sms") && type.validate_sms_code_on_votes?
     end
@@ -447,7 +433,7 @@ module Decidim
       type.scopes
     end
 
-    # Private: A validator that verifies the signaature type is allowed by the InitiativeType.
+    # Private: A validator that verifies the signature type is allowed by the InitiativeType.
     def signature_type_allowed
       return if published?
 

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

@@ -9,7 +9,6 @@ module Decidim
         return permission_action if permission_action.scope != :public
 
         # Non-logged users permissions
-        public_report_content_action?
         list_public_initiatives?
         read_public_initiative?
         search_initiative_types_and_scopes?
@@ -154,13 +153,6 @@ module Decidim
         toggle_allow(initiative_type.attachments_enabled?)
       end
 
-      def public_report_content_action?
-        return unless permission_action.action == :create &&
-                      permission_action.subject == :moderation
-
-        allow!
-      end
-
       def sign_initiative?
         return unless permission_action.action == :sign_initiative &&
                       permission_action.subject == :initiative

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

@@ -68,11 +68,12 @@
 
               <% if allowed_to? :read, :initiative, initiative: initiative %>
                 <%= icon_link_to "print",
-                                 decidim_admin_initiatives.initiative_path(initiative.to_param),
+                                 decidim_initiatives.print_initiative_path(initiative),
                                  t(".print",),
-                                 class: "action-icon--print" %>
-              <% else %>
-                <span class="action-space icon"></span>
+                                 class: "action-icon--print",
+                               target: :blank %>
+            <% else %>
+              <span class="action-space icon"></span>
               <% end %>
               <%= free_resource_permissions_link(initiative) || content_tag(:span, nil, class: "action-space icon") %>
             </td>

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

@@ -14,7 +14,7 @@
 
     <div class="row">
       <div class="columns xlarge-6">
-        <%= form.upload :banner_image %>
+        <%= form.upload :banner_image, optional: false %>
       </div>
     </div>
   </div>

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

@@ -27,7 +27,29 @@
                 <%= translated_attribute initiative_type.title %></td>
               <% end %>
             <td><%= l initiative_type.created_at, format: :short %></td>
-            <td class="table-list__actions"><%= free_resource_permissions_link(initiative_type) %></td>
+            <td class="table-list__actions">
+              <% if allowed_to? :update, :initiative_type, initiative_type: initiative_type %>
+                <%= icon_link_to "pencil",
+                                 edit_initiatives_type_path(initiative_type),
+                                 t("actions.configure", scope: "decidim.admin"),
+                                 class: "action-icon--edit" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
+
+              <%= free_resource_permissions_link(initiative_type) %>
+
+              <% if allowed_to? :destroy, :initiative_type, initiative_type: initiative_type %>
+                <%= icon_link_to "circle-x",
+                                 initiative_type,
+                                 t("actions.destroy", scope: "decidim.admin"),
+                                 class: "action-icon--remove",
+                                 method: :delete,
+                                 data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") } %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
+            </td>
           <% end %>
         </tbody>
       </table>

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

@@ -30,11 +30,11 @@
             <% end %>
 
             <div class="field">
-              <%= f.text_field :title, autofocus: true, required: true %>
+              <%= f.text_field :title, autofocus: true %>
             </div>
 
             <div class="field">
-              <%= f.editor :description, lines: 8, toolbar: :full, required: true %>
+              <%= f.editor :description, lines: 8, toolbar: :full %>
             </div>
 
             <% signature_type_options = signature_type_options(f.object) %>
@@ -52,6 +52,7 @@
               <div class="field">
                 <%= f.select :scope_id,
                              scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id] },
+                             required: true,
                              include_blank: t(".select_scope") %>
               </div>
             <% end %>

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

@@ -23,11 +23,11 @@
           <%= f.hidden_field :type_id %>
 
           <div class="field">
-            <%= f.text_field :title, autofocus: true, required: true %>
+            <%= f.text_field :title, autofocus: true %>
           </div>
 
           <div class="field">
-            <%= f.editor :description, lines: 8, toolbar: :full, required: true %>
+            <%= f.editor :description, lines: 8, toolbar: :full %>
           </div>
 
           <div class="actions">

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

@@ -3,7 +3,7 @@
     <% if index == 0 %>
       <%= cell(
         "decidim/progress_bar",
-        current_initiative.online_votes_count_for(type_scope.scope),
+        current_initiative.supports_count_for(type_scope.scope),
         total: type_scope.supports_required,
         units_name: "decidim.initiatives.initiatives.votes_count.count",
         element_id: "initiative-#{current_initiative.id}-votes-count",
@@ -13,7 +13,7 @@
     <% else %>
       <%= cell(
         "decidim/progress_bar",
-        current_initiative.online_votes_count_for(type_scope.scope),
+        current_initiative.supports_count_for(type_scope.scope),
         total: type_scope.supports_required,
         subtitle_text: translated_attribute(type_scope.scope_name),
         element_id: "initiative-scope-#{type_scope.id}-#{current_initiative.id}-votes-count",

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

@@ -1,7 +1,7 @@
 <%
 edit_link(
   decidim_admin_initiatives.initiatives_path,
-  :list,
+  :read,
   :initiative
 )
 %>