decidim-proposals 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c38f3f49f8f2faf7009488fd029ead96309aee1e36a9deadfe98b629da781113
-  data.tar.gz: 68997b38f3851b3cdb308f1a613088caf23502a0e3efb0e33b1b631e554413d4
+  metadata.gz: 780ee0ac53cb23a08139f9b32520908bd94c41583dac77e7afe1b02770e6889d
+  data.tar.gz: 75282ea943b4ef24ccc0f3a899dc45ae7a3a3cced8f856a7a9c6b9aa13e9f56f
 SHA512:
-  metadata.gz: fbf1fba0cc32479cba82cd9fa9adb7d2e2a7cf4e7c5aff2dfc5c8053a86194d967f74903bacba3b29a200603bd74dd82a38ebd82b45449ec3f87f11588d78741
-  data.tar.gz: f32885a1e51562bb44a0aba83aaa2ff76d1b55fcde574b439b5eeae32fdd72e6941f8c1889e3deb0c96a415144233a549ee3e49b91620dbd3d70877fa563fbdf
+  metadata.gz: 0c00aa88356e7d1c4d4057a3508455b00b4f26b28ccb16bb596e989b490fe77c812afd74f4ae8017a567063a6aeaddc1059e8c2077611776d18e335f9d7801ac
+  data.tar.gz: 50eb47648016874df8c9343ddfbb231b76a88231a70986741be5f07431986ed7023f45203f439df0b206878baa70fb1007e566c01c0751425c771fba67d91e5a

data/app/cells/decidim/proposals/collaborative_draft_cell.rb

@@ -22,7 +22,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path(filter_link_params)
+        resource_locator(model).path
       end
 
       def current_participatory_space

data/app/cells/decidim/proposals/participatory_text_proposal_cell.rb

@@ -39,7 +39,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path(filter_link_params)
+        resource_locator(model).path
       end
 
       def amend_resource_path

data/app/cells/decidim/proposals/proposal_cell.rb

@@ -22,7 +22,7 @@ module Decidim
       end
 
       def resource_path
-        resource_locator(model).path(filter_link_params)
+        resource_locator(model).path
       end
 
       def current_participatory_space

data/app/cells/decidim/proposals/proposal_m_cell.rb

@@ -122,7 +122,7 @@ module Decidim
       end
 
       def resource_image_path
-        @resource_image_path ||= has_image? ? model.attachments.find_by("content_type like '%image%'").url : nil
+        @resource_image_path ||= has_image? ? model.attachments.find_by("content_type like '%image%'").thumbnail_url : nil
       end
 
       def cache_hash
@@ -143,6 +143,8 @@ module Decidim
         hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
         hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
         hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
+        hash << has_footer?
+        hash << has_actions?
 
         hash.join(Decidim.cache_key_separator)
       end

data/app/forms/decidim/proposals/admin/proposal_base_form.rb

@@ -82,7 +82,7 @@ module Decidim
         # Finds the Meetings of the current participatory space
         def meetings
           @meetings ||= Decidim.find_resource_manifest(:meetings).try(:resource_scope, current_component)
-                               &.order(title: :asc)
+                          &.published&.order(title: :asc)
         end
 
         # Return the meeting as author

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

@@ -28,9 +28,9 @@
 <%= render partial: "voting_rules" %>
 <div class="row columns">
   <div class="title-action">
-    <h3 id="proposals-count" class="title-action__title section-heading">
+    <h2 id="proposals-count" class="title-action__title section-heading">
       <%= render partial: "count" %>
-    </h3>
+    </h2>
     <% if current_settings.creation_enabled && current_component.participatory_space.can_participate?(current_user) %>
       <%= action_authorized_link_to :create, new_proposal_path, class: "title-action__action button small", data: { "redirect_url" => new_proposal_path } do %>
         <%= t(".new_proposal") %>

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

