decidim 0.4.4 → 0.5.0

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? && !current_participatory_process.scope %>
-    <%= form.collection_check_boxes :scope_id, search_organization_scopes, lambda {|scope| scope.id.to_s}, :name, legend_title: t('.scopes') %>
+  <% if current_participatory_process.has_subscopes? %>
+    <%= form.scopes_select :scope_id, legend_title: t(".scopes"), label: false, prompt: t('.scope_prompt'), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope, include_root: true), multiple: true %>
   <% end %>
 
   <% if current_feature.categories.any? %>

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

@@ -15,4 +15,4 @@
   <div class="filters">
     <%= render partial: "filters" %>
   </div>
-</div>
+</div>

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

@@ -12,7 +12,7 @@
       </div>
       <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
       <p><%= truncate(proposal.body, length: 100) %></p>
-      <%= render partial: "tags", locals: { proposal: proposal } %>
+      <%= render partial: "decidim/shared/tags", locals: { resource: proposal, tags_class_extra: "tags--proposal" } %>
     </div>
     <div class="card__footer">
       <div class="card__support">

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

@@ -1,3 +1,5 @@
+<%= render partial: "decidim/shared/feature_announcement" %>
+
 <% if feature_settings.geocoding_enabled? %>
   <%= dynamic_map_for proposals_data_for_map(geocoded_proposals) do %>
     <template id="marker-popup">

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

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

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

@@ -5,9 +5,14 @@
   <% end %>
   <h2 class="section-heading"><%= t(".title") %></h2>
 </div>
+
 <div class="row">
   <div class="columns large-6 medium-centered">
     <div class="card">
+      <% if translated_attribute(feature_settings.new_proposal_help_text).present? %>
+        <%= render partial: "decidim/shared/announcement", locals: { announcement: feature_settings.new_proposal_help_text } %>
+      <% end %>
+
       <div class="card__content">
         <%= decidim_form_for(@form) do |form| %>
           <div class="field">
@@ -33,9 +38,9 @@
             </div>
           <% end %>
 
-          <% if !@form.process_scope %>
+          <% if current_participatory_process.has_subscopes? %>
             <div class="field">
-              <%= form.collection_select :scope_id, organization_scopes, :id, :name %>
+              <%= form.scopes_select :scope_id, prompt: I18n.t("decidim.scopes.global"), remote_path: decidim.scopes_search_path(root: current_participatory_process.scope) %>
             </div>
           <% end %>
 
@@ -45,6 +50,21 @@
             </div>
           <% end %>
 
+          <% if feature_settings.attachments_allowed? %>
+            <fieldset>
+              <legend><%= t('.attachment_legend') %></legend>
+              <%= form.fields_for :attachment, @form.attachment do |form| %>
+                <div class="field">
+                  <%= form.text_field :title %>
+                </div>
+
+                <div class="field">
+                  <%= form.upload :file, optional: false %>
+                </div>
+              <% end %>
+            </fieldset>
+          <% end %>
+
           <div class="actions">
             <%= form.submit t(".send"), class: "button expanded", "data-disable-with" => "#{t('.send')}..." %>
           </div>

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

@@ -37,7 +37,7 @@
       <% if feature_settings.geocoding_enabled? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
       <% end %>
-      <%= render partial: "tags", locals: { proposal: @proposal } %>
+      <%= render partial: "decidim/shared/tags", locals: { resource: @proposal, tags_class_extra: "tags--proposal" } %>
     </div>
     <% if @proposal.answered? && translated_attribute(@proposal.answer).present? %>
       <% if @proposal.accepted? %>
@@ -61,6 +61,7 @@
     <%= linked_resources_for @proposal, :meetings, "proposals_from_meeting" %>
   </div>
 </div>
+<%= attachments_for @proposal %>
 
 <%= comments_for @proposal %>
 

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

@@ -10,6 +10,6 @@ ignore_unused:
 - "decidim.proposals.admin.exports.proposals"
 - "decidim.proposals.admin.exports.comments"
 ignore_missing:
-  - decidim.participatory_processes.scopes.global
+  - decidim.scopes.global
 search:
   strict: false

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

@@ -104,6 +104,7 @@ ca:
           origin: Origen
           rejected: Rebutjades
           related_to: Relacionat amb
