decidim 0.0.5 → 0.0.6

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

@@ -7,17 +7,14 @@ module Decidim
       include FormFactory
       include FilterResource
 
-      helper_method :order, :random_seed
+      helper_method :order, :random_seed, :geocoded_proposals
 
       before_action :authenticate_user!, only: [:new, :create]
 
-      def show
-        @proposal = Proposal.where(feature: current_feature).find(params[:id])
-      end
-
       def index
         @proposals = search
                      .results
+                     .not_hidden
                      .includes(:author)
                      .includes(:category)
                      .includes(:scope)
@@ -35,6 +32,11 @@ module Decidim
                            end
       end
 
+      def show
+        @proposal = Proposal.not_hidden.where(feature: current_feature).find(params[:id])
+        @report_form = form(Decidim::ReportForm).from_params(reason: "spam")
+      end
+
       def new
         authorize! :create, Proposal
 
@@ -86,6 +88,10 @@ module Decidim
         end
       end
 
+      def geocoded_proposals
+        @geocoded_proposals ||= search.results.not_hidden.select(&:geocoded?)
+      end
+
       def search_klass
         ProposalSearch
       end
@@ -97,7 +103,7 @@ module Decidim
           activity: "",
           category_id: "",
           state: "all",
-          scope_id: "",
+          scope_id: nil,
           related_to: ""
         }
       end

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

@@ -8,15 +8,26 @@ module Decidim
 
         attribute :title, String
         attribute :body, String
+        attribute :address, String
+        attribute :latitude, Float
+        attribute :longitude, Float
         attribute :category_id, Integer
         attribute :scope_id, Integer
 
         validates :title, :body, presence: true
+        validates :address, geocoding: true, if: -> { current_feature.settings.geocoding_enabled? }
         validates :category, presence: true, if: ->(form) { form.category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 
         delegate :categories, to: :current_feature, prefix: false
-        delegate :scopes, to: :current_organization, prefix: false
+
+        def organization_scopes
+          current_organization.scopes
+        end
+
+        def process_scope
+          current_feature.participatory_process.scope
+        end
 
         alias feature current_feature
 
@@ -31,7 +42,7 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= scopes.where(id: scope_id).first
+          @scope ||= process_scope || organization_scopes.where(id: scope_id).first
         end
       end
     end

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

@@ -7,6 +7,9 @@ module Decidim
 
       attribute :title, String
       attribute :body, String
+      attribute :address, String
+      attribute :latitude, Float
+      attribute :longitude, Float
       attribute :category_id, Integer
       attribute :scope_id, Integer
       attribute :user_group_id, Integer
@@ -14,11 +17,19 @@ module Decidim
       validates :title, :body, presence: true, etiquette: true
       validates :title, length: { maximum: 150 }
       validates :body, length: { maximum: 500 }, etiquette: true
+      validates :address, geocoding: true, if: -> { current_feature.settings.geocoding_enabled? }
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 
       delegate :categories, to: :current_feature
-      delegate :scopes, to: :current_organization
+
+      def organization_scopes
+        current_organization.scopes
+      end
+
+      def process_scope
+        current_feature.participatory_process.scope
+      end
 
       alias feature current_feature
 
@@ -33,7 +44,7 @@ module Decidim
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= scopes.where(id: scope_id).first
+        @scope ||= process_scope || organization_scopes.where(id: scope_id).first
       end
     end
   end

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

@@ -7,6 +7,9 @@ module Decidim
       include Decidim::Comments::CommentsHelper
       include PaginateHelper
       include ProposalVotesHelper
+      include ProposalOrderHelper
+      include Decidim::MapHelper
+      include Decidim::Proposals::MapHelper
 
       # Public: The state of a proposal in a way a human can understand.
       #

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    # This helper include some methods for rendering proposals dynamic maps.
+    module MapHelper
+      # Serialize a collection of geocoded proposals to be used by the dynamic map component
+      #
+      # 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: proposal.title,
+                                                                body: truncate(proposal.body, length: 100),
+                                                                icon: icon("proposals", width: 40, height: 70, remove_icon_class: true),
+                                                                link: proposal_path(proposal))
+        end
+      end
+    end
+  end
+end