@@ -35,16 +35,16 @@ extra_admin_link(
 <div class="row column view-header">
 
   <div class="m-bottom">
-    <%= link_to proposals_path(filter_link_params), class: "small hollow" do %>
+    <%= link_to proposals_path, class: "small hollow js-back-to-list" do %>
       <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
       <%= t(".back_to_list") %>
     <% end %>
   </div>
 
   <% if @proposal.emendation? %>
-    <h3 class="heading3"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h3>
+    <h2 class="heading3"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h2>
   <% else %>
-    <h3 class="heading3"><%= present(@proposal).title(links: true, html_escape: true) %></h3>
+    <h2 class="heading3"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
   <% end %>
   <% unless component_settings.participatory_texts_enabled? %>
     <%= cell("decidim/coauthorships", @proposal, has_actions: true, size: 3, context: { current_user: current_user }) %>

data/config/locales/ar.yml

@@ -94,6 +94,8 @@ ar:
     admin:
       filters:
         proposals:
+          category_id_eq:
+            label: الفئة
           valuator_role_ids_has:
             label: تم إسناده إلى مُقيِّم
     components:
@@ -620,6 +622,7 @@ ar:
             many: "%{count} مقترحات"
             other: "%{count} مقترحات"
         edit:
+          add_documents: المستندات
           attachment_legend: "(اختياري) إضافة مرفق"
           back: الى الخلف
           select_a_category: الرجاء تحديد الفئة

data/config/locales/de.yml

@@ -711,7 +711,7 @@ de:
             one: "%{count} Vorschlag"
             other: "%{count} Vorschläge"
         edit:
-          add_documents: Dokumente
+          add_documents: Unterlagen
           add_images: Datei
           attachment_legend: "(Optional) Fügen Sie einen Anhang hinzu"
           back: Zurück

data/config/locales/el.yml

@@ -667,6 +667,7 @@ el:
             one: "%{count} πρόταση"
             other: "%{count} προτάσεις"
         edit:
+          add_documents: Έγγραφα
           attachment_legend: "(Προαιρετικά) Προσθήκη συνημμένου"
           back: Πίσω
           select_a_category: Επιλέξτε μια κατηγορία

data/config/locales/fi.yml

@@ -221,7 +221,7 @@ fi:
         admin:
           proposal_note_created:
             email_intro: Joku on jättänyt huomion ehdotukseen "%{resource_title}". Tutustu siihen <a href="%{admin_proposal_info_url}">hallintapaneelin kautta</a>
-            email_outro: Saat tämän ilmoituksen, koska voit arvioida ehdotuksen.
+            email_outro: Tämä ilmoitus on lähetetty sinulle, koska voit arvioida ehdotuksen.
             email_subject: Joku on jättänyt huomion ehdotukseen %{resource_title}.
             notification_title: Joku on jättänyt huomion ehdotukseen <a href="%{resource_path}">%{resource_title}</a>. Tutustu siihen <a href="%{admin_proposal_info_path}">hallintapaneelin kautta</a>
         collaborative_draft_access_accepted:

data/config/locales/hu.yml

@@ -681,6 +681,7 @@ hu:
             one: "%{count} javaslat"
             other: "%{count} javaslatot"
         edit:
+          add_documents: Dokumentumok
           attachment_legend: "(Nem kötelező) Melléklet hozzáadása"
           back: Vissza
           select_a_category: Válassz kategóriát

data/config/locales/ja.yml

@@ -45,7 +45,7 @@ ja:
         participatory_text:
           attributes:
             document:
-              invalid_document_type: '無効なドキュメントの種類です。承認されたフォーマットは次のとおりです: %{valid_mime_types}'
+              invalid_document_type: '無効な種類のドキュメントです。承認されたフォーマットは次のとおりです: %{valid_mime_types}'
         proposal:
           attributes:
             add_documents:
@@ -424,7 +424,7 @@ ja:
             success: おめでとうございます。次のセクションが提案に変換されました。公開する前に確認して調整できます。
           index:
             info_1: 次のセクションが提案に変換されました。公開する前に確認して調整できます。
-            publish_document: 文書を公開
+            publish_document: ドキュメントを公開
             save_draft: 下書きを保存
             title: 参加者のテキストをプレビュー
           new_import:

data/config/locales/lv.yml

@@ -666,6 +666,7 @@ lv:
             one: "%{count} priekšlikums"
             other: "%{count} priekšlikumi"
         edit:
+          add_documents: Dokumenti
           attachment_legend: "(Pēc izvēles) Pievienojiet pielikumu"
           back: Atpakaļ
           select_a_category: Lūdzu, izvēlieties kategoriju

data/config/locales/no.yml

@@ -713,6 +713,7 @@
             one: "%{count} forslag"
             other: "%{count} forslag"
         edit:
+          add_documents: Dokumenter
           attachment_legend: "(Valgfritt) Legg til et vedlegg"
           back: Tilbake
           select_a_category: Velg en kategori

data/config/locales/sk.yml

@@ -674,6 +674,7 @@ sk:
             many: "%{count} návrhov"
             other: "%{count} návrhov"
         edit:
+          add_documents: Dokumenty
           attachment_legend: "(Voliteľné) Pridanie prílohy"
           back: Zadná
           select_a_category: Vyberte kategóriu

data/config/locales/sr-CS.yml

@@ -109,6 +109,8 @@ sr:
             valuator: Procenjivač
             valuators: Procenjivači
       proposals:
+        edit:
+          add_documents: Dokumenti
         show:
           back_to_list: Nazad na listu
           estimated_cost: Procenjen trošak

data/config/locales/sv.yml

@@ -586,7 +586,7 @@ sv:
         evaluating: Utvärderas
         not_answered: Ej besvarat
         rejected: Avvisat
-        withdrawn: Tillbakadragna
+        withdrawn: Tillbakadraget
       application_helper:
         filter_category_values:
           all: Alla
@@ -871,7 +871,7 @@ sv:
           read_more: Läs mer
           report: Rapport
           withdraw_btn_hint: Du kan dra tillbaka ett förslag om du ändrar dig, så länge som det inte har fått något stöd. Förslaget raderas inte utan kommer att visas i listan över förslag som dragits tillbaka.
-          withdraw_confirmation_html: Är du säker på att du vill återkalla förslaget?<br><br><strong>Denna åtgärd kan inte avbrytas!</strong>
+          withdraw_confirmation_html: Är du säker på att du vill dra tillbaka förslaget?<br><br><strong>Denna åtgärd kan inte ångras!</strong>
           withdraw_proposal: Dra tillbaka förslaget
         tags:
           changed_from: "(ändrad från <u>%{previous_name}</u> av en administratör)"

data/lib/decidim/proposals/component.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/components/namer"
+require "decidim/meetings"
 
 Decidim.register_component(:proposals) do |component|
   component.engine = Decidim::Proposals::Engine

data/lib/decidim/proposals/import/proposal_creator.rb

@@ -33,7 +33,10 @@ module Decidim
 
         # Saves the proposal
         def finish!
-          super # resource.save!
+          Decidim.traceability.perform_action!(:create, self.class.resource_klass, context[:current_user], visibility: "admin-only") do
+            resource.save!
+            resource
+          end
           notify(resource)
           publish(resource)
         end

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.26.0"
+      "0.26.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -80,84 +80,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.26.1
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com