decidim-core 0.22.0 → 0.23.3

data/app/cells/decidim/card_cell.rb

@@ -20,13 +20,11 @@ module Decidim
     end
 
     def resource_cell
-      if model.respond_to?(:resource_manifest) && model.resource_manifest.card.present?
-        @resource_cell ||= model.resource_manifest.card
-      elsif ["Decidim::Proposals::OfficialAuthorPresenter", "Decidim::Debates::OfficialAuthorPresenter"].include? model.class.to_s
-        @resource_cell ||= "decidim/author"
-      elsif ["Decidim::User", "Decidim::UserGroup"].include? model.model_name.name
-        @resource_cell ||= "decidim/author"
-      end
+      @resource_cell ||= if resource_card
+                           resource_card
+                         elsif official_author? || user_or_user_group?
+                           "decidim/author"
+                         end
     end
 
     def title
@@ -36,5 +34,21 @@ module Decidim
     def body
       model.try(:body) || model.try(:about) || ""
     end
+
+    def resource_manifest
+      model.try(:resource_manifest) || Decidim.find_resource_manifest(model.class)
+    end
+
+    def resource_card
+      resource_manifest&.card.presence
+    end
+
+    def official_author?
+      ["Decidim::Proposals::OfficialAuthorPresenter", "Decidim::Debates::OfficialAuthorPresenter"].include? model.class.to_s
+    end
+
+    def user_or_user_group?
+      ["Decidim::User", "Decidim::UserGroup"].include? model.model_name.name
+    end
   end
 end

data/app/cells/decidim/card_m/show.erb

@@ -4,7 +4,7 @@
     <%= render :top if render_top? %>
     <%= render :image if has_image? %>
     <div class="card__content">
-      <%= render :header %>
+      <%= render :header if has_header? %>
 
       <div class="card__text">
         <div class="card__text--paragraph">

data/app/cells/decidim/card_m_cell.rb

@@ -19,13 +19,17 @@ module Decidim
     private
 
     def resource_path
-      resource_locator(model).path
+      resource_locator(model).path(filter_link_params)
     end
 
     def resource_image_path
       nil
     end
 
+    def has_header?
+      true
+    end
+
     def has_image?
       false
     end
@@ -104,9 +108,7 @@ module Decidim
     end
 
     def comments_count
-      return model.comments.not_hidden.count if model.comments.respond_to? :not_hidden
-
-      model.comments.count
+      model.comments_count
     end
 
     def statuses

data/app/cells/decidim/collapsible_authors_cell.rb

@@ -27,7 +27,7 @@ module Decidim
     def actionable?
       return false if options[:has_actions] == false
 
-      true if withdrawable? || flagable?
+      true if withdrawable? || flaggable?
     end
   end
 end

data/app/cells/decidim/content_blocks/sub_hero/show.erb

@@ -1,7 +1,9 @@
   <section class="extended subhero home-section">
     <div class="row">
       <div class="columns small-centered large-10">
-        <h2 class="heading2"><%= decidim_sanitize translated_attribute(current_organization.description), strip_tags: true %></h2>
+        <h2 class="heading2">
+          <%= decidim_sanitize translated_attribute current_organization.description %>
+        </h2>
         <% unless current_user %>
           <%= link_to decidim.new_user_registration_path, class: "button--sc link subhero-cta", title: t("decidim.pages.home.sub_hero.register_title") do %>
             <%= t("decidim.pages.home.sub_hero.register") %>

data/app/cells/decidim/diff/diff_mode_html.erb

@@ -8,19 +8,19 @@
       <ul class="dropdown menu" data-dropdown-menu>
         <li class="is-dropdown-submenu-parent">
           <a id="diff-view-selected">
-            <%= t("versions.dropdown.option_escaped") %>
+            <%= t("versions.dropdown.option_unescaped") %>
           </a>
 
           <ul class="menu">
             <li>
