decidim 0.0.3 → 0.0.4

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

@@ -1,6 +1,6 @@
 <span class="<%= votes_count_classes(from_proposals_list)[:number] %>">
-  <%= proposal.votes.size %>
+  <%= proposal.proposal_votes_count %>
 </span>
 <span class="<%= votes_count_classes(from_proposals_list)[:label]  %>">
-  <%= t('.count', count: proposal.votes.size) %>
+  <%= t('.count', count: proposal.proposal_votes_count) %>
 </span>

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

@@ -1,11 +1,15 @@
+<% add_meta_tags({
+  title: t(".meta_title", feature_name: translated_attribute(current_feature.name))
+}) %>
+
 <%= render partial: "votes_limit" %>
 <div class="row columns">
   <div class="title-action">
     <h2 id="proposals-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
     </h2>
-    <% if can? :create, Decidim::Proposals::Proposal %>
-      <%= link_to new_proposal_path, class: "title-action__action button small hollow" do %>
+    <% if current_settings.creation_enabled %>
+      <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small hollow" do %>
         <%= t(".new_proposal") %>
         <%= icon "plus" %>
       <% end %>
@@ -30,4 +34,4 @@
 </div>
 
 <%= javascript_include_tag("decidim/filters") %>
-<%= render partial: "decidim/shared/login_modal" %>
+<%= javascript_include_tag "decidim/orders" %>

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

@@ -1,5 +1,10 @@
 var $proposals = $('#proposals');
 var $proposalsCount = $('#proposals-count');
+var $orderFilterInput = $('.order_filter');
 
 $proposals.html('<%= j(render partial: "proposals") %>');
-$proposalsCount.html('<%= j(render partial: "count") %>');
+$proposalsCount.html('<%= j(render partial: "count") %>');
+$orderFilterInput.val('<%= order %>');
+
+var $dropdownMenu = $('.dropdown.menu:last');
+$dropdownMenu.foundation();

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

@@ -9,7 +9,7 @@
   <div class="columns large-6 medium-centered">
     <div class="card">
       <div class="card__content">
-        <%= form_for(@form) do |form| %>
+        <%= decidim_form_for(@form) do |form| %>
           <div class="field">
             <%= form.text_field :title %>
           </div>

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

@@ -1,7 +1,8 @@
-<% content_for :meta_description, @proposal.body %>
-<% content_for :meta_title, @proposal.title %>
-<% content_for :meta_url, proposal_url(@proposal.id) %>
-<% content_for :twitter_handler, current_organization.twitter_handler %>
+<% add_meta_tags({
+  description: @proposal.body,
+  title: @proposal.title,
+  url: proposal_url(@proposal.id)
+}) %>
 
 <%= render partial: "votes_limit" %>
 <div class="row column view-header">
@@ -34,30 +35,30 @@
         </div>
       </div>
     <% end %>
