decidim-proposals 0.23.6 → 0.24.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bf25b623709eab1b21a1fb192f79de33e0d372384d67435e7e945d0e40fe7b0
-  data.tar.gz: a05a461559454ad127097d7344f5fb8d50e6fc2c9537319e711bb7e09c3f6355
+  metadata.gz: 67cf84b4e45cd888f61855ec0cf7b6f8bdc7ac95436dbb26f210d8208d6b14ea
+  data.tar.gz: f6948e12bbea3e8cb7a260657ff242a19e4c79c4d1d7784531d3e2a5978b0e4f
 SHA512:
-  metadata.gz: e5ea130360aadb726c4a03b283f542bffed6c5b55eb1451115cddd26e07ef4ac85f26ed3c2da83a07a53abf68b4dce404f144614beb6e4074f2ab0d2b8a3230b
-  data.tar.gz: 16db0fb106633338d4253fa0c92cade541a68894c92807d89839004de283e27e41b0d2472dd1cc6e646f41c78b90acf6b06efc4126f46ac59b342561e19ccc79
+  metadata.gz: 3827d2e0bcf65100d5ece6725335fe3b5cea50199edb951d4fa8356ad7d326c330342af4df0260cf69bf712d8c33473d059976602268c7a57e2763e8a34da532
+  data.tar.gz: bc2419606befb1ca8a7cff9817b2d4b4bce0612e320e36b389c0257cb3bbca72bc3f603b52f783ea342285ec82b2fb6d97c42bafb3575e72fae4d27fcbc51a69

data/app/assets/javascripts/decidim/proposals/add_proposal.js.es6