-              <%= link_to "#escaped-html", class: "diff-view-html", id:"escaped-html" do %>
-                <%= t("versions.dropdown.option_escaped") %>
+              <%= link_to "#unescaped-html", class: "diff-view-html", id:"unescaped-html" do %>
+                <%= t("versions.dropdown.option_unescaped") %>
               <% end %>
             </li>
 
             <li>
-              <%= link_to "#unescaped-html", class: "diff-view-html", id:"unescaped-html" do %>
-                <%= t("versions.dropdown.option_unescaped") %>
+              <%= link_to "#escaped-html", class: "diff-view-html", id:"escaped-html" do %>
+                <%= t("versions.dropdown.option_escaped") %>
               <% end %>
             </li>
           </ul>

data/app/cells/decidim/follow_button/show.erb

@@ -4,8 +4,8 @@
       <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, method: :delete, remote: true do %>
         <span class="icon-wrap">
           <%= icon "bell", icon_options %>
-          <span aria-hidden="true"><%= model.followers.count %></span>
-          <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: model.followers.count) %></span>
+          <span aria-hidden="true"><%= followers_count %></span>
+          <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: followers_count) %></span>
         </span>
         <span class="text-wrap">
           <%= t("follows.destroy.button", scope: "decidim") %>
@@ -16,8 +16,8 @@
       <%= button_to decidim.follow_path, class: button_classes, params: { follow: { followable_gid: model.to_sgid.to_s, inline: inline? } }, data: { disable: true }, remote: true do %>
         <span class="icon-wrap">
           <%= icon "bell", icon_options %>
-          <span aria-hidden="true"><%= model.followers.count %></span>
-          <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: model.followers.count) %></span>
+          <span aria-hidden="true"><%= followers_count %></span>
+          <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: followers_count) %></span>
         </span>
         <span class="text-wrap">
           <% if current_user.follows?(model.try(:participatory_space)) %>
@@ -42,8 +42,8 @@
       remote: true) do %>
       <span class="icon-wrap">
         <%= icon "bell", icon_options %>
-        <span aria-hidden="true"><%= model.followers.count %></span>
-        <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: model.followers.count) %></span>
+        <span aria-hidden="true"><%= followers_count %></span>
+        <span class="show-for-sr"><%= t("decidim.followers.followers_count", count: followers_count) %></span>
       </span>
       <span class="text-wrap">
         <%= t("follows.create.button", scope: "decidim") %>

data/app/cells/decidim/follow_button_cell.rb

@@ -15,6 +15,14 @@ module Decidim
 
     private
 
+    def followers_count
+      if model.respond_to?(:followers_count)
+        model.followers_count
+      else
+        model.followers.count
+      end
+    end
+
     def button_classes
       return "card__button secondary text-uppercase follow-button mb-none has-tip" if inline?
 

data/app/cells/decidim/progress_bar/show.erb

@@ -1,14 +1,21 @@
-<div id="<%= element_id %>" class="progress__bar<%= " progress__bar--vertical" unless small? %>">
+<div id="<%= element_id %>" class="<%= container_class %>">
   <div class="progress__bar__title">
-    <span class="progress__bar__number"><%= progress %></span><%= "/#{total}" if total != 0 %>
-    <span class="progress__bar__text"><%= units_name_text %></span>
+
+    <% if horizontal? %>
+      <span class="progress__bar__text"><%= subtitle_text %></span>
+      <span class="progress__bar__number"><%= progress %></span><%= "/#{total}" if total != 0 %>
+    <% else %>
+      <span class="progress__bar__number"><%= progress %></span><%= "/#{total}" if total != 0 %>
+      <span class="progress__bar__text"><%= units_name_text %></span>
+    <% end %>
   </div>
   <% if total != 0 %>
     <div class="progress progress__bar__bar" role="progressbar" tabindex="0" aria-valuenow="<%= percentage %>" aria-valuemin="0" aria-valuetext="<%= percentage %> percent" aria-valuemax="100">
       <div class="progress-meter progress__bar__bar--complete" style="width: <%= percentage %>%"></div>
       <div class="progress__bar__bar--incomplete" style="width:calc(100% - <%= percentage %>%);"></div>
     </div>
