decidim-plans 0.16.3 → 0.16.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89daec1bca29a601922a38e6eaac70f669272784d23cefa2ad74e0d4f7fad1ad
-  data.tar.gz: 363a50ba655819e2ddc02a30972083d21650aa4bdc686a0396dbcb6aabddcbc5
+  metadata.gz: 741276c73f6d1054bf091d66981cb44f86587445f09f7a85ba2ff7cac995a1f1
+  data.tar.gz: c4fca20be4d12d149653fe12fd4cee859ada4833bac442b39a3968b7f64419f6
 SHA512:
-  metadata.gz: 408c5f2d9daf2adb71255c90ae28d0e5d739a6177db4c93c607fcf5968c508126ea32c9f417ab765cbc169483881615a3252110eecdcad05f8d0a2874c1313a9
-  data.tar.gz: 3f1863c3c6ad6b929b57803beb447f06ca3e32044c0ca391b6f8d74e6489f8a7043466962f18ac03f5d29671a2749f1c8554dee7990314a90e7e67b8b9de332b
+  metadata.gz: 6c9816cbe7feb9125c40f88c39430ab9a6d23cce821180e5088dc5aa382ddca815cc3f9c8f030a243c695e92c7a27a74a8f9ad9a5beb2a52d230992b3e053c7f
+  data.tar.gz: 67cf49151de0ee6d2415933531877fadae8ad50dbd16444ba8c4d7eddeae177f8084fadc9f6837524b3f42d1b4cac7ac995b14a9ee2d5eeb6a427d295d4bf8f0

data/README.md

@@ -39,7 +39,7 @@ Development of this gem has been sponsored by the
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'decidim-plans'
+gem "decidim-plans"
 ```
 
 And then execute:
@@ -154,12 +154,19 @@ If you want to generate the code coverage report for the tests, you can use
 the `SIMPLECOV=1` environment variable in the rspec command as follows:
 
 ```bash