@@ -6,13 +6,16 @@ $(() => {
   window.DecidimProposals.bindProposalAddress = () => {
     const $checkbox = $("input:checkbox[name$='[has_address]']");
     const $addressInput = $("#address_input");
+    const $addressInputField = $("input", $addressInput);
 
     if ($checkbox.length > 0) {
       const toggleInput = () => {
         if ($checkbox[0].checked) {
           $addressInput.show();
+          $addressInputField.prop("disabled", false);
         } else {
           $addressInput.hide();
+          $addressInputField.prop("disabled", true);
         }
       }
       toggleInput();
@@ -20,7 +23,7 @@ $(() => {
     }
 
     if ($addressInput.length > 0) {
-      attachGeocoding($("input", $addressInput));
+      attachGeocoding($addressInputField);
     }
   };
 

data/app/assets/stylesheets/decidim/proposals/_proposals.css.scss

@@ -0,0 +1 @@
+@import "proposals/*";

data/app/assets/stylesheets/decidim/proposals/proposals/_preview.css.scss

@@ -0,0 +1,3 @@
+.preview--form__hidden{
+  display: none;
+}

data/app/cells/decidim/proposals/collaborative_draft_link_to_proposal_cell.rb

@@ -23,13 +23,13 @@ module Decidim
       end
 
       def link_header
-        content_tag :strong, class: "text-large" do
+        tag.strong(class: "text-large") do
           t("final_proposal", scope: "decidim.proposals.collaborative_drafts.show")
         end
       end
 
       def link_help_text
-        content_tag :span, class: "text-medium" do
+        tag.span(class: "text-medium") do
           t("final_proposal_help_text", scope: "decidim.proposals.collaborative_drafts.show")
         end
       end
@@ -39,7 +39,7 @@ module Decidim
           collaborative_draft_id: model.id
         )
         link_to @path, class: "text-medium" do
-          content_tag :u do
+          tag.u do
             t("version_history", scope: "decidim.proposals.collaborative_drafts.show")
           end
         end

data/app/cells/decidim/proposals/collaborative_drafts/reported_content/show.erb

@@ -0,0 +1,3 @@
+<blockquote>
+  <p><%= render_value model.body %></p>
+</blockquote>

data/app/cells/decidim/proposals/collaborative_drafts/reported_content_cell.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module CollaborativeDrafts
+      # This cells renders a small preview of the `CollaborativeDraft` that is
+      # used in the moderations panel.
+      class ReportedContentCell < Decidim::ReportedContentCell
+        def show
+          render :show
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/proposals/content_blocks/highlighted_proposals/elements.erb

@@ -0,0 +1,5 @@
+<div class="row small-up-1 medium-up-2 mediumlarge-up-3 large-up-3 card-grid">
+  <% elements.each do |element| %>
+    <%= card_for element, context: { show_space: true } %>
+  <% end %>
+</div>

data/app/cells/decidim/proposals/content_blocks/highlighted_proposals/heading.erb

@@ -0,0 +1 @@
+<h2 class="section-heading"><%= t("decidim.proposals.content_blocks.highlighted_proposals.proposals") %></h2>

data/app/cells/decidim/proposals/content_blocks/highlighted_proposals_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module ContentBlocks
+      class HighlightedProposalsCell < Decidim::ContentBlocks::HighlightedElementsCell
+        def base_relation
+          @base_relation ||= Decidim::Proposals::Proposal.published.not_hidden.except_withdrawn.where(component: published_components)
+        end
+
+        private
+
+        def limit
+          Decidim::Proposals.config.process_group_highlighted_proposals_limit
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/proposals/irreversible_action_modal_cell.rb

@@ -60,7 +60,7 @@ module Decidim
       end
 
       def button_cancel
-        content_tag :div, class: "columns medium-6" do
+        tag.div(class: "columns medium-6") do
           button_tag type: "button", class: "clear button secondary expanded", "data-close": "" do
             close_label
           end

data/app/cells/decidim/proposals/proposal_activity_cell.rb

@@ -2,21 +2,13 @@
 
 module Decidim
   module Proposals
-    # A cell to display when actions happen on a proposal.
+    # A cell to display when a proposal has been published.
     class ProposalActivityCell < ActivityCell
       def title
-        case action
-        when "update"
-          I18n.t(
-            "decidim.proposals.last_activity.proposal_updated_at_html",
-            link: participatory_space_link
-          )
-        else
-          I18n.t(
-            "decidim.proposals.last_activity.new_proposal_at_html",
-            link: participatory_space_link
-          )
-        end
+        I18n.t(
+          "decidim.proposals.last_activity.new_proposal_at_html",
+          link: participatory_space_link
+        )
       end
 
       def resource_link_text

data/app/cells/decidim/proposals/proposal_m_cell.rb

@@ -8,6 +8,8 @@ module Decidim
     class ProposalMCell < Decidim::CardMCell
       include ProposalCellsHelper
 
+      delegate :current_locale, to: :controller
+
       def badge
         render if has_badge?
       end
@@ -73,7 +75,7 @@ module Decidim
       end
 
       def creation_date_status
-        explanation = content_tag(:strong, t("activemodel.attributes.common.created_at"))
+        explanation = tag.strong(t("activemodel.attributes.common.created_at"))
         "#{explanation}<br>#{l(model.published_at.to_date, format: :decidim_short)}"
       end
 
@@ -87,7 +89,7 @@ module Decidim
 
       def endorsements_count
         with_tooltip t("decidim.endorsable.endorsements") do
-          icon("bullhorn", class: "icon--small") + " " + model.endorsements_count.to_s
+          "#{icon("bullhorn", class: "icon--small")} #{model.endorsements_count}"
         end
       end
 
@@ -122,6 +124,25 @@ module Decidim
       def resource_image_path
         @resource_image_path ||= has_image? ? model.attachments.find_by("content_type like '%image%'").url : nil
       end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/proposals/proposal_m"
+        hash << I18n.locale.to_s
+        hash << model.cache_version
+        hash << model.proposal_votes_count
+        hash << model.endorsements_count
+        hash << Digest::MD5.hexdigest(model.component.settings.to_json)
+        hash << Digest::MD5.hexdigest(resource_image_path) if resource_image_path
+        if current_user
+          hash << current_user.cache_version
+          hash << current_user.follows?(model) ? 1 : 0
+        end
+        hash << Digest::MD5.hexdigest(model.followers.to_json)
+        hash << Digest::MD5.hexdigest(model.coauthorships.map(&:cache_version).to_s)
+
+        hash.join("/")
+      end
     end
   end
 end

data/app/cells/decidim/proposals/proposals_picker_cell.rb

@@ -50,7 +50,7 @@ module Decidim
 
       def filtered_proposals
         @filtered_proposals ||= if filtered?
-                                  proposals.where("title::text ILIKE ?", "%#{search_text}%")
+                                  proposals.where("title ILIKE ?", "%#{search_text}%")
                                            .or(proposals.where("reference ILIKE ?", "%#{search_text}%"))
                                            .or(proposals.where("id::text ILIKE ?", "%#{search_text}%"))
                                 else

data/app/cells/decidim/proposals/reported_content/show.erb

@@ -0,0 +1,4 @@
+<blockquote>
+  <h5><%= render_value model.title %></h5>
+  <p><%= render_value model.body %></p>
+</blockquote>

data/app/cells/decidim/proposals/reported_content_cell.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # This cells renders a small preview of the `Proposal` that is
+    # used in the moderations panel.
+    class ReportedContentCell < Decidim::ReportedContentCell
+      def show
+        render :show
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/hashtags_methods.rb

@@ -14,7 +14,7 @@ module Decidim
       def body_with_hashtags
         @body_with_hashtags ||= begin
           ret = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite.strip
-          ret += "\n" + body_extra_hashtags.strip unless body_extra_hashtags.empty?
+          ret += "\n#{body_extra_hashtags.strip}" unless body_extra_hashtags.empty?
           ret
         end
       end

data/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -165,14 +165,15 @@ module Decidim
         def update_proposals_bulk_response_successful(response, subject)
           return if response[:successful].blank?
 
-          if subject == :category
+          case subject
+          when :category
             t(
               "proposals.update_category.success",
               subject_name: response[:subject_name],
               proposals: response[:successful].to_sentence,
               scope: "decidim.proposals.admin"
             )
-          elsif subject == :scope
+          when :scope
             t(
               "proposals.update_scope.success",
               subject_name: response[:subject_name],
@@ -185,14 +186,15 @@ module Decidim
         def update_proposals_bulk_response_errored(response, subject)
           return if response[:errored].blank?
 
-          if subject == :category
+          case subject
+          when :category
             t(
               "proposals.update_category.invalid",
               subject_name: response[:subject_name],
               proposals: response[:errored].to_sentence,
               scope: "decidim.proposals.admin"
             )
-          elsif subject == :scope
+          when :scope
             t(
               "proposals.update_scope.invalid",
               subject_name: response[:subject_name],

data/app/controllers/decidim/proposals/collaborative_drafts_controller.rb

@@ -19,7 +19,7 @@ module Decidim
 
       helper_method :geocoded_collaborative_draft, :collaborative_draft
       before_action :collaborative_drafts_enabled?
-      before_action :authenticate_user!, only: [:new, :create, :complete]
+      before_action :authenticate_user!, only: [:new, :create]
       before_action :retrieve_collaborative_draft, only: [:show, :edit, :update, :withdraw, :publish]
 
       def index
@@ -36,7 +36,6 @@ module Decidim
       def show
         raise ActionController::RoutingError, "Not Found" unless retrieve_collaborative_draft
 
-        @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
         @request_access_form = form(RequestAccessToCollaborativeDraftForm).from_params({})
         @accept_request_form = form(AcceptAccessToCollaborativeDraftForm).from_params({})
         @reject_request_form = form(RejectAccessToCollaborativeDraftForm).from_params({})
@@ -44,42 +43,14 @@ module Decidim
 
       def new
         enforce_permission_to :create, :collaborative_draft
-        @step = :step_1
 
         @form = form(CollaborativeDraftForm).from_params(
           attachment: form(AttachmentForm).from_params({})
         )
       end
 
-      def compare
-        @step = :step_2
-        @similar_collaborative_drafts ||= Decidim::Proposals::SimilarCollaborativeDrafts
-                                          .for(current_component, params[:collaborative_draft])
-                                          .all
-        @form = form(CollaborativeDraftForm).from_params(params)
-
-        if @similar_collaborative_drafts.blank?
-          flash[:notice] = I18n.t("proposals.collaborative_drafts.compare.no_similars_found", scope: "decidim")
-          redirect_to complete_collaborative_drafts_path(collaborative_draft: { title: @form.title, body: @form.body })
-        end
-      end
-
-      def complete
-        enforce_permission_to :create, :collaborative_draft
-        @step = :step_3
-        if params[:collaborative_draft].present?
-          params[:collaborative_draft][:attachment] = form(AttachmentForm).from_params({})
-          @form = form(CollaborativeDraftForm).from_params(params)
-        else
-          @form = form(CollaborativeDraftForm).from_params(
-            attachment: form(AttachmentForm).from_params({})
-          )
-        end
-      end
-
       def create
         enforce_permission_to :create, :collaborative_draft
-        @step = :step_3
         @form = form(CollaborativeDraftForm).from_params(params)
 
         CreateCollaborativeDraft.call(@form, current_user) do

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -35,13 +35,11 @@ module Decidim
                        .order(position: :asc)
           render "decidim/proposals/proposals/participatory_texts/participatory_text"
         else
-          @base_query = search
-                        .results
-                        .published
-                        .not_hidden
-
-          @proposals = @base_query.includes(:amendable, :category, :component, :resource_permission, :scope)
-          @all_geocoded_proposals = @base_query.geocoded
+          @proposals = search
+                       .results
+                       .published
+                       .not_hidden
+                       .includes(:component, :coauthorships)
 
           @voted_proposals = if current_user
                                ProposalVote.where(
@@ -58,8 +56,6 @@ module Decidim
 
       def show
         raise ActionController::RoutingError, "Not Found" if @proposal.blank? || !can_show_proposal?
-
-        @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
       end
 
       def new
@@ -81,7 +77,7 @@ module Decidim
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.create.success", scope: "decidim")
 
-            redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path + "/compare"
+            redirect_to "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/compare"
           end
 
           on(:invalid) do
@@ -99,7 +95,7 @@ module Decidim
 
         if @similar_proposals.blank?
           flash[:notice] = I18n.t("proposals.proposals.compare.no_similars_found", scope: "decidim")
-          redirect_to Decidim::ResourceLocatorPresenter.new(@proposal).path + "/complete"
+          redirect_to "#{Decidim::ResourceLocatorPresenter.new(@proposal).path}/complete"
         end
       end
 
@@ -114,6 +110,7 @@ module Decidim
 
       def preview
         @step = :step_4
+        @form = form(ProposalForm).from_model(@proposal)
       end
 
       def publish
@@ -144,7 +141,7 @@ module Decidim
         UpdateProposal.call(@form, current_user, @proposal) do
           on(:ok) do |proposal|
             flash[:notice] = I18n.t("proposals.update_draft.success", scope: "decidim")
-            redirect_to Decidim::ResourceLocatorPresenter.new(proposal).path + "/preview"
+            redirect_to "#{Decidim::ResourceLocatorPresenter.new(proposal).path}/preview"
           end
 
           on(:invalid) do

data/app/events/decidim/proposals/publish_proposal_event.rb

@@ -18,7 +18,7 @@ module Decidim
       end
 
       def participatory_space_event?
-        extra.dig(:participatory_space)
+        extra[:participatory_space]
       end
     end
   end

data/app/forms/decidim/proposals/access_to_collaborative_draft_form.rb

@@ -26,9 +26,7 @@ module Decidim
       private
 
       def existence_of_requester_in_requesters
-        if collaborative_draft
-          errors.add(:requester_user_id, :invalid) unless collaborative_draft.requesters.exists? requester_user_id
-        end
+        errors.add(:requester_user_id, :invalid) if collaborative_draft && !collaborative_draft.requesters.exists?(requester_user_id)
       end
     end
   end

data/app/forms/decidim/proposals/admin/proposal_base_form.rb

@@ -6,6 +6,7 @@ module Decidim
       # A form object to be used when admin users want to create a proposal.
       class ProposalBaseForm < Decidim::Form
         include Decidim::TranslatableAttributes
+        include Decidim::AttachmentAttributes
         include Decidim::ApplicationHelper
 
         mimic :proposal
@@ -20,8 +21,8 @@ module Decidim
         attribute :created_in_meeting, Boolean
         attribute :meeting_id, Integer
         attribute :suggested_hashtags, Array[String]
-        attribute :photos, Array[String]
-        attribute :add_photos, Array
+
+        attachments_attribute :photos
 
         validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
         validates :category, presence: true, if: ->(form) { form.category_id.present? }

data/app/forms/decidim/proposals/proposal_form.rb

@@ -5,6 +5,7 @@ module Decidim
     # A form object to be used when public users want to create a proposal.
     class ProposalForm < Decidim::Proposals::ProposalWizardCreateStepForm
       include Decidim::TranslatableAttributes
+      include Decidim::AttachmentAttributes
 
       mimic :proposal
 
@@ -16,10 +17,9 @@ module Decidim
       attribute :has_address, Boolean
       attribute :attachment, AttachmentForm
       attribute :suggested_hashtags, Array[String]
-      attribute :photos, Array[String]
-      attribute :add_photos, Array
-      attribute :documents, Array[String]
-      attribute :add_documents, Array
+
+      attachments_attribute :photos
+      attachments_attribute :documents
 
       validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
       validates :address, presence: true, if: ->(form) { form.has_address? }
@@ -39,6 +39,8 @@ module Decidim
         # The scope attribute is with different key (decidim_scope_id), so it
         # has to be manually mapped.
         self.scope_id = model.scope.id if model.scope
+
+        self.has_address = true if model.address.present?
       end
 
       # Finds the Category from the category_id.
@@ -66,8 +68,16 @@ module Decidim
         Decidim::Map.available?(:geocoding) && current_component.settings.geocoding_enabled?
       end
 
+      def address
+        return unless has_address
+
+        super
+      end
+
       def has_address?
-        geocoding_enabled? && has_address
+        return unless has_address
+
+        geocoding_enabled? && address.present?
       end
 
       def geocoded?

data/app/forms/decidim/proposals/proposal_wizard_create_step_form.rb

@@ -7,7 +7,7 @@ module Decidim
       mimic :proposal
 
       attribute :title, String
-      attribute :body, String
+      attribute :body, Decidim::Attributes::CleanString
       attribute :body_template, String
       attribute :user_group_id, Integer
 

data/app/helpers/decidim/proposals/admin/filterable_helper.rb

@@ -7,7 +7,7 @@ module Decidim
         def extra_dropdown_submenu_options_items(filter, i18n_scope)
           options = case filter
                     when :state_eq
-                      content_tag(:li, filter_link_value(:state_null, true, i18n_scope))
+                      tag.li(filter_link_value(:state_null, true, i18n_scope))
                     end
           [options].compact
         end

data/app/helpers/decidim/proposals/admin/proposal_rankings_helper.rb

@@ -20,7 +20,7 @@ module Decidim
         #   ranking_for(proposal, endorsements_count: :desc)
         def ranking_for(proposal, order = {})
           siblings = Decidim::Proposals::Proposal.where(component: proposal.component)
-          ranked = siblings.order([order, id: :asc])
+          ranked = siblings.order([order, { id: :asc }])
           ranked_ids = ranked.pluck(:id)
 
           { ranking: ranked_ids.index(proposal.id) + 1, total: ranked_ids.count }

data/app/helpers/decidim/proposals/admin/proposals_helper.rb

@@ -32,9 +32,9 @@ module Decidim
         end
 
         def proposal_complete_state(proposal)
-          state = humanize_proposal_state(proposal.state)
-          state += " (#{humanize_proposal_state(proposal.internal_state)})" if proposal.answered? && !proposal.published_state?
-          state.html_safe
+          return humanize_proposal_state(proposal.internal_state).html_safe if proposal.answered? && !proposal.published_state?
+
+          humanize_proposal_state(proposal.state).html_safe
         end
 
         def proposals_admin_filter_tree
@@ -73,7 +73,7 @@ module Decidim
         def proposals_admin_filter_applied_filters
           html = []
           if params[:q][:is_emendation_true].present?
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("filters.type", scope: "decidim.proposals.proposals")}: "
               tag += if params[:q][:is_emendation_true].to_s == "1"
                        t("amendments", scope: "decidim.proposals.application_helper.filter_type_values")
@@ -86,7 +86,7 @@ module Decidim
             end
           end
           if params[:q][:state_null]
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.state", scope: "decidim.proposals")}: "
               tag += humanize_proposal_state "not_answered"
               tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:state_null), per_page: per_page), t("decidim.admin.actions.cancel"),
@@ -95,7 +95,7 @@ module Decidim
             end
           end
           if params[:q][:state_eq]
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.state", scope: "decidim.proposals")}: "
               tag += humanize_proposal_state params[:q][:state_eq]
               tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:state_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
@@ -104,7 +104,7 @@ module Decidim
             end
           end
           if params[:q][:category_id_eq]
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.category", scope: "decidim.proposals")}: "
               tag += translated_attribute categories.find(params[:q][:category_id_eq]).name
               tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:category_id_eq), per_page: per_page), t("decidim.admin.actions.cancel"),
@@ -113,7 +113,7 @@ module Decidim
             end
           end
           if params[:q][:scope_id_eq]
-            html << content_tag(:span, class: "label secondary") do
+            html << tag.span(class: "label secondary") do
               tag = "#{t("models.proposal.fields.scope", scope: "decidim.proposals")}: "
               tag += translated_attribute Decidim::Scope.where(decidim_organization_id: current_component.organization.id).find(params[:q][:scope_id_eq]).name
               tag += icon_link_to("circle-x", url_for(q: ransak_params_for_query_without(:scope_id_eq), per_page: per_page), t("decidim.admin.actions.cancel"),

data/app/helpers/decidim/proposals/application_helper.rb

@@ -30,10 +30,13 @@ module Decidim
 
       # Public: The css class applied based on the proposal state.
       #
-      # state - The String state of the proposal.
+      # proposal - The proposal to evaluate.
       #
       # Returns a String.
-      def proposal_state_css_class(state)
+      def proposal_state_css_class(proposal)
+        state = proposal.state
+        state = proposal.internal_state if proposal.answered? && !proposal.published_state?
+
         case state
         when "accepted"
           "text-success"

data/app/helpers/decidim/proposals/map_helper.rb

@@ -10,16 +10,33 @@ module Decidim
       # geocoded_proposals - A collection of geocoded proposals
       def proposals_data_for_map(geocoded_proposals)
         geocoded_proposals.map do |proposal|
-          proposal
-            .slice(:latitude, :longitude, :address)
-            .merge(
-              title: decidim_html_escape(present(proposal).title),
-              body: html_truncate(decidim_sanitize(present(proposal).body), length: 100),
-              icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
-              link: proposal_path(proposal)
-            )
+          proposal_data_for_map(proposal)
         end
       end
+
+      def proposal_data_for_map(proposal)
+        proposal.slice(:latitude, :longitude, :address).merge(title: proposal.title,
+                                                              body: truncate(translated_attribute(proposal.body), length: 100),
+                                                              icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
+                                                              link: proposal_path(proposal))
+      end
+
+      def proposal_preview_data_for_map(proposal)
+        [
+          proposal.slice(
+            :latitude,
+            :longitude,
+            :address
+          ).merge(
+            icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
+            draggable: true
+          )
+        ]
+      end
+
+      def has_position?(proposal)
+        proposal.latitude.present? && proposal.longitude.present?
+      end
     end
   end
 end