decidim 0.0.3 → 0.0.4

data/decidim-meetings/config/locales/eu.yml

@@ -0,0 +1,5 @@
+eu:
+  decidim:
+    meetings:
+      actions:
+        close: Itxi

data/decidim-meetings/decidim-meetings.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "date_validator", "~> 0.9"
   s.add_dependency "searchlight", "~> 4.1.0"
   s.add_dependency "kaminari", "~> 1.0.1"
-  s.add_dependency "geocoder", "~> 1.4.1"
+  s.add_dependency "geocoder", "~> 1.4.2"
   s.add_dependency "httparty", "~> 0.14.0"
   s.add_dependency "jquery-tmpl-rails", "~> 1.1.0"
 

data/decidim-meetings/lib/decidim/meetings/feature.rb

@@ -22,6 +22,7 @@ Decidim.register_feature(:meetings) do |feature|
 
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :meetings).i18n_name,
+        published_at: Time.current,
         manifest_name: :meetings,
         participatory_process: process
       )

data/decidim-meetings/spec/features/admin_manages_meetings_attachments_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/admin_shared_context"
-require_relative "../shared/manage_attachments_examples"
 
 describe "Admin manages meetings attachments", type: :feature do
   include_context "admin"

data/decidim-meetings/spec/features/admin_manages_meetings_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/admin_shared_context"
-require_relative "../shared/manage_meetings_examples"
 
 describe "Admin manages meetings", type: :feature do
   include_context "admin"

data/decidim-meetings/spec/features/process_admin_manages_meetings_attachments_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/admin_shared_context"
-require_relative "../shared/manage_attachments_examples"
 
 describe "Process admin manages meetings attachments", type: :feature do
   include_context "admin"

data/decidim-meetings/spec/features/process_admin_manages_meetings_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "spec_helper"
-require_relative "../shared/admin_shared_context"
-require_relative "../shared/manage_meetings_examples"
 
 describe "Process admin manages meetings", type: :feature do
   include_context "admin"

data/decidim-pages/app/assets/images/decidim/pages/icon.svg

@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="8" height="8" viewBox="0 0 8 8">
-  <path d="M0 0v8h7v-4h-4v-4h-3zm4 0v3h3l-3-3zm-3 2h1v1h-1v-1zm0 2h1v1h-1v-1zm0 2h4v1h-4v-1z" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02"><path d="M373,545.54a18,18,0,1,1,18-18A18,18,0,0,1,373,545.54Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,373,511.53Z" transform="translate(-354.99 -509.53)"/><path d="M377.73,536.41h-9.46a1,1,0,1,1,0-2h9.46A1,1,0,0,1,377.73,536.41Z" transform="translate(-354.99 -509.53)"/><path d="M375,525.54h-6.73a1,1,0,1,1,0-2H375A1,1,0,1,1,375,525.54Z" transform="translate(-354.99 -509.53)"/><path d="M375,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,375,535.41Z" transform="translate(-354.99 -509.53)"/><path d="M373,523a3,3,0,1,1,3-3A3,3,0,0,1,373,523Zm0-4a1,1,0,1,0,1,1A1,1,0,0,0,373,519Z" transform="translate(-354.99 -509.53)"/><path d="M371,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,371,535.41Z" transform="translate(-354.99 -509.53)"/></svg>

data/decidim-pages/app/views/decidim/pages/admin/pages/edit.html.erb

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form, url: page_path, method: :post) do |form| %>
+<%=  decidim_form_for(@form, url: page_path, method: :post) do |form| %>
   <%= render partial: 'form', object: form %>
 
   <div class="actions">

data/decidim-pages/app/views/decidim/pages/application/show.html.erb

@@ -1,4 +1,7 @@
-<% content_for(:meta_title, translated_attribute(@page.title)) %>
+<% add_meta_tags({
+  title: translated_attribute(@page.title),
+  description: translated_attribute(@page.body),
+}) %>
 
 <div class="row column">
   <div class="row">

data/decidim-pages/config/locales/eu.yml

@@ -0,0 +1,7 @@
+eu:
+  decidim:
+    pages:
+      admin:
+        models:
+          components:
+            title: Izenburua

