decidim-proposals 0.23.2 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf8436d8e7bd0abece36dfae02bcf16ca734ec265801f7303a230c2437985597
-  data.tar.gz: 2cdc0f69b70b20c4fbc6d25348ffbd8468f5ef5124b701efe52ade54ec1d4a8c
+  metadata.gz: 407b694b48340b459b9487e1b7680f71c7f39fd120acb8f953253f0e6f6131b3
+  data.tar.gz: b5af213b89c045c25c5c3e65958938f9ccd61b8dcc2b092a399c34de39290827
 SHA512:
-  metadata.gz: b42188e0710db1ddd09f9c017b90175d13c9ac0f668ecb21c054f058d4594916d3754fa20d77e5a9b7e8b31d647a9910cd67b85ff4bda70d9463bda2362753a2
-  data.tar.gz: 07fd952489969582cc240213e1a96e25c173bad7f3950263b5bdaa7b3c0c02b093df5fb5f02f1dce924ff4794e46ef149e76a231fc6649f154a75178ede10a25
+  metadata.gz: 0151a8ebc561f6c2b00f05315770f7dd18c80230a5562d8a7ac02d6d6efaaefea1eeb2f40cd335a17e7c1148753ad659050593ebd2db8d16900283096558995e
+  data.tar.gz: 9c07d17862f60743fee23f7662bd7e5d9681c23e7674ba2ef6ce7fb61b035399c5ea58c132a82821702051ad1a7555798f878cb695f976a8ea69c22c00e99187

data/app/commands/decidim/proposals/admin/update_proposal.rb

@@ -28,6 +28,8 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
+          delete_attachment(form.attachment) if delete_attachment?
+
           if process_attachments?
             @proposal.attachments.destroy_all
 

data/app/controllers/decidim/proposals/admin/proposals_controller.rb

@@ -124,13 +124,13 @@ module Decidim
         def edit
           enforce_permission_to :edit, :proposal, proposal: proposal
           @form = form(Admin::ProposalForm).from_model(proposal)
-          @form.attachment = form(AttachmentForm).from_params({})
         end
 
         def update
           enforce_permission_to :edit, :proposal, proposal: proposal
 
           @form = form(Admin::ProposalForm).from_params(params)
+
           Admin::UpdateProposal.call(@form, @proposal) do
             on(:ok) do |_proposal|
               flash[:notice] = t("proposals.update.success", scope: "decidim")

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

@@ -20,6 +20,11 @@ module Decidim
 
           self.title = presenter.title(all_locales: title.is_a?(Hash))
           self.body = presenter.body(all_locales: body.is_a?(Hash))
+          self.attachment = if model.documents.first.present?
+                              { file: model.documents.first.file, title: translated_attribute(model.documents.first.title) }
+                            else
+                              {}
+                            end
         end
       end
     end

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

@@ -84,6 +84,12 @@
 
             <div class="row column">
               <%= form.upload :file, optional: false %>
+              <% if params[:id].present? %>
+                <% if proposal.documents.present? %>
+                  <%= form.hidden_field :id, value: proposal.documents.first.id %>
+                  <%= form.check_box :delete_file, label: t(".delete_attachment"), value: proposal.documents.first.id %>
+                <% end %>
+              <% end %>
             </div>
           <% end %>
         </fieldset>

data/config/locales/ca.yml

@@ -423,6 +423,7 @@ ca:
           form:
             attachment_legend: "(Opcional) Afegiu un fitxer adjunt"
             created_in_meeting: Aquesta proposta prové d'una trobada
+            delete_attachment: Suprimeix l'adjunt
             select_a_category: Selecciona una categoria
             select_a_meeting: Selecciona una trobada
           index:

data/config/locales/cs.yml

@@ -391,7 +391,7 @@ cs:
               odt: Odt
             bottom_hint: "(Budete mít možnost zobrazit a třídit sekce dokumentů)"
             document_legend: 'Přidejte dokument nižší než 2 MB, každá sekce až do hloubky 3 úrovní bude analyzována do návrhů. Podporované formáty jsou: %{valid_mime_types}'