data/decidim-proposals/app/helpers/decidim/proposals/proposal_order_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+module Decidim
+  module Proposals
+    # Simple helpers to handle proposals ordering
+    module ProposalOrderHelper
+      # Returns the options the user will see to order proposals
+      def order_fields
+        @order_fields ||= begin
+          order_fields = [:random, :recent]
+          order_fields << :most_voted if current_settings.votes_enabled?
+          order_fields
+        end
+      end
+    end
+  end
+end

data/decidim-proposals/app/models/decidim/proposals/abilities/admin_user.rb

@@ -16,6 +16,8 @@ module Decidim
           @context = context
 
           can :manage, Proposal
+          can :unreport, Proposal
+          can :hide, Proposal
           cannot :create, Proposal unless can_create_proposal?
           cannot :update, Proposal unless can_update_proposal?
         end

data/decidim-proposals/app/models/decidim/proposals/abilities/current_user.rb

@@ -24,6 +24,9 @@ module Decidim
           end
 
           can :create, Proposal if authorized?(:create) && creation_enabled?
+
+          can :report, Proposal
+          can :report, Decidim::Comments::Comment
         end
 
         private

data/decidim-proposals/app/models/decidim/proposals/abilities/process_admin_user.rb

@@ -18,7 +18,8 @@ module Decidim
           can :manage, Proposal do |proposal|
             participatory_processes.include?(proposal.feature.participatory_process)
           end
-
+          can :unreport, Proposal
+          can :hide, Proposal
           cannot :create, Proposal unless can_create_proposal?
           cannot :update, Proposal unless can_update_proposal?
         end

data/decidim-proposals/app/models/decidim/proposals/proposal.rb

@@ -7,7 +7,9 @@ module Decidim
       include Decidim::Authorable
       include Decidim::HasFeature
       include Decidim::HasScope
+      include Decidim::HasReference
       include Decidim::HasCategory
+      include Decidim::Reportable
       include Decidim::Comments::Commentable
 
       feature_manifest_name "proposals"
@@ -16,8 +18,10 @@ module Decidim
 
       validates :title, :body, presence: true
 
-      scope :accepted, -> { where(state: "accepted") }
-      scope :rejected, -> { where(state: "rejected") }
+      geocoded_by :address, http_headers: lambda { |proposal| { "Referer" => proposal.feature.organization.host } }
+
+      scope :accepted,   -> { where(state: "accepted") }
+      scope :rejected,   -> { where(state: "rejected") }
 
       def author_name
         user_group&.name || author&.name || I18n.t("decidim.proposals.models.proposal.fields.official_proposal")
@@ -62,7 +66,7 @@ module Decidim
 
       # Public: Overrides the `accepts_new_comments?` Commentable concern method.
       def accepts_new_comments?
-         commentable? && !feature.active_step_settings.comments_blocked
+        commentable? && !feature.active_step_settings.comments_blocked
       end
 
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.
@@ -74,6 +78,11 @@ module Decidim
       def comments_have_votes?
         true
       end
+
+      # Public: Overrides the `reported_content` Reportable concern method.
+      def reported_content
+        "<h3>#{title}</h3><p>#{body}</p>"
+      end
     end
   end
 end

data/decidim-proposals/app/services/decidim/proposals/proposal_search.rb

@@ -44,11 +44,6 @@ module Decidim
         end
       end
 
-      # Handle the scope_id filter
-      def search_scope_id
-        query.where(decidim_scope_id: scope_id)
-      end
-
       # Handle the state filter
       def search_state
         if state == "accepted"

data/decidim-proposals/app/views/decidim/proposals/admin/proposal_answers/edit.html.erb

@@ -6,7 +6,7 @@
   </div>
 
   <div class="field">
-    <%= f.translated :text_area, :answer, autofocus: true, rows: 15 %>
+    <%= f.translated :editor, :answer, autofocus: true, rows: 15 %>
   </div>
 
   <div class="actions">

data/decidim-proposals/app/views/decidim/proposals/admin/proposals/_form.html.erb

