decidim-initiatives 0.9.1 → 0.11.0.pre1

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

@@ -5,7 +5,7 @@ module Decidim
     # Helper functions for initiatives views
     module InitiativesHelper
       def initiatives_filter_form_for(filter)
-        content_tag :div, class: 'filters' do
+        content_tag :div, class: "filters" do
           form_for filter,
                    builder: Decidim::Initiatives::InitiativesFilterFormBuilder,
                    url: url_for,

data/app/mailers/decidim/initiatives/initiatives_mailer.rb

@@ -4,7 +4,9 @@ module Decidim
   module Initiatives
     # Mailer for initiatives engine.
     class InitiativesMailer < Decidim::ApplicationMailer
-      extend Decidim::Initiatives::PartialTranslationsHelper
+      include Decidim::TranslatableAttributes
+
+      add_template_helper Decidim::TranslatableAttributes
 
       # Notifies initiative creation
       def notify_creation(initiative)
@@ -13,8 +15,8 @@ module Decidim
 
         with_user(initiative.author) do
           @subject = I18n.t(
-            'decidim.initiatives.initiatives_mailer.creation_subject',
-            title: partially_translated_attribute(initiative.title)
+            "decidim.initiatives.initiatives_mailer.creation_subject",
+            title: translated_attribute(initiative.title)
           )
 
           mail(to: "#{initiative.author.name} <#{initiative.author.email}>", subject: @subject)
@@ -27,14 +29,14 @@ module Decidim
 
         with_user(user) do
           @subject = I18n.t(
-            'decidim.initiatives.initiatives_mailer.status_change_for',
-            title: partially_translated_attribute(initiative.title)
+            "decidim.initiatives.initiatives_mailer.status_change_for",
+            title: translated_attribute(initiative.title)
           )
 
           @body = I18n.t(
-            'decidim.initiatives.initiatives_mailer.status_change_body_for',
-            title: partially_translated_attribute(initiative.title),
-            state: I18n.t(initiative.state, scope: 'decidim.initiatives.admin_states')
+            "decidim.initiatives.initiatives_mailer.status_change_body_for",
+            title: translated_attribute(initiative.title),
+            state: I18n.t(initiative.state, scope: "decidim.initiatives.admin_states")
           )
 
           @link = initiative_url(initiative, host: @organization.host)
@@ -50,12 +52,12 @@ module Decidim
 
         with_user(user) do
           @subject = I18n.t(
-            'decidim.initiatives.initiatives_mailer.technical_validation_for',
-            title: partially_translated_attribute(initiative.title)
+            "decidim.initiatives.initiatives_mailer.technical_validation_for",
+            title: translated_attribute(initiative.title)
           )
           @body = I18n.t(
-            'decidim.initiatives.initiatives_mailer.technical_validation_body_for',
-            title: partially_translated_attribute(initiative.title)
+            "decidim.initiatives.initiatives_mailer.technical_validation_body_for",
+            title: translated_attribute(initiative.title)
           )
 
           mail(to: "#{user.name} <#{user.email}>", subject: @subject)
@@ -69,14 +71,14 @@ module Decidim
 
         with_user(user) do
           @body = I18n.t(
-            'decidim.initiatives.initiatives_mailer.progress_report_body_for',
-            title: partially_translated_attribute(initiative.title),
+            "decidim.initiatives.initiatives_mailer.progress_report_body_for",
+            title: translated_attribute(initiative.title),
             percentage: initiative.percentage
           )
 
           @subject = I18n.t(
-            'decidim.initiatives.initiatives_mailer.progress_report_for',
-            title: partially_translated_attribute(initiative.title)
+            "decidim.initiatives.initiatives_mailer.progress_report_for",
+            title: translated_attribute(initiative.title)
           )
 
           mail(to: "#{user.name} <#{user.email}>", subject: @subject)

data/app/models/decidim/initiative.rb

@@ -11,6 +11,9 @@ module Decidim
     include Decidim::Comments::Commentable
     include Decidim::Followable
     include Decidim::HasAttachments
+    include Decidim::HasAttachmentCollections
+    include Decidim::Traceable
+    include Decidim::Loggable
     include Decidim::Initiatives::InitiativeSlug
 
     belongs_to :organization,
@@ -27,7 +30,8 @@ module Decidim
 
     has_many :votes,
              foreign_key: "decidim_initiative_id",