+          scope_prompt: Seleccioneu un àmbit
           scopes: Àmbits
           search: Cerca
           state: Estat
@@ -156,4 +157,4 @@ ca:
         proposal_projects: 'Proposta formulada en aquests projectes:'
         proposal_results: 'La proposta apareix en aquests resultats:'
       proposals_from_meeting:
-        proposal_meetings: Trobades relacionades
+        proposal_meetings: Trobades relacionades

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

@@ -19,12 +19,16 @@ en:
         name: Proposals
         settings:
           global:
+            announcement: Announcement
+            attachments_allowed: Allow attachments
             comments_enabled: Comments enabled
             geocoding_enabled: Geocoding enabled
+            new_proposal_help_text: New proposal help text
             official_proposals_enabled: Official proposals enabled
             proposal_answering_enabled: Proposal answering enabled
             vote_limit: Vote limit
           step:
+            announcement: Announcement
             comments_blocked: Comments blocked
             creation_enabled: Proposal creation enabled
             proposal_answering_enabled: Proposal answering enabled
@@ -61,6 +65,7 @@ en:
             invalid: There's been a problem creating this proposal
             success: Proposal successfully created
           form:
+            attachment_legend: "(Optional) Add an attachment"
             select_a_category: Select a category
           index:
             title: Proposals
@@ -106,6 +111,7 @@ en:
           origin: Origin
           rejected: Rejected
           related_to: Related to
+          scope_prompt: Select a scope
           scopes: Scopes
           search: Search
           state: State
@@ -123,6 +129,7 @@ en:
             one: <span class="card--list__data__number">1</span>vote
             other: <span class="card--list__data__number">%{count}</span>votes
         new:
+          attachment_legend: "(Optional) Add an attachment"
           back: Back
           select_a_category: Please select a category
           send: Send

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

@@ -104,6 +104,7 @@ es:
           origin: Origen
           rejected: Rechazadas
           related_to: Relacionado con
+          scope_prompt: Seleccione un ámbito
           scopes: Ámbitos
           search: Buscar
           state: Estado
@@ -156,4 +157,4 @@ es:
         proposal_projects: 'Propuesta formulada en estos proyectos:'
         proposal_results: 'Propuesta formulada en estos resultados:'
       proposals_from_meeting:
-        proposal_meetings: Encuentros relacionados
+        proposal_meetings: Encuentros relacionados

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

@@ -145,4 +145,4 @@ eu:
         proposal_projects: 'Proiektu hauetatik sortutako proposamena:'
         proposal_results: 'Emaitza hauetatik sortutako proposamena:'
       proposals_from_meeting:
-        proposal_meetings: Proposamenarekin lotutako topaketak
+        proposal_meetings: Proposamenarekin lotutako topaketak

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

@@ -132,4 +132,4 @@ fi:
         proposal_projects: 'Ehdotus esiintyy näissä projekteissa:'
         proposal_results: 'Ehdotus esiintyy näissä tuloksissa:'
       proposals_from_meeting:
-        proposal_meetings: Liittyvät tapaamiset
+        proposal_meetings: Liittyvät tapaamiset

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

@@ -142,4 +142,4 @@ fr:
         proposal_projects: 'Proposition figurant dans ces projets :'
         proposal_results: 'Proposition figurant dans ces résultats :'
       proposals_from_meeting:
-        proposal_meetings: Rencontres connexes
+        proposal_meetings: Rencontres connexes

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

@@ -144,4 +144,4 @@ it:
         proposal_projects: 'Le proposte compaiono nei seguenti progetti:'
         proposal_results: 'Le proposte compaiono nei seguenti risultati:'
       proposals_from_meeting:
-        proposal_meetings: Meeting associati alla proposta
+        proposal_meetings: Meeting associati alla proposta

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

@@ -2,4 +2,4 @@ nl:
   activemodel:
     attributes:
       proposal:
-        title: Titel
+        title: Titel

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

@@ -0,0 +1,5 @@
+pl:
+  activemodel:
+    attributes:
+      proposal:
+        title: Tytuł

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