data/decidim-pages/lib/decidim/pages/feature.rb

@@ -34,6 +34,7 @@ Decidim.register_feature(:pages) do |feature|
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :pages).i18n_name,
         manifest_name: :pages,
+        published_at: Time.current,
         participatory_process: process
       )
 

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

@@ -7,6 +7,8 @@ module Decidim
       include FormFactory
       include FilterResource
 
+      helper_method :order, :random_seed
+
       before_action :authenticate_user!, only: [:new, :create]
 
       def show
@@ -17,11 +19,20 @@ module Decidim
         @proposals = search
                      .results
                      .includes(:author)
-                     .includes(votes: [:author])
-                     .page(params[:page])
-                     .per(12)
+                     .includes(:category)
+                     .includes(:scope)
+
+        @proposals = @proposals.page(params[:page]).per(12)
+        @proposals = reorder(@proposals)
 
-        @random_seed = search.random_seed
+        @voted_proposals = if current_user
+                             ProposalVote.where(
+                               author: current_user,
+                               proposal: @proposals
+                             ).pluck(:decidim_proposal_id)
+                           else
+                             []
+                           end
       end
 
       def new
@@ -50,6 +61,31 @@ module Decidim
 
       private
 
+      def order
+        @order = params[:order] || "random"
+      end
+
+      # Returns: A random float number between -1 and 1 to be used as a random seed at the database.
+      def random_seed
+        @random_seed ||= (params[:random_seed] ? params[:random_seed].to_f : (rand * 2 - 1))
+      end
+
+      def reorder(proposals)
+        case order
+        when "random"
+          Proposal.transaction do
+            Proposal.connection.execute("SELECT setseed(#{Proposal.connection.quote(random_seed)})")
+            proposals.order("RANDOM()").load
+          end
+        when "most_voted"
+          proposals.order(proposal_votes_count: :desc)
+        when "recent"
+          proposals.order(created_at: :desc)
+        else
+          proposals
+        end
+      end
+
       def search_klass
         ProposalSearch
       end
@@ -61,7 +97,8 @@ module Decidim
           activity: "",
           category_id: "",
           state: "all",
-          random_seed: params[:random_seed]
+          scope_id: "",
+          related_to: ""
         }
       end
     end

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

@@ -11,7 +11,9 @@ module Decidim
       attribute :scope_id, Integer
       attribute :user_group_id, Integer
 
-      validates :title, :body, presence: true
+      validates :title, :body, presence: true, etiquette: true
+      validates :title, length: { maximum: 150 }
+      validates :body, length: { maximum: 500 }, etiquette: true
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 

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

@@ -27,7 +27,7 @@ module Decidim
       #
       # Returns true if the vote limit is enabled
       def vote_limit_enabled?
-        current_user && feature_settings.vote_limit.present? && feature_settings.vote_limit.positive?
+        current_user && current_settings.votes_enabled? && feature_settings.vote_limit.present? && feature_settings.vote_limit.positive?
       end
 
       # Return the remaining votes for a user if the current feature has a vote limit

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

@@ -16,27 +16,38 @@ module Decidim
           @context = context
 
           can :vote, Proposal do |_proposal|
-            voting_enabled? && remaining_votes.positive?
+            authorized?(:vote) && voting_enabled? && remaining_votes.positive?
           end
 
           can :unvote, Proposal do |_proposal|
-            voting_enabled? && vote_limit_enabled?
+            authorized?(:vote) && voting_enabled? && vote_limit_enabled?
           end
 
-          can :create, Proposal if current_settings.try(:creation_enabled?)
+          can :create, Proposal if authorized?(:create) && creation_enabled?
         end
 
         private
 
+        def authorized?(action)
+          return unless feature
+
+          ActionAuthorizer.new(user, feature, action).authorize.ok?
+        end
+
         def vote_limit_enabled?
           return unless feature_settings
           feature_settings.vote_limit.present? && feature_settings.vote_limit.positive?
         end
 