-             class_name: "Decidim::InitiativesVote", dependent: :destroy,
+             class_name: "Decidim::InitiativesVote",
+             dependent: :destroy,
              inverse_of: :initiative
 
     has_many :committee_members,
@@ -36,7 +40,7 @@ module Decidim
              dependent: :destroy,
              inverse_of: :initiative
 
-    has_many :features, as: :participatory_space
+    has_many :components, as: :participatory_space, dependent: :destroy
 
     # This relationship exists only by compatibility reasons.
     # Initiatives are not intended to have categories.
@@ -77,7 +81,7 @@ module Decidim
     scope :order_by_supports, -> { order("initiative_votes_count + coalesce(offline_votes, 0) desc") }
     scope :order_by_most_commented, lambda {
       select("decidim_initiatives.*")
-        .joins(%q(LEFT OUTER JOIN "decidim_comments_comments" ON "decidim_comments_comments"."decidim_commentable_id" = "decidim_initiatives"."id" AND "decidim_comments_comments"."decidim_commentable_type" = 'Decidim::Initiative'))
+        .left_joins(:comments)
         .group("decidim_initiatives.id")
         .order("count(decidim_comments_comments.id) desc")
     }
@@ -92,6 +96,10 @@ module Decidim
       end
     end
 
+    def self.log_presenter_class_for(_log)
+      Decidim::Initiatives::AdminLog::InitiativePresenter
+    end
+
     # PUBLIC
     #
     # Returns true when an initiative has been created by an individual person.
@@ -181,12 +189,12 @@ module Decidim
       true
     end
 
-    # Public: Publishes this feature
+    # Public: Publishes this initiative
     #
     # Returns true if the record was properly saved, false otherwise.
     def publish!
       return false if published?