-    <%= render partial: "share", locals: { proposal: @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 @proposal.category || @proposal.scope %>
-        <ul class="tags tags--proposal">
-          <% if @proposal.category %>
-            <li><a href=""><%= translated_attribute(@proposal.category.name) %></a></li>
-          <% end %>
-          <% if @proposal.scope %>
-            <li><a href=""><%= @proposal.scope.name %></a></li>
-          <% end %>
-        </ul>
-      <% end %>
+      <%= render partial: "tags", locals: { proposal: @proposal } %>
     </div>
-    <% if @proposal.rejected? %>
-      <div class="section">
-        <div class="callout warning">
-          <h5><%= t(".proposal_rejected_reason") %></h5>
-          <p><%= translated_attribute @proposal.answer %></p>
+    <% if @proposal.answered? && translated_attribute(@proposal.answer).present? %>
+      <% if @proposal.accepted? %>
+        <div class="section">
+          <div class="callout success">
+            <h5><%= t(".proposal_accepted_reason") %></h5>
+            <p><%= translated_attribute @proposal.answer %></p>
+          </div>
         </div>
-      </div>
+      <% else %>
+        <div class="section">
+          <div class="callout warning">
+            <h5><%= t(".proposal_rejected_reason") %></h5>
+            <p><%= translated_attribute @proposal.answer %></p>
+          </div>
+        </div>
+      <% end %>
     <% end %>
     <%= linked_resources_for @proposal, :results, "included_proposals" %>
     <%= linked_resources_for @proposal, :projects, "included_proposals" %>
@@ -71,7 +72,5 @@
   <% end %>
 <% end %>
 
-<%= render partial: "decidim/shared/login_modal" %>
-
 <%= javascript_include_tag "decidim/proposals/social_share" %>
 <%= stylesheet_link_tag "decidim/proposals/social_share" %>

data/decidim-proposals/config/i18n-tasks.yml

@@ -6,3 +6,5 @@ ignore_unused:
 - "decidim.resource_links.*"
 - "activemodel.attributes.proposal.*"
 - "decidim.proposals.answers.*"
+- "decidim.features.proposals.actions.*"
+- "decidim.proposals.proposals.orders.*"

data/decidim-proposals/config/locales/ca.yml

@@ -10,12 +10,15 @@ ca:
   decidim:
     features:
       proposals:
+        actions:
+          create: Crear propostes
+          vote: Votar
         name: Propostes
         settings:
           step:
             creation_enabled: Habilitar de creació de propostes
-            votes_blocked: Vots bloquejats
-            votes_enabled: Vots habilitats
+            votes_blocked: Suports bloquejats
+            votes_enabled: Suports habilitats
     proposals:
       actions:
         answer: Respondre
@@ -75,6 +78,8 @@ ca:
           official: Oficial
           origin: Origen
           rejected: Rebutjades
+          related_to: Relacionat amb
+          scopes: Àmbits
           search: Cerca
           state: Estat
           voted: Votat
@@ -84,40 +89,43 @@ ca:
           filter_for: Filtrar per
           unfold: Desplegar
         index:
+          meta_title: "%{feature_name}"
           new_proposal: Nova proposta
         linked_proposals:
           proposal_votes:
-            one: <span class="card--list__data__number">1</span>vot
-            other: <span class="card--list__data__number">%{count}</span>vots
+            one: <span class="card--list__data__number">1</span>suport
+            other: <span class="card--list__data__number">%{count}</span>suports
         new:
           back: Enrere
           select_a_category: Si us plau, seleccioni una categoria
           select_a_scope: Si us plau, seleccioni un àmbit
           send: Enviar
           title: Nova proposta
+        orders:
+          label: 'Ordenar propostes per:'
+          most_voted: Més votat
+          random: Aleatori
+          recent: Recent
         proposal:
           view_proposal: Veure proposta
-        share:
-          close_window: Tanca la finestra
-          share: Compartir
-          share_link: Comparteix l'enllaç
         show:
+          proposal_accepted_reason: 'Aquesta proposta ha estat acceptada perquè:'
           proposal_rejected_reason: 'Aquesta proposta ha estat rebutjada perquè:'
         vote_button:
           already_voted: Ja has votat
-          no_votes_remaining: No hi ha vots restants
+          no_votes_remaining: No hi ha suports restants
           vote: Votar
-          votes_blocked: Votació desactivada
+          votes_blocked: Recollida de suports desactivada
         votes_count:
           count:
-            one: VOT
-            other: VOTS
+            one: SUPORT
+            other: SUPORTS
         votes_limit:
           vote_limit:
-            description: En lloc de votar tantes propostes com vulgui, només es pot votar fins %{limit} propostes.
+            description: En lloc de donar suport a tantes propostes com es vulgui, només es pot donar suport fins a un màxim de %{limit} propostes.
             left: Restant
-            title: Té %{limit} vots a distribuir
-            votes: Vots
+            title: Té %{limit} suports a distribuir
+            votes: Suports
     resource_links:
       included_proposals:
         results: 'La proposta apareix en aquests resultats:'

data/decidim-proposals/config/locales/en.yml

@@ -11,6 +11,9 @@ en:
   decidim:
     features:
       proposals:
+        actions:
+          create: Create proposals
+          vote: Vote
         name: Proposals
         settings:
           step:
@@ -76,6 +79,8 @@ en:
           official: Official
           origin: Origin
           rejected: Rejected
+          related_to: Related to
+          scopes: Scopes
           search: Search
           state: State
           voted: Voted
@@ -85,6 +90,7 @@ en:
           filter_for: Filter by
           unfold: Unfold
         index:
+          meta_title: "%{feature_name}"
           new_proposal: New proposal
         linked_proposals:
           proposal_votes:
@@ -96,13 +102,15 @@ en:
           select_a_scope: Please select a scope
           send: Send
           title: New proposal
+        orders:
+          label: 'Order proposals by:'
+          most_voted: Most voted
+          random: Random
+          recent: Recent
         proposal:
           view_proposal: View proposal
-        share:
-          close_window: Close window
-          share: Share
-          share_link: Share link
         show:
+          proposal_accepted_reason: 'This proposal has been accepted because:'
           proposal_rejected_reason: 'This proposal has been rejected because:'
         vote_button:
           already_voted: Already voted

data/decidim-proposals/config/locales/es.yml

@@ -10,6 +10,9 @@ es:
   decidim:
     features:
       proposals:
+        actions:
+          create: Crear propuestas
+          vote: Votar
         name: Propuestas
         settings:
           step:
@@ -75,6 +78,8 @@ es:
           official: Oficial
           origin: Origen
           rejected: Rechazadas
+          related_to: Relacionado con
+          scopes: Ámbitos
           search: Buscar
           state: Estado
           voted: Votado
@@ -84,6 +89,7 @@ es:
           filter_for: Filtrar por
           unfold: Desplegar
         index:
+          meta_title: "%{feature_name}"
           new_proposal: Nueva propuesta
         linked_proposals:
           proposal_votes:
@@ -95,13 +101,15 @@ es:
           select_a_scope: Por favor, seleccione un ámbito
           send: Enviar
           title: Nueva propuesta
+        orders:
+          label: 'Ordenar propuestas por:'
+          most_voted: Más votado
+          random: Aleatorio
+          recent: Reciente
         proposal:
           view_proposal: Ver propuesta
-        share:
-          close_window: Cerrar ventana
-          share: Compartir
-          share_link: Compartir enlace
         show:
+          proposal_accepted_reason: 'Esta propuesta ha sido aceptada porque:'
           proposal_rejected_reason: 'Esta propuesta ha sido rechazada porque:'
         vote_button:
           already_voted: Ya votado

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

@@ -0,0 +1,5 @@
+eu:
+  activemodel:
+    attributes:
+      proposal:
+        category_id: Kategoria

data/decidim-proposals/db/migrate/20170205082832_add_index_to_decidim_proposals_proposals_proposal_votes_count.rb

@@ -0,0 +1,7 @@
+class AddIndexToDecidimProposalsProposalsProposalVotesCount < ActiveRecord::Migration[5.0]
+  def change
+    add_index :decidim_proposals_proposals, :proposal_votes_count
+    add_index :decidim_proposals_proposals, :created_at
+    add_index :decidim_proposals_proposals, :state
+  end
+end

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

@@ -13,6 +13,8 @@ Decidim.register_feature(:proposals) do |feature|
     end
   end
 
+  feature.actions = %w(vote create)
+
   feature.settings(:global) do |settings|
     settings.attribute :vote_limit, type: :integer, default: 0
     settings.attribute :comments_always_enabled, type: :boolean, default: true
@@ -37,6 +39,7 @@ Decidim.register_feature(:proposals) do |feature|
       feature = Decidim::Feature.create!(
         name: Decidim::Features::Namer.new(process.organization.available_locales, :proposals).i18n_name,
         manifest_name: :proposals,
+        published_at: Time.current,
         participatory_process: process,
         settings: {
           vote_limit: 0
@@ -45,10 +48,14 @@ Decidim.register_feature(:proposals) do |feature|
           process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
         }
       )
+      categories = feature.participatory_process.categories
+      scopes = feature.organization.scopes
 
       20.times do |n|
         proposal = Decidim::Proposals::Proposal.create!(
           feature: feature,
+          category: categories.sample,
+          scope: scopes.sample,
           title: Faker::Lorem.sentence(2),
           body: Faker::Lorem.paragraphs(2).join("\n"),
           author: Decidim::User.where(organization: feature.organization).all.sample
@@ -75,7 +82,9 @@ Decidim.register_feature(:proposals) do |feature|
                                          name: name,
                                          organization: feature.organization,
                                          tos_agreement: "1",
-                                         confirmed_at: Time.now)
+                                         confirmed_at: Time.current,
+                                         comments_notifications: true,
+                                         replies_notifications: true)
 
           Decidim::Proposals::ProposalVote.create!(proposal: proposal,
                                                    author: author)