+        def creation_enabled?
+          return unless current_settings
+          current_settings.creation_enabled?
+        end
+
         def remaining_votes
           return 1 unless vote_limit_enabled?
 
-          proposals = Proposal.where(feature: context.fetch(:current_feature))
+          proposals = Proposal.where(feature: feature)
           votes_count = ProposalVote.where(author: user, proposal: proposals).size
           feature_settings.vote_limit - votes_count
         end
@@ -53,6 +64,13 @@ module Decidim
         def feature_settings
           context.fetch(:feature_settings, nil)
         end
+
+        def feature
+          feature = context.fetch(:current_feature, nil)
+          return nil unless feature && feature.manifest.name == :proposals
+
+          feature
+        end
       end
     end
   end

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

@@ -11,7 +11,7 @@ module Decidim
 
       feature_manifest_name "proposals"
 
-      has_many :votes, foreign_key: "decidim_proposal_id", class_name: ProposalVote, dependent: :destroy
+      has_many :votes, foreign_key: "decidim_proposal_id", class_name: ProposalVote, dependent: :destroy, counter_cache: "proposal_votes_count"
 
       validates :title, :body, presence: true
 
@@ -30,7 +30,7 @@ module Decidim
       #
       # Returns Boolean.
       def voted_by?(user)
-        votes.any? { |vote| vote.author == user }
+        votes.where(author: user).any?
       end
 
       # Public: Checks if the organization has given an answer for the proposal.

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

@@ -8,10 +8,8 @@ module Decidim
       # feature     - A Decidim::Feature to get the proposals from.
       # page        - The page number to paginate the results.
       # per_page    - The number of proposals to return per page.
-      # random_seed - A random flaot number between -1 and 1 to be used as a random seed at the database.
       def initialize(options = {})
         super(Proposal.all, options)
-        @random_seed = options[:random_seed].to_f
       end
 
       # Handle the search_text filter
@@ -46,6 +44,11 @@ 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"
@@ -57,18 +60,27 @@ module Decidim
         end
       end
 
-      # Returns the random proposals for the current page.
-      def results
-        @proposals ||= Proposal.transaction do
-          Proposal.connection.execute("SELECT setseed(#{Proposal.connection.quote(random_seed)})")
-          super.reorder("RANDOM()").load
-        end
-      end
+      # Filters Proposals by the name of the classes they are linked to. By default,
+      # returns all Proposals. When a `related_to` param is given, then it camelcases item
+      # to find the real class name and checks the links for the Proposals.
+      #
+      # The `related_to` param is expected to be in this form:
+      #
+      #   "decidim/meetings/meeting"
+      #
+      # This can be achieved by performing `klass.name.underscore`.
+      #
+      # Returns only those proposals that are linked to the given class name.
+      def search_related_to
+        from = query
+               .joins(:resource_links_from)
+               .where(decidim_resource_links: { to_type: related_to.camelcase })
+
+        to = query
+             .joins(:resource_links_to)
+             .where(decidim_resource_links: { from_type: related_to.camelcase })
 
-      # Returns the random seed used to randomize the proposals.
-      def random_seed
-        @random_seed = (rand * 2 - 1) if @random_seed == 0.0 || @random_seed > 1 || @random_seed < -1
-        @random_seed
+        query.where(id: from).or(query.where(id: to))
       end
     end
   end

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title", title: proposal.title %></h3>
 