@@ -21,6 +21,9 @@ Decidim.register_feature(:proposals) do |feature|
     settings.attribute :official_proposals_enabled, type: :boolean, default: true
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :geocoding_enabled, type: :boolean, default: false
+    settings.attribute :attachments_allowed, type: :boolean, default: false
+    settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :new_proposal_help_text, type: :text, translated: true, editor: true
   end
 
   feature.settings(:step) do |settings|
@@ -30,6 +33,7 @@ Decidim.register_feature(:proposals) do |feature|
     settings.attribute :comments_blocked, type: :boolean, default: false
     settings.attribute :creation_enabled, type: :boolean
     settings.attribute :proposal_answering_enabled, type: :boolean, default: true
+    settings.attribute :announcement, type: :text, translated: true, editor: true
   end
 
   feature.register_resource do |resource|
@@ -84,8 +88,14 @@ Decidim.register_feature(:proposals) do |feature|
         process.active_step.id => { votes_enabled: true, votes_blocked: false, creation_enabled: true }
       }
     )
-    # So that we have some with global scope
-    scopes = feature.organization.scopes + [nil]
+
+    if process.scope
+      scopes = process.scope.descendants
+      global = process.scope
+    else
+      scopes = process.organization.scopes
+      global = nil
+    end
 
     20.times do |n|
       author = Decidim::User.where(organization: feature.organization).all.sample
@@ -103,7 +113,7 @@ Decidim.register_feature(:proposals) do |feature|
       proposal = Decidim::Proposals::Proposal.create!(
         feature: feature,
         category: process.categories.sample,
-        scope: scopes.sample,
+        scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
         title: Faker::Lorem.sentence(2),
         body: Faker::Lorem.paragraphs(2).join("\n"),
         author: author,

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

@@ -60,6 +60,14 @@ FactoryGirl.define do
         }
       end
     end
+
+    trait :with_attachments_allowed do
+      settings do
+        {
+          attachments_allowed: true
+        }
+      end
+    end
   end
 
   factory :proposal, class: Decidim::Proposals::Proposal do

data/decidim-proposals/spec/controllers/concerns/{orderable_test.rb → orderable_spec.rb}

@@ -4,7 +4,7 @@ require "spec_helper"
 
 module Decidim
   module Proposals
-    class OrderableFakeController < ApplicationController
+    class OrderableFakeController < Decidim::ApplicationController
       include Orderable
     end
 

data/decidim-proposals/spec/controllers/decidim/admin/proposal_answers_controller_spec.rb

@@ -14,7 +14,6 @@ module Decidim
 
         before do
           @request.env["decidim.current_organization"] = feature.organization
-          @request.env["decidim.current_participatory_process"] = feature.participatory_process
           @request.env["decidim.current_feature"] = feature
           sign_in user
         end

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

@@ -12,4 +12,6 @@ describe "Admin manages proposals", type: :feature do
   it_behaves_like "manage proposals"
   it_behaves_like "manage moderations"
   it_behaves_like "export proposals"
+  it_behaves_like "manage announcements"
+  it_behaves_like "manage proposals help texts"
 end

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

@@ -12,4 +12,6 @@ describe "Process admin manages proposals", type: :feature do
   it_behaves_like "manage proposals"
   it_behaves_like "manage moderations"
   it_behaves_like "export proposals"
+  it_behaves_like "manage announcements"
+  it_behaves_like "manage proposals help texts"
 end

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

@@ -7,8 +7,8 @@ describe "Proposals", type: :feature do
   let(:manifest_name) { "proposals" }
 
   let!(:category) { create :category, participatory_process: participatory_process }
-  let!(:scope) { create :scope, organization: organization }
-  let!(:user) { create :user, :confirmed, organization: organization }
+  let!(:scope) { create :scope, organization: participatory_process.organization }
+  let!(:user) { create :user, :confirmed, organization: participatory_process.organization }
 
   let(:address) { "Carrer Pare Llaurador 113, baixos, 08224 Terrassa" }
   let(:latitude) { 40.1234 }
@@ -60,7 +60,7 @@ describe "Proposals", type: :feature do
             click_link "New proposal"
 
             within "form.new_proposal" do
-              expect(page).not_to have_content("Scope")
+              expect(page).to have_no_content("Scope")
             end
           end
         end
@@ -73,8 +73,8 @@ describe "Proposals", type: :feature do
           within ".new_proposal" do
             fill_in :proposal_title, with: "Oriol for president"
             fill_in :proposal_body, with: "He will solve everything"
