decidim-proposals 0.28.1 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07d2cb0c58472efc567a33a1d35c8d46a3ec723196f543a2af5f0fb7d37ed2d2
-  data.tar.gz: 67404c9736f2b189d338d503a9ae24727711f803305cc640df00fcdf384c3a19
+  metadata.gz: 4e4bd14ec5e23a0ba39c81c825c919ceaadbba6c9a2f47498a8f1a2d0bf59dd6
+  data.tar.gz: 757238cf1ff370f483d05ce6a569f4cd41aa5f06191342b374a583babc10d570
 SHA512:
-  metadata.gz: 3ef557822bacfa28606a3a4685b20d920c19afaae09e041d1ea457c7e243e5e8f8b2e84c6c169ad037a99bca67236aae0bfe6ba71e8eeeeb4bf9622df7dd07fc
-  data.tar.gz: ca2bc013940842932fe67588f9bfd31209efcb5a40d99c45a15135c2d03091d96480bedf533a6d9ab060e6e49024d393f31aea2b34373dbe2cab27e8ac0cfd21
+  metadata.gz: a08f20046706481335121d31d830f25e2255b76cec1b93aa4bc38e63145498aa8111995505a8f4ac007cbf245d252466b90f744d5bd51b80fc9e74bc2db82af3
+  data.tar.gz: 3ae92e1d44a2c9bdbce252029947d91dca471f9a00d3f932980ce55f2b796e4ecd7abf83c394f746dd4651dcb736f7c2bc88abc566cd72127b4fa4ca7dfc4066

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

@@ -29,7 +29,7 @@ module Decidim
         hash << model.endorsements_count
         hash << model.comments_count
         hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
-        hash << Digest::MD5.hexdigest(resource_image_path) if resource_image_path
+        hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
         hash << render_space? ? 1 : 0
         if current_user
           hash << current_user.cache_key_with_version

data/app/controllers/concerns/decidim/proposals/orderable.rb

@@ -35,7 +35,7 @@ module Decidim
 
         def fetch_default_order
           default_order = current_settings.default_sort_order.presence || component_settings.default_sort_order
-          return order_by_default if default_order == "default"
+          return order_by_default if default_order == "automatic"
 
           possible_orders.include?(default_order) ? default_order : order_by_default
         end

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

@@ -139,7 +139,7 @@ module Decidim
       end
 
       def show_voting_rules?
-        return false unless votes_enabled?
+        return false if !votes_enabled? || current_settings.votes_blocked?
 
         return true if vote_limit_enabled?
         return true if threshold_per_proposal_enabled?

data/app/packs/entrypoints/participatory_texts_admin.js

@@ -0,0 +1,2 @@
+require.context("../images", true)
+import "stylesheets/decidim/proposals/admin/participatory_texts.scss"

data/app/packs/stylesheets/decidim/proposals/admin/participatory_texts.scss

@@ -0,0 +1,23 @@
+#participatory-text {
+  li {
+    @apply py-4 hover:cursor-move;
+
+    a {
+      @apply font-bold flex;
+
+      > svg {
+        @apply text-2xl fill-black;
+      }
+
+      &[aria-expanded="true"] {
+        & > svg {
+          @apply rotate-90 transition-transform;
+        }
+      }
+
+      span {
+        @apply ml-auto;
+      }
+    }
+  }
+}

data/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb

@@ -15,13 +15,9 @@ module Decidim
       class ProposalPresenter < Decidim::Log::BasePresenter
         private
 
-        def resource_presenter
-          @resource_presenter ||= Decidim::Proposals::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
-        end
-
         def diff_fields_mapping
           {
-            title: "Decidim::Proposals::AdminLog::ValueTypes::ProposalTitleBodyPresenter",
+            title: :i18n,
             body: "Decidim::Proposals::AdminLog::ValueTypes::ProposalTitleBodyPresenter",
             state: "Decidim::Proposals::AdminLog::ValueTypes::ProposalStatePresenter",
             answered_at: :date,

data/app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb

@@ -5,12 +5,10 @@ module Decidim
     module AdminLog
       module ValueTypes
         class ProposalTitleBodyPresenter < Decidim::Log::ValueTypes::DefaultPresenter
-          include Decidim::TranslatableAttributes
-
           def present
             return unless value
 
-            translated_value = translated_attribute(value)
+            translated_value = h.decidim_escape_translated(value)
             return if translated_value.blank?
 
             renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_value)

data/app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb

@@ -11,7 +11,7 @@ module Decidim
         # Returns an HTML-safe String.
         def present_resource_name
           if resource.present?