@@ -6,14 +6,20 @@
   <%= form.text_area :body, rows: 10 %>
 </div>
 
+<% if feature_settings.geocoding_enabled? %>
+  <div class="field">
+    <%= form.text_field :address %>
+  </div>
+<% end %>
+
 <% if @form.categories&.any? %>
   <div class="field">
     <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
   </div>
 <% end %>
 
-<% if @form.scopes&.any? && feature_settings.scoped_proposals_enabled %>
+<% if !@form.process_scope %>
   <div class="field">
-    <%= form.select :scope_id, @form.scopes.map{|s| [s.name, s.id]}, prompt: t(".select_a_scope") %>
+    <%= form.collection_select :scope_id, organization_scopes, :id, :name %>
   </div>
 <% end %>

data/decidim-proposals/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -1,19 +1,17 @@
 <h2><%= t(".title") %></h2>
 
-<% if feature_settings.official_proposals_enabled %>
-  <div class="actions title">
+<div class="actions title">
+  <% if feature_settings.official_proposals_enabled %>
     <%= link_to t("actions.new", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposal_path, class: 'new' if can? :manage, current_feature %>
-  </div>
-<% end %>
+  <% end %>
+</div>
 
 <table class="stack">
   <thead>
     <tr>
       <th><%= t("models.proposal.fields.title", scope: "decidim.proposals") %></th>
       <th><%= t("models.proposal.fields.category", scope: "decidim.proposals") %></th>
-      <% if feature_settings.scoped_proposals_enabled %>
-        <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
-      <% end %>
+      <th><%= t("models.proposal.fields.scope", scope: "decidim.proposals") %></th>
       <th><%= t("models.proposal.fields.state", scope: "decidim.proposals") %></th>
       <th class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>
     </tr>
@@ -29,13 +27,13 @@
             <%= translated_attribute proposal.category.name %>
           <% end %>
         </td>
-        <% if feature_settings.scoped_proposals_enabled %>
-          <td>
-            <% if proposal.scope %>
-              <%= translated_attribute proposal.scope.name %>
-            <% end %>
-          </td>
-        <% end %>
+        <td>
+          <% if proposal.scope %>
+            <%= proposal.scope.name %>
+          <% else %>
+            <%= t("decidim.participatory_processes.scopes.global") %>
+          <% end %>
+        </td>
         <td>
           <%= humanize_proposal_state proposal.state %>
         </td>

data/decidim-proposals/app/views/decidim/proposals/proposals/_filters.html.erb

@@ -28,8 +28,8 @@
     <%= form.collection_check_boxes :activity, [["voted", t('.voted')]], :first, :last, legend_title: t('.activity') %>
   <% end %>
 
-  <% if current_organization.scopes.any? && feature_settings.scoped_proposals_enabled %>
-    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+  <% if current_organization.scopes.any? && !current_participatory_process.scope %>
+    <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
   <% end %>
 
   <% if current_feature.categories.any? %>

data/decidim-proposals/app/views/decidim/proposals/proposals/_filters_small_view.html.erb

@@ -7,7 +7,7 @@
 
 <div class="reveal" id="filter-box" data-reveal>
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t ".filter_for" %>:</h3>
+    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

data/decidim-proposals/app/views/decidim/proposals/proposals/_proposals.html.erb

@@ -1,4 +1,4 @@
-<%= order_selector [:random, :most_voted, :recent], i18n_scope: "decidim.proposals.proposals.orders" %>
+<%= order_selector order_fields, i18n_scope: "decidim.proposals.proposals.orders" %>
 <div class="row small-up-1 medium-up-2 card-grid">
   <%= render @proposals %>
 </div>

data/decidim-proposals/app/views/decidim/proposals/proposals/_tags.html.erb

@@ -3,7 +3,7 @@
     <% if proposal.category.present? %>
       <li><%= link_to translated_attribute(proposal.category.name), decidim_proposals.proposals_path(filter: { category_id: proposal.category.id }) %></li>
     <% end %>
-    <% if proposal.scope.present? && feature_settings.scoped_proposals_enabled %>
+    <% if proposal.scope.present? && !current_participatory_process.scope %>
       <li><%= link_to proposal.scope.name, decidim_proposals.proposals_path(filter: { scope_id: [proposal.scope.id] }) %></li>
     <% end %>
   </ul>

data/decidim-proposals/app/views/decidim/proposals/proposals/index.html.erb

@@ -1,3 +1,30 @@
+<% if feature_settings.geocoding_enabled? %>
+  <%= dynamic_map_for proposals_data_for_map(geocoded_proposals) do %>
+    <template id="marker-popup">
+      <div class="map-info__content">
+        <h3>${title}</h3>
+        <div id="bodyContent">
+          <p>{{html body}}</p>
+          <div class="map__date-adress">
+            <div class="address card__extra">
+              <div class="address__icon">{{html icon}}</div>
+              <div class="address__details">
+                <span>${address}</span><br />
+              </div>
+            </div>
+          </div>
+          <div class="map-info__button">
+            <a href="${link}" class="button button--sc">
+              <%= t('.view_proposal') %>
+            </a>
+          </div>
+        </div>
+      </div>
+    </template>
+    <%= stylesheet_link_tag "decidim/map" %>
+    <%= javascript_include_tag "decidim/map" %>
+  <% end %>
+<% end %>
 <%= render partial: "votes_limit" %>
 <div class="row columns">
   <div class="title-action">

data/decidim-proposals/app/views/decidim/proposals/proposals/new.html.erb

@@ -18,15 +18,21 @@
             <%= form.text_area :body, rows: 10 %>
           </div>
 
+          <% if feature_settings.geocoding_enabled? %>
+            <div class="field">
+              <%= form.text_field :address %>
+            </div>
+          <% end %>
+
           <% if @form.categories&.any? %>
             <div class="field">
               <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
             </div>
           <% end %>
 
-          <% if @form.scopes&.any? && feature_settings.scoped_proposals_enabled %>
+          <% if !@form.process_scope %>
             <div class="field">
-              <%= form.select :scope_id, @form.scopes.map{|s| [s.name, s.id]}, prompt: t(".select_a_scope") %>
+              <%= form.collection_select :scope_id, organization_scopes, :id, :name %>
             </div>
           <% end %>
 

data/decidim-proposals/app/views/decidim/proposals/proposals/show.html.erb

@@ -19,6 +19,11 @@
         </span>
       </div>
     </div>
+    <div class="author-data__extra">
+      <button type="button" data-open="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" title="<%= t('.report') %>" aria-controls="<%= current_user.present? ? 'flagModal' : 'loginModal' %>" aria-haspopup="true" tabindex="0">
+        <%= icon "flag", aria_label: t('.report'), class: 'icon--small' %>
+      </button>
+    </div>
   </div>
 </div>
 <div class="row">
@@ -35,12 +40,16 @@
         </div>
       </div>
     <% end %>
+    <%= feature_reference(@proposal) %>
     <%= render partial: "decidim/shared/share_modal" %>
   </div>
   <div class="columns mediumlarge-8 mediumlarge-pull-4">
     <div class="section">
       <%= render partial: "proposal_badge", locals: { proposal: @proposal } %>
       <p><%= @proposal.body %></p>
+      <% if feature_settings.geocoding_enabled? %>
+        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
+      <% end %>
       <%= render partial: "tags", locals: { proposal: @proposal } %>
     </div>
     <% if @proposal.answered? && translated_attribute(@proposal.answer).present? %>
@@ -48,7 +57,7 @@
         <div class="section">
           <div class="callout success">
             <h5><%= t(".proposal_accepted_reason") %></h5>
-            <p><%= translated_attribute @proposal.answer %></p>
+            <p><%== translated_attribute @proposal.answer %></p>
           </div>
         </div>
       <% else %>
@@ -70,3 +79,11 @@
 
 <%= javascript_include_tag "decidim/proposals/social_share" %>
 <%= stylesheet_link_tag "decidim/proposals/social_share" %>
+
+<%=
+  render partial: "decidim/shared/flag_modal", locals: {
+    reportable: @proposal,
+    form: @report_form,
+    url: decidim.report_path(sgid: @proposal.to_sgid.to_s)
+  }
+%>