-            select category.name["en"], from: :proposal_category_id
-            select scope.name, from: :proposal_scope_id
+            select translated(category.name), from: :proposal_category_id
+            select2 translated(scope.name), xpath: '//select[@id="proposal_scope_id"]/..', search: true
 
             find("*[type=submit]").click
           end
@@ -82,8 +82,8 @@ describe "Proposals", type: :feature do
           expect(page).to have_content("successfully")
           expect(page).to have_content("Oriol for president")
           expect(page).to have_content("He will solve everything")
-          expect(page).to have_content(category.name["en"])
-          expect(page).to have_content(scope.name)
+          expect(page).to have_content(translated(category.name))
+          expect(page).to have_content(translated(scope.name))
           expect(page).to have_content(user.name)
         end
 
@@ -107,8 +107,8 @@ describe "Proposals", type: :feature do
               check :proposal_has_address
 
               fill_in :proposal_address, with: address
-              select category.name["en"], from: :proposal_category_id
-              select scope.name, from: :proposal_scope_id
+              select translated(category.name), from: :proposal_category_id
+              select2 translated(scope.name), xpath: '//select[@id="proposal_scope_id"]/..', search: true
 
               find("*[type=submit]").click
             end
@@ -117,8 +117,8 @@ describe "Proposals", type: :feature do
             expect(page).to have_content("Oriol for president")
             expect(page).to have_content("He will solve everything")
             expect(page).to have_content(address)
-            expect(page).to have_content(category.name["en"])
-            expect(page).to have_content(scope.name)
+            expect(page).to have_content(translated(category.name))
+            expect(page).to have_content(translated(scope.name))
             expect(page).to have_content(user.name)
           end
         end
@@ -137,8 +137,8 @@ describe "Proposals", type: :feature do
             within ".new_proposal" do
               fill_in :proposal_title, with: "Oriol for president"
               fill_in :proposal_body, with: "He will solve everything"
-              select category.name["en"], from: :proposal_category_id
-              select scope.name, from: :proposal_scope_id
+              select translated(category.name), from: :proposal_category_id
+              select2 translated(scope.name), xpath: '//select[@id="proposal_scope_id"]/..', search: true
               select user_group.name, from: :proposal_user_group_id
 
               find("*[type=submit]").click
@@ -147,8 +147,8 @@ describe "Proposals", type: :feature do
             expect(page).to have_content("successfully")
             expect(page).to have_content("Oriol for president")
             expect(page).to have_content("He will solve everything")
-            expect(page).to have_content(category.name["en"])
-            expect(page).to have_content(scope.name)
+            expect(page).to have_content(translated(category.name))
+            expect(page).to have_content(translated(scope.name))
             expect(page).to have_content(user_group.name)
           end
 
@@ -172,8 +172,8 @@ describe "Proposals", type: :feature do
                 check :proposal_has_address
 
                 fill_in :proposal_address, with: address
-                select category.name["en"], from: :proposal_category_id
-                select scope.name, from: :proposal_scope_id
+                select translated(category.name), from: :proposal_category_id
+                select2 translated(scope.name), xpath: '//select[@id="proposal_scope_id"]/..', search: true
                 select user_group.name, from: :proposal_user_group_id
 
                 find("*[type=submit]").click
@@ -183,8 +183,8 @@ describe "Proposals", type: :feature do
               expect(page).to have_content("Oriol for president")
               expect(page).to have_content("He will solve everything")
               expect(page).to have_content(address)
-              expect(page).to have_content(category.name["en"])
-              expect(page).to have_content(scope.name)
+              expect(page).to have_content(translated(category.name))
+              expect(page).to have_content(translated(scope.name))
               expect(page).to have_content(user_group.name)
             end
           end
@@ -201,6 +201,36 @@ describe "Proposals", type: :feature do
             expect(page).to have_content("Authorization required")
           end
         end
