decidim-proposals 0.27.2 → 0.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2940b19c42d51731768e53f2f1b7e7f3397894c98bbf882b8fe467ce00660669
-  data.tar.gz: 3bff962915003a9c34ef6b4aa9708c3c20542c480dec991ada691727e112db2c
+  metadata.gz: c1365c0d325e5a7f66b393bfbc6147bd1502ac8e2125d845315ca84a654c69d6
+  data.tar.gz: c7c9b07fda158bf3a999e2bb91312cd3ba49e9250d7de706010b0401617eaede
 SHA512:
-  metadata.gz: 97bd0c8a20959ef3eaf6d74f940bbfae11ac735ab72d4af493dbb5124b5480a1a72802d550b96abd0dc471f82589ee06a10ab1f90462e070fdedd967314c211e
-  data.tar.gz: 42f5d73b718b4444a025b333cae6746b925aaa7c22b54fa2626f6c987a50b02062082232c9b8937e74fbcce2c321dda4fa355c81e0c1e86add8dceb87bd99f1a
+  metadata.gz: cc8ea5518ea1e7b7707a606fee3249aa2390a8b88fcbc055d6e9d8dd5b5c9b5b7cfc131abd74c6ca15b0a70bd555fb345092fadcc283d31c2da2d55add16f22f
+  data.tar.gz: d95d858d704a8487807953fe06b94fb32d5c8341f34739ac3225c8292b24753c6a66b3c7d02b0549c1110f96d2958de3f562d4976c4394f04bc7461ab80c616f

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

@@ -23,7 +23,7 @@ module Decidim
       end
 
       def description
-        decidim_sanitize_editor(present(model).body.truncate(100, separator: /\s/))
+        decidim_sanitize_editor(present(model).body.truncate(100, separator: /\s/), strip_tags: true)
       end
 
       def has_badge?

data/app/cells/decidim/proposals/proposal_tags/show.erb

@@ -2,7 +2,7 @@
   <ul class="tags tags--proposal tags--list">
     <% if category.present? %>
       <li>
-        <%= link_to resource_locator(model).index(filter: { category_id: [category.id.to_s] }), title: t("decidim.tags.filter_results_for_category", resource: translated_attribute(category.name)) do %>
+        <%= link_to resource_locator(model).index(filter: { with_any_category: [category.id.to_s] }), title: t("decidim.tags.filter_results_for_category", resource: translated_attribute(category.name)) do %>
           <span class="show-for-sr"><%= t "decidim.tags.filter_results_for_category", resource: translated_attribute(category.name) %></span>
           <span aria-hidden="true"><%= translated_attribute(category.name) %></span>
         <% end %>
@@ -17,7 +17,7 @@
 
     <% if has_visible_scopes?(model) %>
       <li>
-        <%= link_to resource_locator(model).index(filter: { scope_id: [scope.id] }), title: t("decidim.tags.filter_results_for_scope", resource: translated_attribute(scope.name)) do %>
+        <%= link_to resource_locator(model).index(filter: { with_any_scope: [scope.id] }), title: t("decidim.tags.filter_results_for_scope", resource: translated_attribute(scope.name)) do %>
           <span class="show-for-sr"><%= t "decidim.tags.filter_results_for_scope", resource: translated_attribute(scope.name) %></span>
           <span aria-hidden="true"><%= translated_attribute(scope.name) %></span>
         <% end %>

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

@@ -21,6 +21,8 @@ module Decidim
         #
         # Returns nothing.
         def call
+          return broadcast(:invalid) if proposal.blank?
+
           if proposal.published_state? && state_changed?
             transaction do
               increment_score

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

@@ -95,7 +95,13 @@ module Decidim
       # the proposal comes from a collaborative_draft or a participatory_text.
       def safe_content?
         (rich_text_editor_in_public_views? && not_from_collaborative_draft(@proposal)) ||