-            Decidim::Proposals::ProposalPresenter.new(resource.proposal).title
+            resource.proposal.presenter.title(html_escape: true)
           else
             super
           end

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

@@ -15,6 +15,7 @@
             <div class="row column">
               <p class="mt-3"><%= t(".info_1") %></p>
               <ul id="participatory-text" class="draggable-list js-connect js-list-actives accordion  mb-m mt-2.5 ml-2.5 mr-2.5"
+                  data-component="accordion"
                   data-accordion
                   data-sort-url="#"
                   data-multi-expand="true"
@@ -22,11 +23,13 @@
                 <%= form.fields_for(:proposals) do |prop_form| %>
                   <% proposal = @drafts[prop_form.index] %>
 
-                  <li class="py-4 draggable-content <%= proposal.article? ? "is-active" : nil %>" data-accordion-item draggable="true">
-                    <a href="#" class="accordion-title font-bold mt-5"><%= preview_participatory_text_section_title(proposal) %>
+                  <li class="draggable-content is-active" data-accordion-item draggable="true">
+                    <a data-open="true" data-controls="article-<%= proposal.id %>">
+                      <%= icon "arrow-right-s-line" %>
+                      <%= preview_participatory_text_section_title(proposal) %>
                       <span class="mr-m"><%= icon "menu-line", class: "fill-black" %></span>
                     </a>
-                    <div class="accordion-content" data-tab-content>
+                    <div data-tab-content id="article-<%= proposal.id %>">
                       <%= render "article-preview", { form: prop_form, proposal: } %>
                     </div>
                   </li>

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

@@ -5,7 +5,7 @@
         <h2 class="card-title"><%= t ".title", title: present(proposal).title %></h2>
       </div>
 
-      <% if defined?(Decidim::Templates) %>
+      <% if Decidim.module_installed?(:templates) %>
         <%= render "decidim/templates/admin/proposal_answer_templates/template_chooser", form: f %>
       <% end %>
 

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -10,13 +10,17 @@
 
   <% if allowed_to? :import, :proposals %>
     <%= import_dropdown do %>
-      <li class="imports--component imports--proposals">
-        <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path %>
-      </li>
-      <% current_component.manifest.import_manifests.each do |import_manifest| %>
-        <li class="imports--file imports--<%= import_manifest.name %>">
-          <%= link_to import_manifest.message(:label, self), admin_imports_path(current_component, name: import_manifest.name) %>
+      <%= link_to new_proposals_import_path do %>
+        <li class="imports--component imports--proposals">
+          <%= t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")) %>
         </li>
+        <% current_component.manifest.import_manifests.each do |import_manifest| %>
+          <%= link_to admin_imports_path(current_component, name: import_manifest.name) do %>
+            <li class="imports--file imports--<%= import_manifest.name %>">
+              <%= import_manifest.message(:label, self) %>
+            </li>
+          <% end %>
+        <% end %>
       <% end %>
     <% end %>
   <% end %>

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

@@ -6,8 +6,10 @@
         <%= t(".title") %>
         <span id="js-selected-proposals-count" class="component-counter component-counter--inline" title="<%= t("decidim.proposals.admin.proposals.index.selected") %>"></span>
       </div>
+      <div class="flex items-center gap-x-4">
         <%= render partial: "bulk-actions" %>
         <%= render partial: "decidim/admin/components/resource_action" %>
+      </div>
     </h1>
   </div>
   <%= admin_filter_selector(:proposals) %>

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

@@ -10,7 +10,10 @@
 <% if (@proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal)) || (amendments_enabled? && @proposal.amendable? && current_component.current_settings.amendment_creation_enabled && can_participate_in_private_space?) || amendments_enabled? && can_react_to_emendation?(@proposal) || @proposal.withdrawable_by?(current_user) %>
 <section class="layout-aside__section layout-aside__buttons">
   <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
-    <%= link_to t("edit_proposal", scope: "decidim.proposals.proposals.show"), edit_proposal_path(@proposal), class: "button button__sm button__transparent-secondary w-full" %>
+    <%= link_to edit_proposal_path(@proposal), class: "button button__sm button__transparent-secondary w-full" do %>
+    <span><%= t("edit_proposal", scope: "decidim.proposals.proposals.show") %></span>
+    <%= icon "pencil-line" %>
+    <% end %>
   <% else %>
     <%= amend_button_for @proposal %>
   <% end %>
