decidim-proposals 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b76e73596c6643507620912308d1d0fb378bdf6b
-  data.tar.gz: 8db8bfb80feff77d0441515d77ace77e88432286
+  metadata.gz: 0e402f0c7815c844f71feab64eb6c0ba24eb0212
+  data.tar.gz: 6272d3cf287ba6e1bd302cf89165ead266c41fe5
 SHA512:
-  metadata.gz: fd95c03ce940920518be6b2832b2db5dcae64a65624760355090a5fb179fbcfd88e51325d7786522a01a70cddd38fb1e4e55e5b67f40cccdfa7ec26f1a12fab4
-  data.tar.gz: e88b4bd67e8754b4c4a42ea0a8e9d67f161bba5b7332fd0c1583134aa3fce54783f6acd914331d5a73f4daba964a65131e8d5376f2532a827ef7870e8acaa0f3
+  metadata.gz: 17d7d9569a92625edd185177e230107c81c41d6209fd6448180aa662bb939fa4169cc05838638b089ed3c9b73ee017fd5029e05ec098c4e5329944f461a94387
+  data.tar.gz: 8f91779210c7b26b0b133e0b9e941a9966088adfcd4c7ff99f389b1542073a57bc9380cd7244334a925a75ddf556f517576bb5fd047a1d89b0e68e1616fee80f

data/app/assets/config/decidim_proposals_manifest.js

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

data/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/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/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/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/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/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/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/lib/decidim/proposals/feature.rb

@@ -72,7 +72,7 @@ Decidim.register_feature(:proposals) 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!(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -88,56 +88,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
 description: A proposals component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -152,6 +152,7 @@ files:
 - app/assets/config/decidim_proposals_manifest.css
 - app/assets/config/decidim_proposals_manifest.js
 - app/assets/images/decidim/proposals/icon.svg
+- app/assets/javascripts/decidim/proposals/add_proposal.js.es6
 - app/assets/javascripts/decidim/proposals/social_share.js
 - app/assets/stylesheets/decidim/proposals/social_share.css.scss
 - app/commands/decidim/proposals/admin/answer_proposal.rb