decidim 0.3.2 → 0.4.0

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

@@ -90,6 +90,7 @@ es:
             map: Mapa
             start_time: Fecha de inicio
             title: Título
+      read_more: "(leer más)"
     resource_links:
       meetings_through_proposals:
         meeting_results: 'Resultados relacionados:'

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

@@ -10,7 +10,7 @@ fr:
       meeting:
         address: Adresse
         decidim_category_id: Catégorie
-        decidim_scope_id: Domaine d'application
+        decidim_scope_id: Zone d'application
         description: Description
         end_time: Heure de fin
         location: Lieu
@@ -24,7 +24,7 @@ fr:
     meetings:
       actions:
         attachments: Documents liés
-        close: Fermer
+        close: Clore
         confirm_destroy: Êtes-vous sûr de vouloir supprimer cette rencontre?
         destroy: Supprimer
         edit: Modifier
@@ -34,7 +34,7 @@ fr:
       admin:
         meeting_closes:
           edit:
-            close: Fermer
+            close: Clore
             title: Clore la rencontre
         meetings:
           close:
@@ -64,7 +64,7 @@ fr:
           category_prompt: Sélectionner une catégorie
           date: Date
           past: Passées
-          scopes: Domaines d'application
+          scopes: Zone d'application
           search: Rechercher
           upcoming: À venir
         filters_small_view:
@@ -95,5 +95,5 @@ fr:
         meeting_results: 'Résultats associés :'
         result_meetings: 'Rencontres connexes :'
       proposals_from_meeting:
-        meeting_proposals: 'Propositions connexes :'
+        meeting_proposals: 'Propositions créées à cette rencontre :'
         proposal_meetings: 'Rencontre connexes :'

data/decidim-meetings/decidim-meetings.gemspec

@@ -9,8 +9,8 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-meetings"
-  s.summary     = "A meetings component for decidim's participatory processes."
+  s.name = "decidim-meetings"
+  s.summary = "A meetings component for decidim's participatory processes."
   s.description = s.summary
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md"]

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

@@ -24,7 +24,7 @@ Decidim.register_feature(:meetings) do |feature|
   end
 
   feature.seeds do