-            title: PŘIDAT DOKUMENT
+            title: Přidat dokument
             upload_document: Nahrát dokument
           publish:
             invalid: Nelze publikovat návrhy
@@ -431,6 +431,7 @@ cs:
           form:
             attachment_legend: "(Volitelné) Přidání přílohy"
             created_in_meeting: Tento návrh pochází z jednání
+            delete_attachment: Smazat přílohu
             select_a_category: Vyberte kategorii
             select_a_meeting: Vyberte schůzku
           index:

data/config/locales/de.yml

@@ -423,6 +423,7 @@ de:
           form:
             attachment_legend: "(Optional) Anhang hinzufügen"
             created_in_meeting: Dieser Vorschlag stammt von einer Besprechung
+            delete_attachment: Anhang löschen
             select_a_category: Kategorie auswählen
             select_a_meeting: Besprechung auswählen
           index:

data/config/locales/en.yml

@@ -424,6 +424,7 @@ en:
           form:
             attachment_legend: "(Optional) Add an attachment"
             created_in_meeting: This proposal comes from a meeting
+            delete_attachment: Delete attachment
             select_a_category: Select a category
             select_a_meeting: Select a meeting
           index:

data/config/locales/fi-plain.yml

@@ -423,6 +423,7 @@ fi-pl:
           form:
             attachment_legend: "(Valinnainen) Lisää liite"
             created_in_meeting: Tämä ehdotus on luotu tapaamisessa
+            delete_attachment: Poista liite
             select_a_category: Valitse aihepiiri
             select_a_meeting: Valitse tapaaminen
           index:

data/config/locales/fi.yml

@@ -423,6 +423,7 @@ fi:
           form:
             attachment_legend: "(Valinnainen) Lisää liite"
             created_in_meeting: Tämä ehdotus on luotu tapaamisessa
+            delete_attachment: Poista liite
             select_a_category: Valitse aihepiiri
             select_a_meeting: Valitse tapaaminen
           index:

data/config/locales/fr-CA.yml

@@ -423,6 +423,7 @@ fr-CA:
           form:
             attachment_legend: "(Facultatif) Ajouter une pièce jointe"
             created_in_meeting: Cette proposition provient d'une réunion
+            delete_attachment: Supprimer la pièce jointe
             select_a_category: Sélectionner une catégorie
             select_a_meeting: Sélectionnez une réunion
           index:

data/config/locales/fr.yml

@@ -423,6 +423,7 @@ fr:
           form:
             attachment_legend: "(Facultatif) Ajouter une pièce jointe"
             created_in_meeting: Cette proposition provient d'une réunion
+            delete_attachment: Supprimer la pièce jointe
             select_a_category: Sélectionner une catégorie
             select_a_meeting: Sélectionnez une réunion
           index:

data/config/locales/nl.yml

@@ -401,6 +401,7 @@ nl:
           form:
             attachment_legend: "(Optioneel) Een bijlage toevoegen"
             created_in_meeting: Dit voorstel komt uit een vergadering
+            delete_attachment: Bijlage verwijderen
             select_a_category: Kies een categorie
             select_a_meeting: Selecteer een vergadering
           index:

data/config/locales/no.yml

@@ -664,7 +664,7 @@
           filter_by: Filtrer etter
           unfold: Åpne
         index:
-          collaborative_drafts_list: Tilgang til samarbeids utkaster
+          collaborative_drafts_list: Lag utkast sammen med andre
           new_proposal: Nytt forslag
           see_all_withdrawn: Se alle tilbaketrukne forslag
           view_proposal: Se forslag
@@ -676,7 +676,7 @@
           send: Fortsett
           title: Opprett Ditt forslag
         orders:
-          label: 'Bestill forslag av:'
+          label: 'Sorter forslag:'
           most_commented: Flest kommentarer
           most_endorsed: Mest påtegnet
           most_followed: Mest fulgte

data/lib/decidim/proposals/version.rb

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

metadata

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