-    <% if subtitle_text.present? %>
+
+    <% if display_subtitle? %>
       <div class="progress__bar__subtitle">
         <%= subtitle_text %>
       </div>

data/app/cells/decidim/progress_bar_cell.rb

@@ -22,7 +22,7 @@ module Decidim
   # Example:
   #
   #    cell(
-  #      "decidim/progress_bar_list",
+  #      "decidim/progress_bar",
   #      7,
   #      element_id: "my-id",
   #      units_name: "my.i18n.key",
@@ -49,10 +49,29 @@ module Decidim
       options[:subtitle_text]
     end
 
+    def container_class
+      container_class = "progress__bar"
+      container_class += " progress__bar--horizontal" if horizontal? && !small?
+      container_class += " progress__bar--vertical" if vertical?
+      container_class
+    end
+
+    def display_subtitle?
+      subtitle_text.present? && !small? && !horizontal?
+    end
+
     def small?
       options[:small].to_s == "true"
     end
 
+    def vertical?
+      !small? && !horizontal?
+    end
+
+    def horizontal?
+      options[:horizontal].to_s == "true"
+    end
+
     def progress
       model
     end

data/app/cells/decidim/tos_page/announcement.erb

@@ -1,2 +1 @@
 <%= cell("decidim/announcement", announcement_args) %>
-<%= content_tag :div, nil, id: "sticky-top-stop" %>

data/app/cells/decidim/tos_page/form.erb

@@ -0,0 +1,17 @@
+<article class="card">
+  <div class="card__content">
+    <div class="card__header">
+      <h5 class="card__title text-center">
+        <%= t("form.legend", scope: "decidim.pages.terms_and_conditions") %>
+      </h5>
+    </div>
+
+    <div class="row column flex-center">
+      <%= cell "decidim/tos_page", :refuse_btn_modal %>
+
+      <%= button_to decidim.accept_tos_path, method: :put, class: "button button--nomargin small" do %>
+        <%= t("form.agreement", scope: "decidim.pages.terms_and_conditions") %>
+      <% end %>
+    </div>
+  </div>
+</article>

data/app/cells/decidim/translation_bar/show.erb

@@ -0,0 +1,6 @@
+<div class="wrapper-mini translation-bar">
+  <div class="row column">
+    <%= link %>
+    <span class="translation-button-help"><%= help_text %></span>
+  </div>
+</div>

data/app/cells/decidim/translation_bar_cell.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell is used to render a button to toggle machine translations. It will
+  # only render if the translations are enabled.
+  class TranslationBarCell < Decidim::ViewModel
+    include Decidim::TranslatableAttributes
+
+    def show
+      return unless renderable?
+
+      render
+    end
+
+    def renderable?
+      Decidim.config.enable_machine_translations &&
+        model.enable_machine_translations
+    end
+
+    def link
+      original_url = request.original_url
+      parsed_url = URI.parse(original_url)
+      query = parsed_url.query
+      new_query_params = "toggle_translations=true"
+
+      new_query = if RequestStore.store[:toggle_machine_translations]
+                    query.gsub("toggle_translations=true", "")
+                  elsif query.nil?
+                    new_query_params
+                  else
+                    query + "&" + new_query_params
+                  end
+
+      parsed_url.query = new_query
+      url = parsed_url.to_s
+
+      link_to button_text, url, class: "button small hollow"
+    end
+
+    def button_text
+      if must_render_translation?(model)
+        t("decidim.translation_bar.show_original")
+      else
+        t("decidim.translation_bar.show_translated")
+      end
+    end
+
+    def help_text
+      t("decidim.translation_bar.help_text")
+    end
+  end
+end

data/app/cells/decidim/version_cell.rb

@@ -77,7 +77,7 @@ module Decidim
     end
 
     def resource_path