data/decidim-proposals/lib/decidim/proposals/test/factories.rb

@@ -7,7 +7,7 @@ require "decidim/results/test/factories"
 require "decidim/budgets/test/factories"
 
 FactoryGirl.define do
-  factory :proposal_feature, class: Decidim::Feature do
+  factory :proposal_feature, parent: :feature do
     name { Decidim::Features::Namer.new(participatory_process.organization.available_locales, :proposals).i18n_name }
     manifest_name :proposals
     participatory_process { create(:participatory_process, :with_steps) }

data/decidim-proposals/spec/commands/decidim/proposals/admin_create_proposal_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "spec_helper"
-require_relative "../../../shared/create_proposal_examples"
 
 module Decidim
   module Proposals

data/decidim-proposals/spec/commands/decidim/proposals/create_proposal_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 require "spec_helper"
-require_relative "../../../shared/create_proposal_examples"
 
 module Decidim
   module Proposals

data/decidim-proposals/spec/features/admin_manages_proposals_spec.rb

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

data/decidim-proposals/spec/features/process_admin_manages_proposals_spec.rb

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

data/decidim-proposals/spec/features/proposals_spec.rb

@@ -77,6 +77,18 @@ describe "Proposals", type: :feature do
             expect(page).to have_content(user_group.name)
           end
         end