-SIMPLECOV=1 bundle exec rspec
+$ SIMPLECOV=1 bundle exec rspec
 ```
 
 This will generate a folder named `coverage` in the project root which contains
 the code coverage report.
 
+### Localization
+
+If you would like to see this module in your own language, you can help with its
+translation at Crowdin:
+
+https://crowdin.com/project/decidim-plans
+
 ## License
 
 See [LICENSE-AGPLv3.txt](LICENSE-AGPLv3.txt).

data/app/commands/decidim/plans/publish_plan.rb

@@ -26,6 +26,7 @@ module Decidim
           publish_plan
           send_notification
           send_notification_to_participatory_space
+          send_notification_to_proposal_authors
         end
 
         broadcast(:ok, @plan)
@@ -67,9 +68,27 @@ module Decidim
         )
       end
 
+      def send_notification_to_proposal_authors
+        Decidim::EventsManager.publish(
+          event: "decidim.events.plans.plan_published",
+          event_class: Decidim::Plans::PublishPlanEvent,
+          resource: @plan,
+          followers: proposal_authors,
+          extra: {
+            proposal_author: true
+          }
+        )
+      end
+
       def coauthors_followers
         @coauthors_followers ||= @plan.authors.flat_map(&:followers)
       end
+
+      def proposal_authors
+        @proposal_authors ||= @plan.proposals.flat_map(
+          &:authors
+        ).select { |a| a.is_a?(Decidim::User) }
+      end
     end
   end
 end

data/app/events/decidim/plans/publish_plan_event.rb

@@ -12,14 +12,19 @@ module Decidim
       private
 
       def i18n_scope
-        return super unless participatory_space_event?
+        return "decidim.events.plans.plan_published_for_space" if participatory_space_event?
+        return "decidim.events.plans.plan_published_for_proposals" if proposal_author_event?
 
-        "decidim.events.plans.plan_published_for_space"
+        super
       end
 
       def participatory_space_event?
         extra.dig(:participatory_space)
       end
+
+      def proposal_author_event?
+        extra.dig(:proposal_author)
+      end
     end
   end
 end

data/app/forms/decidim/plans/admin/section_form.rb

@@ -26,7 +26,9 @@ module Decidim
         }
 
         def to_param
-          id || "section-id"
+          return id if id.present?
+
+          "section-id"
         end
       end
     end

data/app/forms/decidim/plans/attachment_form.rb

@@ -13,7 +13,9 @@ module Decidim
       validates :title, presence: true, if: ->(form) { form.file.present? || form.id.present? }
 
       def to_param
-        id || "attachment-id"
+        return id if id.present?
+
+        "attachment-id"
       end
     end
   end

data/app/helpers/decidim/plans/application_helper.rb

@@ -70,6 +70,17 @@ module Decidim
         ]
       end
 
+      # We need a custom filter form helper because of the following bug in the
+      # core: https://github.com/decidim/decidim/issues/4584
+      def plan_filter_form_for(filter, url = url_for)
+        namespace = SecureRandom.hex(10)
+        content_tag :div, class: "filters" do
+          form_for filter, namespace: "filters_#{namespace}", builder: FilterFormBuilder, url: url, as: :filter, method: :get, remote: true, html: { id: nil } do |form|
+            yield form
+          end
+        end
+      end
+
       def tabs_id_for_content(idx)
         "content_#{idx}"
       end

data/app/helpers/decidim/plans/attached_proposals_helper.rb

@@ -35,7 +35,7 @@ module Decidim
                     .try(:resource_scope, current_component)
                     &.order(title: :asc)
                     &.where("title ilike ?", "%#{params[:term]}%")
-                    &.where&.not(state: "rejected")
+                    &.where("state IS NULL OR state != ?", "rejected")
                     &.where&.not(published_at: nil)
             render json: query.all.collect { |p| [present(p).title, p.id] }
           end

data/app/views/decidim/plans/plans/_filters.html.erb

@@ -1,4 +1,4 @@
-<%= filter_form_for filter do |form| %>
+<%= plan_filter_form_for filter do |form| %>
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
@@ -20,11 +20,11 @@
     <%= form.collection_radio_buttons :related_to, linked_classes_filter_values_for(Decidim::Plans::Plan), :first, :last, legend_title: t(".related_to") %>
   <% end %>
 
-  <% if current_participatory_space.has_subscopes? %>
+  <% if component_settings.scopes_enabled? && current_participatory_space.has_subscopes? %>
     <%= scopes_picker_filter form, :scope_id %>
   <% end %>
 
-  <% if current_component.categories.any? %>
+  <% if component_settings.categories_enabled? && current_component.categories.any? %>
     <%= form.categories_select :category_id, current_component.categories, legend_title: t(".category"), disable_parents: false, label: false, prompt: t(".category_prompt") %>
   <% end %>
 

data/config/locales/en.yml

@@ -270,7 +270,7 @@ en:
           see_other_versions: see other versions
           version: Version %{number}
           version_history: see version history
-          withdraw: withdraw the draft
+          withdraw: withdraw the plan
           withdraw_btn: Withdraw
           withdraw_btn_hint: You can withdraw this item if you change your mind, as long as you have not received any support. The item is not deleted, it will appear in the list of withdrawn items.
           withdraw_confirmation: Are you sure to withdraw this item?
@@ -355,22 +355,32 @@ en:
           email_subject: You have been rejected as a contributor of %{resource_title}.
           notification_title: You have been <strong>rejected to access as a contributor</strong> of <a href="%{resource_path}">%{resource_title}</a>.
         plan_accepted:
-          email_intro: 'The plan "%{resource_title}" has been accepted. You can read the answer in this page:'
+          email_intro: '"%{resource_title}" has been accepted. You can read the answer in this page:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
-          email_subject: A plan you're following has been accepted
+          email_subject: A resource you're following has been accepted
           notification_title: <a href="%{resource_path}">%{resource_title}</a> has been accepted.
         plan_evaluating:
           email_intro: '"%{resource_title}" is currently being evaluated. You can check for an answer in this page:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
-          email_subject: A plan you're following is being evaluated
+          email_subject: A resource you're following is being evaluated
           notification_title: <a href="%{resource_path}">%{resource_title}</a> is being evaluated.
+        plan_published:
+          email_intro: '"%{resource_title}" has been published. You can see it here:'
+          email_outro: You have received this notification because you are following the author of "%{resource_title}". You can unfollow it from the previous link.
+          email_subject: A user you're following has published a resource
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> has been published.
+        plan_published_for_proposals:
+          email_intro: 'A proposal you have authored has been linked to "%{resource_title}". You can see it here:'
+          email_outro: You have received this notification because you are following "%{resource_title}" through the authored proposals. You can unfollow it from the previous link.
+          email_subject: A proposal you have authored has been linked to new content
+          notification_title: A proposal you have authored has been linked to <a href="%{resource_path}">%{resource_title}</a>.
         plan_published_for_space:
           email_intro: '"%{resource_title}" has been published. You can see it here:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
-          email_subject: A plan you're following has been published
+          email_subject: A resource you're following has been published
           notification_title: <a href="%{resource_path}">%{resource_title}</a> has been published.
         plan_rejected:
           email_intro: '"%{resource_title}" has been rejected. You can read the answer in this page:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
-          email_subject: A plan you're following has been rejected
+          email_subject: A resource you're following has been rejected
           notification_title: <a href="%{resource_path}">%{resource_title}</a> has been rejected.

data/config/locales/fi.yml

@@ -151,7 +151,7 @@ fi:
         current_selection: Hae ehdotuksia nimellä
         select: Valitse
       create:
-        invalid: Virhe luotaessa suunnitelmaa.
+        invalid: Virhe luotaessa sisältöä.
         success: Luonti onnistui.
       last_activity:
         new_plan_at_html: "<span>Uusi suunnitelma osoitteessa %{link}</span>"
@@ -330,12 +330,12 @@ fi:
         plan_access_rejected:
           email_intro: 'Käyttäjän %{requester_name} muokkausoikeudet sisältöön <a href="%{resource_path}">%{resource_title} </a> on estetty.'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistunut sisällön <a href="%{resource_path}">%{resource_title}</a> muokkaukseen.
-          email_subject: "%{requester_name} hakemus osallistua suunnitelmaan %{resource_title} on hylätty."
+          email_subject: "%{requester_name} hakemus osallistua kohteen %{resource_title} muokkaukseen on hylätty."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> <strong>pyyntö muokata sisältöä on hylätty</strong> kohteelle <a href="%{resource_path}">%{resource_title}</a>.
         plan_access_requested:
           email_intro: '%{requester_name} pyysi pääsyä osallistujaksi. Voit <strong>hyväksyä tai hylätä pyynnön</strong> sivulla <a href="%{resource_path}">%{resource_title}</a>.'
-          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistuja suunnitelmassa <a href="%{resource_path}">%{resource_title}</a>.
-          email_subject: "%{requester_name} pyysi osallistumisoikeutta suunnitelmaan %{resource_title}."
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska olet osallistuja kohteessa <a href="%{resource_path}">%{resource_title}</a>.
+          email_subject: "%{requester_name} pyysi osallistumisoikeutta kohteeseen %{resource_title}."
           notification_title: <a href="%{requester_path}">%{requester_name} %{requester_nickname}</a> pyysi saada muokata sisältöä <a href="%{resource_path}">%{resource_title}</a>. <strong>Hyväksy tai hylkää pyyntö</strong>.
         plan_access_requester_accepted:
           email_intro: Sinut on hyväksytty osallistujaksi sisältöön <a href="%{resource_path}">%{resource_title}</a>.
@@ -357,6 +357,16 @@ fi:
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{resource_title}". Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
           email_subject: Seuraamasi kohde on arvioitavana
           notification_title: <a href="%{resource_path}">%{resource_title}</a> on arvioitavana.
+        plan_published:
+          email_intro: '"%{resource_title}" on julkaistu. Näet sen täältä:'
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohteen "%{resource_title}" laatijaa. Voit lopettaa sen seuraamisen edellä esitetyn linkin kautta.
+          email_subject: Seuraamasi käyttäjä on julkaissut uutta sisältöä
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> on julkaistu.
+        plan_published_for_proposals:
+          email_intro: 'Laatimasi ehdotus on linkitetty kohteeseen "%{resource_title}". Näet sen täältä:'
+          email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{resource_title}" laatimisesi ehdotusten kautta. Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
+          email_subject: Laatimasi ehdotus on linkitetty uuteen sisältöön
+          notification_title: Laatimasi ehdotus on linkitetty kohteeseen <a href="%{resource_path}">%{resource_title}</a>.
         plan_published_for_space:
           email_intro: '"%{resource_title}" on julkaistu. Näet sen täältä:'
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{resource_title}". Voit lopettaa sen seuraamisen edellä esitetyn linkin kautta.

data/config/locales/sv.yml

@@ -263,7 +263,7 @@ sv:
           see_other_versions: see other versions
           version: Version %{number}
           version_history: see version history
-          withdraw: withdraw the draft
+          withdraw: withdraw the plan
           withdraw_btn: Withdraw
           withdraw_btn_hint: You can withdraw this item if you change your mind, as long as you have not received any support. The item is not deleted, it will appear in the list of withdrawn items.
           withdraw_confirmation: Are you sure to withdraw this item?
@@ -348,22 +348,32 @@ sv:
           email_subject: You have been rejected as a contributor of %{resource_title}.
           notification_title: You have been <strong>rejected to access as a contributor</strong> of <a href="%{resource_path}">%{resource_title}</a>.
         plan_accepted:
-          email_intro: 'The plan "%{resource_title}" has been accepted. You can read the answer in this page:'
+          email_intro: '"%{resource_title}" has been accepted. You can read the answer in this page:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
-          email_subject: A plan you're following has been accepted
+          email_subject: A resource you're following has been accepted
           notification_title: <a href="%{resource_path}">%{resource_title}</a> has been accepted.
         plan_evaluating:
           email_intro: '"%{resource_title}" is currently being evaluated. You can check for an answer in this page:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
-          email_subject: A plan you're following is being evaluated
+          email_subject: A resource you're following is being evaluated
           notification_title: <a href="%{resource_path}">%{resource_title}</a> is being evaluated.
+        plan_published:
+          email_intro: '"%{resource_title}" has been published. You can see it here:'
+          email_outro: You have received this notification because you are following the author of "%{resource_title}". You can unfollow it from the previous link.
+          email_subject: A user you're following has published a resource
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> has been published.
+        plan_published_for_proposals:
+          email_intro: 'A proposal you have authored has been linked to "%{resource_title}". You can see it here:'
+          email_outro: You have received this notification because you are following "%{resource_title}" through the authored proposals. You can unfollow it from the previous link.
+          email_subject: A proposal you have authored has been linked to new content
+          notification_title: A proposal you have authored has been linked to <a href="%{resource_path}">%{resource_title}</a>.
         plan_published_for_space:
           email_intro: '"%{resource_title}" has been published. You can see it here:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
-          email_subject: A plan you're following has been published
+          email_subject: A resource you're following has been published
           notification_title: <a href="%{resource_path}">%{resource_title}</a> has been published.
         plan_rejected:
           email_intro: '"%{resource_title}" has been rejected. You can read the answer in this page:'
           email_outro: You have received this notification because you are following "%{resource_title}". You can unfollow it from the previous link.
-          email_subject: A plan you're following has been rejected
+          email_subject: A resource you're following has been rejected
           notification_title: <a href="%{resource_path}">%{resource_title}</a> has been rejected.

data/lib/decidim/plans/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Plans
-    VERSION = "0.16.3"
+    VERSION = "0.16.4"
     DECIDIM_VERSION = "~> 0.16.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-plans
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
 platform: ruby
 authors:
 - Antti Hukkanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core