decidim-plans 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e8c60c3aad835eee3789f5d65146952a7233b0375cef797fbfb221d44954354
-  data.tar.gz: 0e6c025fefdedf2d8056244a10103cdd8e82a70f89817dfa415065be08a058d7
+  metadata.gz: 89daec1bca29a601922a38e6eaac70f669272784d23cefa2ad74e0d4f7fad1ad
+  data.tar.gz: 363a50ba655819e2ddc02a30972083d21650aa4bdc686a0396dbcb6aabddcbc5
 SHA512:
-  metadata.gz: 3b4eed8d262f4da32503813c798e52a4cc3ca2fe8f8f731478b36d60d6e887df09a14f20471c56e76bdca29221836d66c123418d54c443a3966f60d8b9ffb23b
-  data.tar.gz: 6efc6bdb4c26729630870b7147615297dd2bde7861f5d3ea60f9655b0459740426f62ac056a335f94dd55cb17c789402e5b3cceb42ced92e6bcb6a25deb03643
+  metadata.gz: 408c5f2d9daf2adb71255c90ae28d0e5d739a6177db4c93c607fcf5968c508126ea32c9f417ab765cbc169483881615a3252110eecdcad05f8d0a2874c1313a9
+  data.tar.gz: 3f1863c3c6ad6b929b57803beb447f06ca3e32044c0ca391b6f8d74e6489f8a7043466962f18ac03f5d29671a2749f1c8554dee7990314a90e7e67b8b9de332b

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

@@ -19,7 +19,7 @@ module Decidim
 
         optionally_translatable_validate_presence :title
 