+
+        context "when the user isn't authorized" do
+          before do
+            feature.update_attribute(:permissions, create: { authorization_handler_name: "decidim/dummy_authorization_handler" })
+            visit_feature
+          end
+
+          it "should show a modal dialog" do
+            click_link "New proposal"
+            expect(page).to have_content("Authorization required")
+          end
+        end
       end
 
       context "when creation is not enabled" do
@@ -169,6 +181,7 @@ describe "Proposals", type: :feature do
         click_link proposal.title
 
         expect(page).to have_content("Accepted")
+        expect(page).to have_i18n_content(proposal.answer)
       end
     end
 
@@ -183,6 +196,18 @@ describe "Proposals", type: :feature do
         expect(page).to have_i18n_content(proposal.answer)
       end
     end
+
+    context "when a proposal has been accepted" do
+      let!(:proposal) { create(:proposal, :accepted, feature: feature) }
+
+      it "shows the acceptance reason" do
+        visit_feature
+        click_link proposal.title
+
+        expect(page).to have_content("Accepted")
+        expect(page).to have_i18n_content(proposal.answer)
+      end
+    end
   end
 
   context "when a proposal has been linked in a project" do
@@ -286,5 +311,57 @@ describe "Proposals", type: :feature do
         end
       end
     end
+
+    context "when ordering" do
+      context "by 'most_support'" do
+        let!(:feature) do
+          create(:proposal_feature,
+            :with_votes_enabled,
+            manifest: manifest,
+            participatory_process: participatory_process)
+        end
+
+        before do
+          proposals.each do |proposal|
+            create(:proposal_vote, proposal: proposal)
+          end
+        end
+
+        it "lists the proposals ordered by votes" do
+          most_voted_proposal = create(:proposal, feature: feature)
+          create_list(:proposal_vote, 3, proposal: most_voted_proposal)
+          less_voted_proposal = create(:proposal, feature: feature)
+
+          visit_feature
+
+          within ".order-by" do
+            page.find('.dropdown.menu .is-dropdown-submenu-parent').hover
+          end
+
+          click_link "Most voted"
+
+          expect(page.find('#proposals .card-grid .column:first-child', text: most_voted_proposal.title)).to be
+          expect(page.find('#proposals .card-grid .column:last-child', text: less_voted_proposal.title)).to be
+        end
+      end
+
+      context "by 'recent'" do
+        it "lists the proposals ordered by created at" do
+          older_proposal = create(:proposal, feature: feature, created_at: 1.month.ago)
+          recent_proposal = create(:proposal, feature: feature)
+
+          visit_feature
+
+          within ".order-by" do
+            page.find('.dropdown.menu .is-dropdown-submenu-parent').hover
+          end
+
+          click_link "Recent"
+
+          expect(page.find('#proposals .card-grid .column:first-child', text: recent_proposal.title)).to be
+          expect(page.find('#proposals .card-grid .column:last-child', text: older_proposal.title)).to be
+        end
+      end
+    end
   end
 end