-    Decidim::ParticipatoryProcess.all.each do |process|
+    Decidim::ParticipatoryProcess.find_each do |process|
       next unless process.steps.any?
 
       feature = Decidim::Feature.create!(

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Admin manages meetings attachments", type: :feature do
+describe "Admin manages meetings attachments", type: :feature, serves_map: true do
   let(:manifest_name) { "meetings" }
   let!(:meeting) { create :meeting, scope: scope, feature: current_feature }
 

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Admin manages meetings", type: :feature do
+describe "Admin manages meetings", type: :feature, serves_map: true do
   let(:manifest_name) { "meetings" }
   let!(:meeting) { create :meeting, scope: scope, feature: current_feature }
 

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

@@ -101,7 +101,7 @@ describe "Explore meetings", type: :feature do
     end
   end
 
-  context "show" do
+  context "show", :serves_map do
     let(:meetings_count) { 1 }
     let(:meeting) { meetings.first }
     let(:date) { 10.days.from_now }

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Process admin manages meetings attachments", type: :feature do
+describe "Process admin manages meetings attachments", type: :feature, serves_map: true do
   let(:manifest_name) { "meetings" }
   let!(:meeting) { create :meeting, scope: scope, feature: current_feature }
 

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

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Process admin manages meetings", type: :feature do
+describe "Process admin manages meetings", type: :feature, serves_map: true do
   let(:manifest_name) { "meetings" }
   let!(:meeting) { create :meeting, scope: scope, feature: current_feature }
 

data/decidim-meetings/spec/helpers/meetings_helper_spec.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+  module Meetings
+    describe MeetingsHelper do
+      describe "meeting_description" do
+        it "truncates meeting description respecting the html tags" do
+          meeting = create(:meeting, description: { "en" => "<p>This is a long description with some <b>bold text</b></p>" })
+          expect(helper.meeting_description(meeting, 40)).to match("<p>This is a long description with some <b>bol</b>...")
+        end
+      end
+    end
+  end
+end

data/decidim-meetings/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"

data/decidim-pages/app/models/decidim/pages/page.rb

@@ -35,6 +35,11 @@ module Decidim
       def comments_have_votes?
         true
       end
+
+      # Public: Overrides the `notifiable?` Notifiable concern method.
+      def notifiable?(_context)
+        false
+      end
     end
   end
 end

data/decidim-pages/bin/rails

@@ -8,8 +8,8 @@ ENGINE_ROOT = File.expand_path("..", __dir__)
 ENGINE_PATH = File.expand_path("../lib/decidim/pages/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __dir__)
+require "bundler/setup"
 
 require "rails/all"
 require "rails/engine/commands"

data/decidim-pages/decidim-pages.gemspec

@@ -9,8 +9,8 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-pages"
-  s.summary     = "A pages component for decidim's participatory processes."
+  s.name = "decidim-pages"
+  s.summary = "A pages component for decidim's participatory processes."
   s.description = s.summary
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md"]

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

@@ -45,7 +45,7 @@ Decidim.register_feature(:pages) do |feature|
   end
 
   feature.seeds do
-    Decidim::ParticipatoryProcess.all.each do |process|
+    Decidim::ParticipatoryProcess.find_each do |process|
       next unless process.steps.any?
 
       feature = Decidim::Feature.create!(

data/decidim-pages/spec/commands/destroy_page_spec.rb

@@ -7,7 +7,7 @@ module Decidim
     describe DestroyPage, :db do
       describe "call" do
         let(:feature) { create(:feature, manifest_name: "pages") }
-        let!(:page)   { create(:page, feature: feature) }
+        let!(:page) { create(:page, feature: feature) }
         let(:command) { described_class.new(feature) }
 
         it "broadcasts ok" do

data/decidim-pages/spec/spec_helper.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "decidim/dev"
+
 ENV["ENGINE_NAME"] = File.dirname(__dir__).split("/").last
 
+Decidim::Dev.dummy_app_path = File.expand_path(File.join("..", "spec", "decidim_dummy_app"))
+
 require "decidim/dev/test/base_spec_helper"

data/decidim-proposals/app/assets/config/decidim_proposals_manifest.js

@@ -1 +1,2 @@
 //= link decidim/proposals/social_share.js
+//= link decidim/proposals/add_proposal.js

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

@@ -0,0 +1,23 @@
+$(() => {
+  window.DecidimProposals = window.DecidimProposals || {};
+
+  window.DecidimProposals.bindProposalAddress = () => {
+    const $checkbox = $('#proposal_has_address');
+    const $addressInput = $('#address_input');
+
+    if ($checkbox.length > 0) {
+      const toggleInput = () => {
+        if ($checkbox[0].checked) {
+          $addressInput.show();
+        } else {
+          $addressInput.hide();
+        }
+      }
+      toggleInput();
+      $checkbox.on('change', toggleInput);
+    }
+  };
+
+  window.DecidimProposals.bindProposalAddress();
+});
+

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

@@ -14,11 +14,13 @@ module Decidim
       attribute :category_id, Integer
       attribute :scope_id, Integer
       attribute :user_group_id, Integer
+      attribute :has_address, Boolean
 
       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 :address, geocoding: true, if: ->(form) { Decidim.geocoder.present? && form.has_address? }
+      validates :address, presence: true, if: ->(form) { form.has_address? }
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 
@@ -47,6 +49,10 @@ module Decidim
       def scope
         @scope ||= process_scope || organization_scopes.where(id: scope_id).first
       end
+
+      def has_address?
+        current_feature.settings.geocoding_enabled? && has_address
+      end
     end
   end
 end

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

@@ -21,8 +21,8 @@ module Decidim
 
       geocoded_by :address, http_headers: ->(proposal) { { "Referer" => proposal.feature.organization.host } }
 
-      scope :accepted,   -> { where(state: "accepted") }
-      scope :rejected,   -> { where(state: "rejected") }
+      scope :accepted, -> { where(state: "accepted") }
+      scope :rejected, -> { where(state: "rejected") }
 
       def self.order_randomly(seed)
         transaction do
@@ -91,6 +91,18 @@ module Decidim
       def reported_content_url
         ResourceLocatorPresenter.new(self).url
       end
+
+      # Public: Overrides the `notifiable?` Notifiable concern method.
+      # When a proposal is commented the proposal's author is notified if it is not the same
+      # who has commented the proposal and if the proposal's author has comment notifications enabled.
+      def notifiable?(context)
+        context[:author] != author && author.comments_notifications?
+      end
+
+      # Public: Overrides the `users_to_notify` Notifiable concern method.
+      def users_to_notify
+        [author]
+      end
     end
   end
 end

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

@@ -8,6 +8,7 @@
         <div class="card__author author-data author-data--small">
           <%= render partial: "author", locals: { proposal: proposal } %>
         </div>
+        <%= feature_reference(proposal, class: "reference--text-left") %>
       </div>
       <%= render partial: "proposal_badge", locals: { proposal: proposal } %>
       <p><%= truncate(proposal.body, length: 100) %></p>

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

@@ -20,6 +20,9 @@
 
           <% if feature_settings.geocoding_enabled? %>
             <div class="field">
+              <%= form.check_box :has_address %>
+            </div>
+            <div class="field" id="address_input">
               <%= form.text_field :address %>
             </div>
           <% end %>
@@ -50,3 +53,5 @@
     </div>
   </div>
 </div>
+
+<%= javascript_include_tag "decidim/proposals/add_proposal" %>

data/decidim-proposals/bin/rails

@@ -8,8 +8,8 @@ ENGINE_ROOT = File.expand_path("..", __dir__)
 ENGINE_PATH = File.expand_path("../lib/decidim/proposals/engine", __dir__)
 
 # Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __dir__)
+require "bundler/setup"
 
 require "rails/all"
 require "rails/engine/commands"

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

@@ -4,7 +4,7 @@ fr:
       proposal:
         body: Corps de texte
         category_id: Catégorie
-        scope_id: Domaine d'application
+        scope_id: Zone d'application
         title: Titre
         user_group_id: Créer une proposition en tant que
       proposal_answer:
@@ -21,12 +21,12 @@ fr:
             comments_enabled: Commentaires activés
             geocoding_enabled: Géocodage activé
             official_proposals_enabled: Propositions officielles activées
-            proposal_answering_enabled: Réponse aux propositions activée
+            proposal_answering_enabled: '"Réponses aux propositions" activé'
             vote_limit: Limite de vote
           step:
             comments_blocked: Commentaires bloqués
             creation_enabled: Module propositions activé
-            proposal_answering_enabled: Réponse aux propositions activée
+            proposal_answering_enabled: '"Réponses aux propositions" activé'
             votes_blocked: Votes bloqués
             votes_enabled: Votes activés
             votes_hidden: Cacher les votes (si les votes sont activés, le compte des votes sera caché)
@@ -43,7 +43,7 @@ fr:
             name: Proposition
         proposal_answers:
           edit:
-            accepted: Publié
+            accepted: Retenue
             answer_proposal: Répondre
             rejected: Refusée
             title: Réponse à la proposition %{title}
@@ -62,7 +62,7 @@ fr:
             create: Créer
             title: Créer une proposition
       answers:
-        accepted: Publié
+        accepted: Retenues
         not_answered: Resté sans réponse
         rejected: Refusée
       create:
@@ -73,7 +73,7 @@ fr:
           fields:
             category: Catégorie
             official_proposal: Proposition officielle
-            scope: Domaine d'application
+            scope: Zone d'application
             state: Etat
             title: Titre
       proposals:
@@ -82,7 +82,7 @@ fr:
             one: 1 proposition
             other: "%{count} propositions"
         filters:
-          accepted: Publié
+          accepted: Retenues
           activity: Activité
           all: Toutes
           category: Catégorie
@@ -92,10 +92,10 @@ fr:
           origin: Retour à l'original
           rejected: Refusée
           related_to: Liée à
-          scopes: Domaines d'application
+          scopes: Zones d'application
           search: Rechercher
           state: État
-          voted: Voté
+          voted: Votées
         filters_small_view:
           close_modal: Fermer la fenêtre de dialogue
           filter: Filtrer
@@ -111,7 +111,7 @@ fr:
         new:
           back: Retour
           select_a_category: Veuillez sélectionner une catégorie
-          send: Envoyer
+          send: Publier
           title: Nouvelle proposition
         orders:
           label: 'Classement des propositions par:'
@@ -119,7 +119,7 @@ fr:
           random: Aléatoire
           recent: Les plus récents
         show:
-          proposal_accepted_reason: 'Cette proposition a été acceptée parce que :'
+          proposal_accepted_reason: 'Cette proposition a été retenue parce que :'
           proposal_rejected_reason: 'Cette proposition a été refusée parce que:'
           report: Signaler
         vote_button:

data/decidim-proposals/db/migrate/20170307085300_migrate_proposal_reports_data_to_reports.rb

@@ -7,7 +7,7 @@ class MigrateProposalReportsDataToReports < ActiveRecord::Migration[5.0]
   end
 
   def change
-    Decidim::Proposals::ProposalReport.all.each do |proposal_report|
+    Decidim::Proposals::ProposalReport.find_each do |proposal_report|
       moderation = Decidim::Moderation.find_or_create_by!(reportable: proposal_report.proposal,
                                                           participatory_process: proposal_report.proposal.feature.participatory_process)
       Decidim::Report.create!(moderation: moderation,

data/decidim-proposals/decidim-proposals.gemspec

@@ -9,8 +9,8 @@ require_relative "../decidim-core/lib/decidim/core/version"
 Gem::Specification.new do |s|
   Decidim.add_default_gemspec_properties(s)
 
-  s.name        = "decidim-proposals"
-  s.summary     = "A proposals component for decidim's participatory processes."
+  s.name = "decidim-proposals"
+  s.summary = "A proposals component for decidim's participatory processes."
   s.description = s.summary
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md"]