-        validates :proposals, presence: true
+        validates :proposals, presence: true, if: ->(form) { form.current_component.settings.proposal_linking_enabled? }
         validates :category, presence: true, if: ->(form) { form.category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
 

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

@@ -18,7 +18,7 @@ module Decidim
       attribute :contents, Array[ContentForm]
       attribute :proposal_ids, Array[Integer]
 
-      validates :proposals, presence: true
+      validates :proposals, presence: true, if: ->(form) { form.current_component.settings.proposal_linking_enabled? }
       validates :category, presence: true, if: ->(form) { form.category_id.present? }
       validates :scope, presence: true, if: ->(form) { form.scope_id.present? }
       optionally_translatable_validate_presence :title

data/app/views/decidim/plans/admin/plans/_form.html.erb

@@ -11,12 +11,14 @@ form.multipart = true
   </div>
 
   <div class="card-section">
-    <div class="row column">
-      <%= attached_proposals_picker_field form, :proposals %>
-    </div>
+    <% if component_settings.proposal_linking_enabled? %>
+      <div class="row column">
+        <%= attached_proposals_picker_field form, :proposals %>
+      </div>
 
-    <%= javascript_include_tag "decidim/plans/proposal_picker" %>
-    <%= stylesheet_link_tag "decidim/plans/proposal_picker" %>
+      <%= javascript_include_tag "decidim/plans/proposal_picker" %>
+      <%= stylesheet_link_tag "decidim/plans/proposal_picker" %>
+    <% end %>
 
     <div class="row column">
       <%= remaining_characters("plans_title", component_settings.plan_title_length) do |opts| %>
@@ -33,15 +35,15 @@ form.multipart = true
       <% end %>
     </div>
 
-    <% if @form.categories&.any? %>
+    <% if component_settings.scopes_enabled? && current_participatory_space.has_subscopes? %>
       <div class="row column">
-        <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
+        <%= scopes_picker_field form, :scope_id %>
       </div>
     <% end %>
 
-    <% if current_participatory_space.has_subscopes? %>
+    <% if component_settings.categories_enabled? && @form.categories&.any? %>
       <div class="row column">
-        <%= scopes_picker_field form, :scope_id %>
+        <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
       </div>
     <% end %>
 

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

@@ -11,12 +11,14 @@ form.multipart = true
   </div>
 <% end %>
 
-<div class="row column">
-  <%= attached_proposals_picker_field form, :proposals %>
-</div>
+<% if component_settings.proposal_linking_enabled? %>
+  <div class="row column">
+    <%= attached_proposals_picker_field form, :proposals %>
+  </div>
 
-<%= javascript_include_tag "decidim/plans/proposal_picker" %>
-<%= stylesheet_link_tag "decidim/plans/proposal_picker" %>
+  <%= javascript_include_tag "decidim/plans/proposal_picker" %>
+  <%= stylesheet_link_tag "decidim/plans/proposal_picker" %>
+<% end %>
 
 <div class="field">
   <%= remaining_characters("plans_title", component_settings.plan_title_length) do |opts| %>
@@ -33,15 +35,15 @@ form.multipart = true
   <% end %>
 </div>
 
-<% if @form.categories&.any? %>
+<% if component_settings.scopes_enabled? && current_participatory_space.has_subscopes? %>
   <div class="field">
-    <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
+    <%= scopes_picker_field form, :scope_id %>
   </div>
 <% end %>
 
-<% if current_participatory_space.has_subscopes? %>
+<% if component_settings.categories_enabled? && @form.categories&.any? %>
   <div class="field">
-    <%= scopes_picker_field form, :scope_id %>
+    <%= form.categories_select :category_id, @form.categories, prompt: t(".select_a_category") %>
   </div>
 <% end %>
 

data/config/locales/en.yml

@@ -34,10 +34,13 @@ en:
           global:
             announcement: Announcement
             attachments_allowed: Attachments allowed
+            categories_enabled: Categories enabled
             comments_enabled: Comments enabled
             multilingual_answers: Multilingual answers
             plan_answering_enabled: Answering enabled
             plan_title_length: Title length
+            proposal_linking_enabled: Proposal linking enabled
+            scopes_enabled: Scopes enabled
           step:
             announcement: Announcement
             comments_blocked: Comments blocked

data/config/locales/fi.yml

@@ -33,10 +33,13 @@ fi:
           global:
             announcement: Ilmoitus
             attachments_allowed: Liitteet sallittu
+            categories_enabled: Kategoriat käytössä
             comments_enabled: Kommentointi sallittu
             multilingual_answers: Monikieliset vastaukset
             plan_answering_enabled: Vastaaminen sallittu
             plan_title_length: Otsikon pituus
+            proposal_linking_enabled: Ehdotusten linkkaaminen käytössä
+            scopes_enabled: Teemat käytössä
           step:
             announcement: Ilmoitus
             comments_blocked: Kommentointi estetty

data/config/locales/sv.yml

@@ -33,10 +33,13 @@ sv:
           global:
             announcement: Announcement
             attachments_allowed: Attachments allowed
+            categories_enabled: Categories enabled
             comments_enabled: Comments enabled
             multilingual_answers: Multilingual answers
             plan_answering_enabled: Answering enabled
             plan_title_length: Title length
+            proposal_linking_enabled: Proposal linking enabled
+            scopes_enabled: Scopes enabled
           step:
             announcement: Announcement
             comments_blocked: Comments blocked

data/lib/decidim/plans/component.rb

@@ -22,6 +22,9 @@ Decidim.register_component(:plans) do |component|
     settings.attribute :plan_answering_enabled, type: :boolean, default: true
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :scopes_enabled, type: :boolean, default: true
+    settings.attribute :categories_enabled, type: :boolean, default: true
+    settings.attribute :proposal_linking_enabled, type: :boolean, default: true
     settings.attribute :attachments_allowed, type: :boolean, default: false
     settings.attribute :multilingual_answers, type: :boolean
   end

data/lib/decidim/plans/test/factories.rb

@@ -48,6 +48,14 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :with_proposal_linking_disabled do
+      settings do
+        {
+          proposal_linking_enabled: false
+        }
+      end
+    end
   end
 
   factory :attached_proposal, class: "Decidim::Plans::AttachedProposal" do

data/lib/decidim/plans/version.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Plans
-    VERSION = "0.16.2"
+    VERSION = "0.16.3"
     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.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Antti Hukkanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -325,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provides a plans component for Decidim.