-          ((@proposal.official? || @proposal.official_meeting?) && not_from_participatory_text(@proposal))
+          safe_content_admin?
+      end
+
+      # For admin entered content, the proposal body can contain certain extra
+      # tags, such as iframes.
+      def safe_content_admin?
+        (@proposal.official? || @proposal.official_meeting?) && not_from_participatory_text(@proposal)
       end
 
       # If the content is safe, HTML tags are sanitized, otherwise, they are stripped.

data/app/helpers/decidim/proposals/proposals_helper.rb

@@ -7,7 +7,7 @@ module Decidim
       def proposal_reason_callout_announcement
         {
           title: proposal_reason_callout_title,
-          body: decidim_sanitize_editor(translated_attribute(@proposal.answer))
+          body: decidim_sanitize_editor_admin(translated_attribute(@proposal.answer))
         }
       end
 

data/app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb

@@ -1,13 +1,13 @@
 <div class="grid-x">
   <div class="cell">
     <%= form.hidden_field :position, class: "position" %>
-    <%= form.text_field :title, optional: false %>
+    <%= form.text_field :title, required: true %>
   </div>
 </div>
 <% if proposal.article? %>
 <div class="grid-x">
   <div class="cell">
-    <%= form.text_area :body, optional: false, rows: 5 %>
+    <%= form.text_area :body, required: true, rows: 5 %>
   </div>
 </div>
 <% end %>

data/app/views/decidim/proposals/admin/participatory_texts/new_import.html.erb

@@ -23,7 +23,7 @@
           <fieldset>
             <legend> <%= t(".document_legend", valid_mime_types: mime_types_with_document_examples).html_safe %> </legend>
               <div class="row column">
-                <%= form.upload :document, optional: false %>
+                <%= form.upload :document, required: true %>
               </div>
           </fieldset>
         </div>

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

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form edit_proposal proposal_form_admin" })  do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

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

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <div class="card with-overflow">
   <div class="card-divider">
     <h2 class="card-title flex--sbc">

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

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form new_proposal proposal_form_admin" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

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

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(translated_attribute(proposal.title)) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb

@@ -5,7 +5,7 @@
 </div>
 
 <div class="field hashtags__container">
-  <%= form.text_area :body, rows: 10, class: "js-hashtags", value: form_presenter.body(extras: false).strip %>
+  <%= text_editor_for_proposal_body(form) %>
 </div>
 
 <% if @form.component_automatic_hashtags.any? %>

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

@@ -33,7 +33,7 @@
     <div class="section">
       <%== cell("decidim/proposals/collaborative_draft_m", @collaborative_draft, full_badge: true).badge %>
 
-      <%= simple_format(present(@collaborative_draft).body(links: true, strip_tags: true), nil, sanitize: false) %>
+      <%= decidim_sanitize_editor present(@collaborative_draft).body(links: true) %>
 
       <% if component_settings.geocoding_enabled? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @collaborative_draft } %>

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

@@ -22,7 +22,8 @@
           <% end %>
         </div>
       </div>
-      <% if !current_settings.try(:votes_hidden?) && !proposal.component.current_settings.votes_hidden? %>
+      <% if !current_settings.try(:votes_hidden?) && !proposal.component.current_settings.votes_hidden? &&
+      proposal.component.current_settings.votes_enabled? %>
         <div class="card--list__data">
           <span class="card--list__data__number">
             <%= proposal.votes.size %>

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

@@ -40,7 +40,7 @@
     <% if params.dig("filter", "with_availability").present? && params["filter"]["with_availability"] == "withdrawn" %>
       <%= link_to t("decidim.proposals.proposals.index.see_all"), proposals_path("filter[with_availability]" => nil) %>
     <% else %>
-      <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { with_availability: "withdrawn", state: [""] }) %>
+      <%= link_to t("decidim.proposals.proposals.index.see_all_withdrawn"), proposals_path(filter: { with_availability: "withdrawn", with_any_state: [] }) %>
     <% end %>
   </div>
 </div>