-      update_attributes(
+      update(
         published_at: Time.current,
         state: "published",
         signature_start_time: DateTime.now.utc,
@@ -195,12 +203,12 @@ module Decidim
     end
 
     #
-    # Public: Unpublishes this feature
+    # Public: Unpublishes this initiative
     #
     # Returns true if the record was properly saved, false otherwise.
     def unpublish!
       return false unless published?
-      update_attributes(published_at: nil, state: "discarded")
+      update(published_at: nil, state: "discarded")
     end
 
     # Public: Returns wether the signature interval is already defined or not.

data/app/models/decidim/initiatives/abilities/admin/attachments_ability.rb

@@ -25,6 +25,7 @@ module Decidim
 
           def define_abilities
             return if user.admin?
+            return unless context[:current_participatory_space].is_a? Initiative
 
             can :read, Decidim::Attachment do |attachment|
               attachment.attached_to.is_a?(Decidim::Initiative) &&

data/app/models/decidim/initiatives/abilities/admin/{features_ability.rb → components_ability.rb}

@@ -4,10 +4,9 @@ module Decidim
   module Initiatives
     module Abilities
       module Admin
-        # Defines the abilities related to user able to administer features
-        # for an initiative.
+        # Defines the abilities related to user able to administer components for an initiative.
         # Intended to be used with `cancancan`.
-        class FeaturesAbility
+        class ComponentsAbility
           include CanCan::Ability
 
           attr_reader :user, :context

data/app/models/decidim/initiatives_vote.rb

@@ -5,7 +5,7 @@ require "digest/sha1"
 module Decidim
   # Initiatives can be voted by users and supported by organizations.
   class InitiativesVote < ApplicationRecord
-    include Decidim::Initiatives::PartialTranslationsHelper
+    include Decidim::TranslatableAttributes
 
     belongs_to :author,
                foreign_key: "decidim_author_id",
@@ -34,8 +34,8 @@ module Decidim
     def sha1
       return unless decidim_user_group_id.nil?
 
-      title = partially_translated_attribute(initiative.title)
-      description = partially_translated_attribute(initiative.description)
+      title = translated_attribute(initiative.title)
+      description = translated_attribute(initiative.description)
 
       Digest::SHA1.hexdigest "#{authorization_unique_id}#{title}#{description}"
     end

data/app/presenters/decidim/initiatives/admin_log/initiative_presenter.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Initiative`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    InitiativePresenter.new(action_log, view_helpers).present
+      class InitiativePresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "publish", "unpublish", "update", "send_to_technical_validation"
+            "decidim.initiatives.admin_log.initiative.#{action}"
+          else
+            super
+          end
+        end
+
+        def diff_fields_mapping
+          {
+            state: :string,
+            published_at: :date,
+            signature_start_time: :date,
+            signature_end_time: :date,
+            description: :i18n,
+            title: :i18n,
+            hashtag: :string
+          }
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.initiatives"
+        end
+
+        def has_diff?
+          %w(publish unpublish send_to_technical_validation).include?(action) || super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/initiatives/initiative_stats_presenter.rb

@@ -24,7 +24,7 @@ module Decidim
           "initiative/#{initiative.id}/meetings_count",
           expires_in: Decidim::Initiatives.stats_cache_expiration_time
         ) do
-          Decidim::Meetings::Meeting.where(feature: meetings_feature).count
+          Decidim::Meetings::Meeting.where(component: meetings_component).count
         end
       end
 
@@ -34,7 +34,7 @@ module Decidim
           expires_in: Decidim::Initiatives.stats_cache_expiration_time
         ) do
           result = 0
-          Decidim::Meetings::Meeting.where(feature: meetings_feature).each do |meeting|
+          Decidim::Meetings::Meeting.where(component: meetings_component).each do |meeting|
             result += meeting.attendees_count || 0
           end
 
@@ -44,8 +44,8 @@ module Decidim
 
       private
 
-      def meetings_feature
-        @meetings_feature ||= Decidim::Feature.find_by(participatory_space: initiative, manifest_name: "meetings")
+      def meetings_component
+        @meetings_component ||= Decidim::Component.find_by(participatory_space: initiative, manifest_name: "meetings")
       end
     end
   end

data/app/queries/decidim/initiatives/admin/manageable_initiatives.rb

@@ -47,14 +47,14 @@ module Decidim
           return base if q.blank?
 
           organization.available_locales.each_with_index do |loc, index|
-            if index.zero?
-              base = base.where('title->>? ilike ?', loc, "#{q}%")
-                         .or(Initiative.where('description->>? ilike ?', loc, "#{q}%"))
-            else
-              base = base
-                     .or(Initiative.where('title->>? ilike ?', loc, "#{q}%"))
-                     .or(Initiative.where('description->>? ilike ?', loc, "#{q}%"))
-            end
+            base = if index.zero?
+                     base.where("title->>? ilike ?", loc, "#{q}%")
+                         .or(Initiative.where("description->>? ilike ?", loc, "#{q}%"))
+                   else
+                     base
+                       .or(Initiative.where("title->>? ilike ?", loc, "#{q}%"))
+                       .or(Initiative.where("description->>? ilike ?", loc, "#{q}%"))
+                   end
           end
 
           base

data/app/queries/decidim/initiatives/freetext_initiative_types.rb

@@ -32,7 +32,7 @@ module Decidim
 
         InitiativesType
           .where(organization: @organization)
-          .where('title->>? ilike ?', @lang, "#{@text}%")
+          .where("title->>? ilike ?", @lang, "#{@text}%")
       end
     end
   end

data/app/queries/decidim/initiatives/initiatives_created.rb

@@ -26,4 +26,4 @@ module Decidim
       end
     end
   end
-end
+end

data/app/queries/decidim/initiatives/initiatives_promoted.rb

@@ -24,9 +24,9 @@ module Decidim
       def query
         Initiative
           .joins(:committee_members)
-          .where('decidim_initiatives_committee_members.state = 2')
-          .where('decidim_initiatives_committee_members.decidim_users_id = ?', user.id)
+          .where("decidim_initiatives_committee_members.state = 2")
+          .where("decidim_initiatives_committee_members.decidim_users_id = ?", user.id)
       end
     end
   end
-end
+end

data/app/queries/decidim/initiatives/outdated_validating_initiatives.rb

@@ -16,14 +16,14 @@ module Decidim
       #
       # period_length - Maximum time in validating state
       def initialize(period_length)
-        @period_length = DateTime.now - period_length
+        @period_length = DateTime.current - period_length
       end
 
       # Retrieves the available initiative types for the given organization.
       def query
         Decidim::Initiative
-          .where(state: 'validating')
-          .where('updated_at < ?', @period_length)
+          .where(state: "validating")
+          .where("updated_at < ?", @period_length)
       end
     end
   end

data/app/queries/decidim/initiatives/support_period_finished_initiatives.rb

@@ -10,9 +10,9 @@ module Decidim
       def query
         Decidim::Initiative
           .includes(:scoped_type)
-          .where(state: 'published')
-          .where(signature_type: 'online')
-          .where('signature_end_time < ?', DateTime.now)
+          .where(state: "published")
+          .where(signature_type: "online")
+          .where("signature_end_time < ?", DateTime.current)
       end
     end
   end

data/app/services/decidim/initiatives/initiative_search.rb

@@ -34,7 +34,7 @@ module Decidim
       # Handle the state filter
       def search_state
         case state
-        when 'closed'
+        when "closed"
           query.closed
         else # Assume open
           query.open
@@ -42,18 +42,18 @@ module Decidim
       end
 
       def search_type
-        return query if type == 'all'
+        return query if type == "all"
 
         query
           .joins(:scoped_type)
           .where(
-            'decidim_initiatives_type_scopes.decidim_initiatives_types_id = ?',
+            "decidim_initiatives_type_scopes.decidim_initiatives_types_id = ?",
             type
           )
       end
 
       def search_author
-        if author == 'myself' && options[:current_user]
+        if author == "myself" && options[:current_user]
           query.where(decidim_author_id: options[:current_user].id)
         else
           query
@@ -65,7 +65,7 @@ module Decidim
         query
           .joins(:scoped_type)
           .where(
-            'decidim_initiatives_type_scopes.decidim_scopes_id': scope_id
+            "decidim_initiatives_type_scopes.decidim_scopes_id": scope_id
           )
       end
     end

data/app/services/decidim/initiatives/progress_notifier.rb

@@ -33,4 +33,4 @@ module Decidim
       end
     end
   end
-end
+end

data/app/services/decidim/initiatives/status_change_notifier.rb

@@ -26,14 +26,8 @@ module Decidim
       def notify
         notify_initiative_creation if initiative.created?
         notify_validating_initiative if initiative.validating?
-
-        if initiative.published? || initiative.discarded?
-          notify_validating_result
-        end
-
-        if initiative.rejected? || initiative.accepted?
-          notify_support_result
-        end
+        notify_validating_result if initiative.published? || initiative.discarded?
+        notify_support_result if initiative.rejected? || initiative.accepted?
       end
 
       private
@@ -83,4 +77,4 @@ module Decidim
       end
     end
   end
-end
+end

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

@@ -2,32 +2,32 @@
   <article class="card card--initiative">
     <div class="card__content">
       <div class="card__header">
-        <%= link_to initiative do%>
-            <h5 class="card__title"><%= partially_translated_attribute initiative.title %></h5>
+        <%= link_to initiative do %>
+          <h5 class="card__title"><%= translated_attribute initiative.title %></h5>
         <% end %>
-        <%= render partial: 'decidim/initiatives/initiatives/author', locals: { initiative: initiative } %>
+        <%= render partial: "decidim/initiatives/initiatives/author", locals: { initiative: initiative } %>
       </div>
-      <%= render partial: 'decidim/initiatives/initiatives/initiative_badge', locals: { initiative: initiative } %>
-      <%= simple_format Truncato.truncate(partially_translated_attribute(initiative.description), max_length: 100, separator: '...') %>
-      <%= render partial: 'decidim/initiatives/initiatives/tags', locals: { resource: initiative } %>
+      <%= render partial: "decidim/initiatives/initiatives/initiative_badge", locals: { initiative: initiative } %>
+      <%= simple_format Truncato.truncate(translated_attribute(initiative.description), max_length: 100, separator: "...") %>
+      <%= render partial: "decidim/initiatives/initiatives/tags", locals: { resource: initiative } %>
     </div>
 
     <div class="card__footer">
       <div class="card__support">
         <% if initiative.published? %>
-          <%= render partial: 'decidim/initiatives/initiatives/supports_count', locals: { initiative: initiative } %>
+          <%= render partial: "decidim/initiatives/initiatives/supports_count", locals: { initiative: initiative } %>
         <% else %>
           <div class="card__support__data"></div>
         <% end %>
 
         <% if initiative.closed? || initiative.offline? %>
-          <%= link_to t('initiatives.initiative.check', scope: 'layouts.decidim'),
+          <%= link_to t("initiatives.initiative.check", scope: "layouts.decidim"),
                       initiative,
-                      class: 'card__button button small secondary' %>
+                      class: "card__button button small secondary" %>
         <% else %>
-          <%= link_to t('initiatives.initiative.check_and_support', scope: 'layouts.decidim'),
+          <%= link_to t("initiatives.initiative.check_and_support", scope: "layouts.decidim"),
                       initiative,
-                      class: 'card__button button small secondary' %>
+                      class: "card__button button small secondary" %>
         <% end %>
       </div>
     </div>