-<%= form_for(@form, url: proposal_proposal_answer_path(proposal, @form)) do |f| %>
+<%=  decidim_form_for(@form, url: proposal_proposal_answer_path(proposal, @form)) do |f| %>
   <div class="field">
     <%= f.collection_radio_buttons :state, [["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, prompt: true %>
   </div>

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

@@ -1,6 +1,6 @@
 <h3><%= t ".title" %></h3>
 
-<%= form_for(@form) do |f| %>
+<%=  decidim_form_for(@form) do |f| %>
   <%= render partial: 'form', object: f %>
 
   <div class="actions">

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

@@ -16,13 +16,21 @@
 
   <%= form.collection_radio_buttons :state, [["all", t('.all')], ["accepted", t('.accepted')], ["rejected", t('.rejected')]], :first, :last, legend_title: t('.state') %>
 
+  <% if linked_classes_for(Decidim::Proposals::Proposal).any? %>
+    <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Proposals::Proposal), :first, :last, legend_title: t('.related_to') %>
+  <% end %>
+
   <% if current_user && current_settings.votes_enabled? %>
     <%= form.collection_check_boxes :activity, [["voted", t('.voted')]], :first, :last, legend_title: t('.activity') %>
   <% end %>
 
+  <% if current_organization.scopes.any? %>
+    <%= form.collection_check_boxes :scope_id, current_organization.scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+  <% end %>
+
   <% if current_feature.categories.any? %>
     <%= form.categories_select :category_id, current_feature.categories, legend_title: t('.category'), disable_parents: false, label: false, include_blank: true %>
   <% end %>
 
-  <%= form.hidden_field :random_seed %>
+  <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>
 <% end %>

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

@@ -19,11 +19,7 @@
       </div>
       <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
       <p><%= truncate(proposal.body, length: 100) %></p>
-      <% if proposal.category %>
-        <ul class="tags tags--proposal">
-          <li><a href=""><%= translated_attribute(proposal.category.name) %></a></li>
-        </ul>
-      <% end %>
+      <%= render partial: "tags", locals: { proposal: proposal } %>
     </div>
     <div class="card__footer">
       <div class="card__support">
@@ -31,7 +27,7 @@
           <div id="proposal-<%= proposal.id %>-votes-count" class="card__support__data">
             <%= render partial: "votes_count", locals: { proposal: proposal, from_proposals_list: true } %>
           </div>
-          <div id="proposal-<%= proposal.id %>-vote-button"> 
+          <div id="proposal-<%= proposal.id %>-vote-button">
             <%= render partial: "vote_button", locals: { proposal: proposal, from_proposals_list: true } %>
           </div>
         <% elsif !current_settings.votes_enabled? || current_settings.votes_enabled? && current_settings.votes_blocked? %>

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

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

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

@@ -0,0 +1,10 @@
+<% if proposal.category.present? || proposal.scope.present? %>
+  <ul class="tags tags--proposal" >
+    <% 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? %>
+      <li><%= link_to proposal.scope.name, decidim_proposals.proposals_path(filter: { scope_id: [proposal.scope.id] }) %></li>
+    <% end %>
+  </ul>
+<% end %>

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

@@ -1,7 +1,11 @@
-<% if current_user %>
-  <% if proposal.voted_by? current_user %>
+<% if !current_user %>
+  <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
+    <%= t('.vote') %>
+  </button>
+<% else %>
+  <% if @voted_proposals ? @voted_proposals.include?(proposal.id) : proposal.voted_by?(current_user) %>
     <% if vote_limit_enabled? %>
-      <%= button_to t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
+      <%= action_authorized_button_to :vote, t('.already_voted'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), method: :delete, remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)} success" %>
     <% else %>
       <button class="card__button button <%= vote_button_classes(from_proposals_list) %> success">
         <%= t('.already_voted') %>
@@ -9,17 +13,13 @@
     <% end %>
   <% else %>
     <% if vote_limit_enabled? && remaining_votes_count_for(current_user) == 0 %>
-      <%= button_to t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
+      <%= action_authorized_button_to :vote, t('.no_votes_remaining'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}", disabled: true %>
     <% elsif current_settings.votes_blocked? %>
       <button class="card__button button <%= vote_button_classes(from_proposals_list) %> disabled">
         <%= t('.votes_blocked') %>
       </button>
     <% else %>
-      <%= button_to t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
+      <%= action_authorized_button_to "vote", t('.vote'), proposal_proposal_vote_path(proposal_id: proposal, from_proposals_list: from_proposals_list), remote: true, data: { disable: true }, class: "card__button button #{vote_button_classes(from_proposals_list)}" %>
     <% end %>
   <% end %>
-<% else %>
-  <button class="card__button button <%= vote_button_classes(from_proposals_list) %>" data-toggle="loginModal">
-    <%= t('.vote') %>
-  </button>
 <% end %>