@@ -22,7 +25,6 @@
   <% if @proposal.withdrawable_by?(current_user) %>
     <%= action_authorized_link_to :withdraw, withdraw_proposal_path(@proposal), method: :put, class: "button button__sm button__transparent-secondary w-full", title: t("withdraw_btn_hint", scope: "decidim.proposals.proposals.show" ), data: { confirm: t("withdraw_confirmation_html", scope: "decidim.proposals.proposals.show" ) } do %>
       <span><%= t("withdraw_proposal", scope: "decidim.proposals.proposals.show") %></span>
-      <%= icon "pencil-line" %>
     <% end %>
   <% end %>
 </section>

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

@@ -10,7 +10,7 @@
   <% if @similar_proposals.present? %>
     <div class="proposal__container my-10">
       <% @similar_proposals.each do |proposal| %>
-        <%= card_for @proposal %>
+        <%= card_for proposal %>
       <% end %>
     </div>
   <% end %>

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

@@ -7,7 +7,7 @@
 
   <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %>
 
-  <div class="proposal__container my-10">
+  <div class="proposal__container my-10 flex flex-col gap-4">
     <h2 class="h3 text-secondary"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
 
     <% unless component_settings.participatory_texts_enabled? %>

data/config/assets.rb

@@ -5,5 +5,6 @@ base_path = File.expand_path("..", __dir__)
 Decidim::Webpacker.register_path("#{base_path}/app/packs")
 Decidim::Webpacker.register_entrypoints(
   decidim_proposals: "#{base_path}/app/packs/entrypoints/decidim_proposals.js",
+  participatory_texts_admin: "#{base_path}/app/packs/entrypoints/participatory_texts_admin.js",
   decidim_proposals_admin: "#{base_path}/app/packs/entrypoints/decidim_proposals_admin.js"
 )

data/config/locales/ar.yml

@@ -157,9 +157,7 @@ ar:
             comments_enabled: تم تمكين التعليقات
             comments_max_length: الحد الأقصى لطول التعليقات (اترك 0 لاستعمال القيمة الافتراضية)
             default_sort_order: التصنيف الافتراضي للاقتراح
-            default_sort_order_help: الافتراضي يعني أنه إذا تم تمكين الدعم، سيتم عرض المقترحات عشوائياً، وإذا تم حظر الدعم، فسيتم فرزها حسب الأكثر دعم.
             default_sort_order_options:
-              default: الافتراضي
               most_commented: صاحبة الأكثر تعليقات
               most_endorsed: صاحبة أكثر تأييدات
               most_followed: صاحبة أكثر متابعات
@@ -186,7 +184,6 @@ ar:
             proposal_wizard_step_1_help_text: اقتراح الاقتراح "إنشاء" نص مساعدة الخطوة
             proposal_wizard_step_2_help_text: اقتراح الاقتراح "قارن" نص خطوة المساعدة
             proposal_wizard_step_3_help_text: نص اقتراح "إكمال" تعليمات نص المعالج
-            proposal_wizard_step_4_help_text: اقتراح الاقتراح "نشر" نص تعليمات الخطوة
             resources_permissions_enabled: يمكن تعيين أذونات الإجراءات لكل اقتراح
             scope_id: نطاق
             scopes_enabled: النطاقات مفعلة
@@ -211,9 +208,7 @@ ar:
             creation_enabled: يمكن للمشارِكين إنشاء اقتراحات
             creation_enabled_readonly: يتم تعطيل هذا الإعداد عند تفعيل وظيفة النصوص التشاركية. لتحميل الاقتراحات كنص تشاركي، يرجى النقر على زر النصوص التشاركية واتباع التعليمات.
             default_sort_order: التصنيف الافتراضي للاقتراح
-            default_sort_order_help: الافتراضي يعني أنه إذا تم تمكين الدعم، سيتم عرض المقترحات عشوائياً، وإذا تم حظر الدعم، فسيتم فرزها حسب الأكثر دعم.
             default_sort_order_options:
-              default: الافتراضي
               most_commented: صاحبة الأكثر تعليقات
               most_endorsed: صاحبة أكثر تأييدات
               most_followed: صاحبة أكثر متابعات
@@ -742,7 +737,6 @@ ar:
           discard: تجاهل هذه المسودة
           discard_confirmation: هل أنت متأكد من أنك تريد التخلص من مسودة الاقتراح؟
           send: معاينة
-          title: تحرير مسودة الاقتراح
         filters:
           activity: نشاطي
           all: الكل
@@ -861,7 +855,7 @@ ar:
           step_1: إنشاء اقتراحك
           step_2: قارن
           step_3: إكمال
-          step_4: انشر اقتراحك
+          step_4: نشر اقتراحك
           title: خطوات إنشاء الاقتراحات
       proposals_picker:
         choose_proposals: اختيار الاقتراحات