-      resource_locator(versioned_resource).path
+      resource_locator(versioned_resource).path(filter_link_params)
     end
   end
 end

data/app/cells/decidim/versions_list_cell.rb

@@ -13,7 +13,7 @@ module Decidim
     end
 
     def resource_path
-      resource_locator(versioned_resource).path
+      resource_locator(versioned_resource).path(filter_link_params)
     end
 
     def i18n_changes_title

data/app/commands/decidim/amendable/accept.rb

@@ -50,12 +50,18 @@ module Decidim
       end
 
       def update_amendable!
-        @amendable = Decidim.traceability.update!(
+        @amendable = Decidim.traceability.perform_action!(
+          :update,
           @amendable,
           @amender,
-          form.emendation_params,
           visibility: "public-only"
-        )
+        ) do
+          @amendable.assign_attributes(form.emendation_params)
+          @amendable.title = { I18n.locale => form.emendation_params.with_indifferent_access[:title] }
+          @amendable.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
+          @amendable.save!
+          @amendable
+        end
         @amendable.add_coauthor(@amender, user_group: @user_group)
       end
 

data/app/commands/decidim/amendable/create_draft.rb

@@ -49,6 +49,8 @@ module Decidim
             visibility: "public-only"
           ) do
             emendation = amendable.class.new(form.emendation_params)
+            emendation.title = { I18n.locale => form.emendation_params.with_indifferent_access[:title] }
+            emendation.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
             emendation.component = amendable.component
             emendation.add_author(current_user, user_group)
             emendation.save!

data/app/commands/decidim/amendable/update_draft.rb

@@ -45,6 +45,8 @@ module Decidim
       def update_draft
         PaperTrail.request(enabled: false) do
           emendation.assign_attributes(form.emendation_params)
+          emendation.title = { I18n.locale => form.emendation_params.with_indifferent_access[:title] }
+          emendation.body = { I18n.locale => form.emendation_params.with_indifferent_access[:body] }
           emendation.add_author(current_user, user_group)
           emendation.save!
         end

data/app/commands/decidim/attachment_methods.rb

@@ -5,14 +5,21 @@ module Decidim
   module AttachmentMethods
     private
 
-    def build_attachment
+    def build_attachment(attached_to = nil)
+      attached_to = @attached_to if attached_to.blank?
+      attached_to = form.current_organization if attached_to.blank? && form.respond_to?(:current_organization)
+
       @attachment = Attachment.new(
-        title: @form.attachment.title,
-        file: @form.attachment.file,
-        attached_to: @attached_to
+        title: { I18n.locale => @form.attachment.title },
+        attached_to: attached_to,
+        file: @form.attachment.file # Define attached_to before this
       )
     end
 
+    def delete_attachment(attachment)
+      Attachment.find(attachment.id).delete if attachment.id == proposal.documents.first.id
+    end
+
     def attachment_invalid?
       if attachment.invalid? && attachment.errors.has_key?(:file)
         @form.attachment.errors.add :file, attachment.errors[:file]
@@ -24,6 +31,10 @@ module Decidim
       @form.attachment.file.present?
     end
 
+    def attachment_file_uploaded?
+      !@form.attachment.file.is_a?(Decidim::ApplicationUploader)
+    end
+
     def create_attachment
       attachment.attached_to = @attached_to
       attachment.save!
@@ -34,7 +45,11 @@ module Decidim
     end
 
     def process_attachments?
-      attachments_allowed? && attachment_present?
+      attachments_allowed? && attachment_present? && attachment_file_uploaded?
+    end
+
+    def delete_attachment?
+      @form.attachment&.delete_file.present?
     end
   end
 end

data/app/commands/decidim/destroy_account.rb

@@ -34,6 +34,7 @@ module Decidim
       @user.nickname = ""
       @user.email = ""
       @user.delete_reason = @form.delete_reason
+      @user.admin = false if @user.admin?
       @user.deleted_at = Time.current
       @user.skip_reconfirmation!
       @user.remove_avatar!