+
+        context "when attachments are allowed", processing_uploads_for: Decidim::AttachmentUploader do
+          let!(:feature) do
+            create(:proposal_feature,
+                   :with_creation_enabled,
+                   :with_attachments_allowed,
+                   manifest: manifest,
+                   participatory_process: participatory_process)
+          end
+
+          it "creates a new proposal with attachments" do
+            visit_feature
+
+            click_link "New proposal"
+
+            within ".new_proposal" do
+              fill_in :proposal_title, with: "Proposal with attachments"
+              fill_in :proposal_body, with: "This is my proposal and I want to upload attachments."
+              fill_in :proposal_attachment_title, with: "My attachment"
+              attach_file :proposal_attachment_file, Decidim::Dev.asset("city.jpeg")
+              find("*[type=submit]").click
+            end
+
+            expect(page).to have_content("successfully")
+
+            within ".section.images" do
+              expect(page).to have_selector("img[src*=\"city.jpeg\"]", count: 1)
+            end
+          end
+        end
       end
 
       context "when creation is not enabled" do
@@ -244,7 +274,7 @@ describe "Proposals", type: :feature do
       it "can be filtered by scope" do
         visit_feature
         click_link proposal.title
-        expect(page).to have_content(scope.name)
+        expect(page).to have_content(translated(scope.name))
       end
     end
 
@@ -258,7 +288,7 @@ describe "Proposals", type: :feature do
       it "does not show the scope name" do
         visit_feature
         click_link proposal.title
-        expect(page).not_to have_content(scope.name)
+        expect(page).to have_no_content(translated(scope.name))
       end
     end
 
@@ -557,23 +587,60 @@ describe "Proposals", type: :feature do
           visit_feature
 
           within "form.new_filter" do
-            expect(page).not_to have_content(/Origin/i)
+            expect(page).to have_no_content(/Origin/i)
           end
         end
       end
 
-      context "when scoped_proposals setting is enabled" do
-        before do
-          feature.update_attributes(settings: { scoped_proposals_enabled: true })
-        end
+      context "by scope" do
+        let!(:scope2) { create :scope, organization: participatory_process.organization }
 
-        it "cannot be filtered by scope" do
+        before do
+          create_list(:proposal, 2, feature: feature, scope: scope)
+          create(:proposal, feature: feature, scope: scope2)
+          create(:proposal, feature: feature, scope: nil)
           visit_feature
+        end
 
+        it "can be filtered by scope" do
           within "form.new_filter" do
             expect(page).to have_content(/Scopes/i)
           end
         end
+
+        context "selecting the global scope" do
+          it "lists the filtered proposals" do
+            within ".filters" do
+              select2("Global scope", xpath: '//select[@id="filter_scope_id"]/..', search: true)
+            end
+
+            expect(page).to have_css(".card--proposal", count: 1)
+            expect(page).to have_content("1 PROPOSAL")
+          end
+        end
+
+        context "selecting one scope" do
+          it "lists the filtered proposals" do
+            within ".filters" do
+              select2(translated(scope.name), xpath: '//select[@id="filter_scope_id"]/..', search: true)
+            end
+
+            expect(page).to have_css(".card--proposal", count: 2)
+            expect(page).to have_content("2 PROPOSALS")
+          end
+        end
+
+        context "selecting the global scope and another scope" do
+          it "lists the filtered proposals" do
+            within ".filters" do
+              select2(translated(scope.name), xpath: '//select[@id="filter_scope_id"]/..', search: true)
+              select2("Global scope", xpath: '//select[@id="filter_scope_id"]/..', search: true)
+            end
+
+            expect(page).to have_css(".card--proposal", count: 3)
+            expect(page).to have_content("3 PROPOSALS")
+          end
+        end
       end
 
       context "when process is related to a scope" do
@@ -585,7 +652,7 @@ describe "Proposals", type: :feature do
           visit_feature
 
           within "form.new_filter" do
-            expect(page).not_to have_content(/Scopes/i)
+            expect(page).to have_no_content(/Scopes/i)
           end
         end
       end
@@ -666,7 +733,7 @@ describe "Proposals", type: :feature do
             visit_feature
 
             within "form.new_filter" do
-              expect(page).not_to have_content(/State/i)
+              expect(page).to have_no_content(/State/i)
             end
           end
         end
@@ -681,7 +748,7 @@ describe "Proposals", type: :feature do
           visit_feature
 
           within "form.new_filter" do
-            expect(page).not_to have_content(/State/i)
+            expect(page).to have_no_content(/State/i)
           end
         end
       end