decidim-core 0.18.1 → 0.19.0

data/app/cells/decidim/coauthorships_cell.rb

@@ -55,8 +55,10 @@ module Decidim
         "#{model.class.parent}::OfficialAuthorPresenter".constantize.new
       elsif authorable.user_group
         Decidim::UserGroupPresenter.new(authorable.user_group)
-      else
+      elsif authorable.author.is_a?(Decidim::User)
         Decidim::UserPresenter.new(authorable.author)
+      elsif authorable.author.is_a?(Decidim::Meeting)
+        Decidim::MeetingPresenter.new(authorable.author)
       end
     end
 

data/app/cells/decidim/collapsible_authors_cell.rb

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

data/app/cells/decidim/collapsible_list_cell.rb

@@ -54,6 +54,7 @@ module Decidim
 
     def hidden_elements_count
       return 0 unless collapsible?
+
       list.size - size
     end
 

data/app/cells/decidim/content_blocks/highlighted_content_banner_cell.rb

@@ -7,6 +7,7 @@ module Decidim
 
       def show
         return unless current_organization.highlighted_content_banner_enabled
+
         render
       end
     end

data/app/cells/decidim/content_blocks/last_activity_cell.rb

@@ -8,7 +8,8 @@ module Decidim
       include Decidim::Core::Engine.routes.url_helpers
 
       def show
-        return if activities.empty?
+        return if valid_activities.empty?
+
         render
       end
 
@@ -32,7 +33,7 @@ module Decidim
         activities.each do |activity|
           break if valid_activities_count == activities_to_show
 
-          if activity.resource_lazy.present? && activity.participatory_space_lazy.present?
+          if activity.visible_for?(current_user)
             @valid_activities << activity
             valid_activities_count += 1
           end

data/app/cells/decidim/content_blocks/metrics_cell.rb

@@ -5,6 +5,7 @@ module Decidim
     class MetricsCell < Decidim::ViewModel
       def show
         return unless current_organization.show_statistics?
+
         render
       end
 

data/app/cells/decidim/content_blocks/stats_cell.rb

@@ -5,6 +5,7 @@ module Decidim
     class StatsCell < Decidim::ViewModel
       def show
         return unless current_organization.show_statistics?
+
         render
       end
 

data/app/cells/decidim/content_blocks/sub_hero_cell.rb

@@ -8,6 +8,7 @@ module Decidim
 
       def show
         return if translated_attribute(current_organization.description).blank?
+
         render
       end
     end

data/app/cells/decidim/diff_cell.rb

@@ -54,7 +54,7 @@ module Decidim
       return unless data && data[:new_value].present?
 
       Diffy::Diff.new(
-        data[:old_value],
+        data[:old_value].to_s,
         data[:new_value],
         allow_empty_diff: false,
         include_plus_and_minus_in_html: true

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

@@ -14,7 +14,7 @@
     <code class="fingerprint-source"><%= decidim_html_escape model.fingerprint.source %></code>
   </p>
 
-  <p><%= t "decidim.fingerprint.replicate_help", online_calculator_link: link_to(t("decidim.fingerprint.online_calculator_name"), "http://www.md5calc.com/sha256", target: "_blank") %>
+  <p><%= t "decidim.fingerprint.replicate_help", online_calculator_link: link_to(t("decidim.fingerprint.online_calculator_name"), "http://www.md5calc.com/sha256", target: "_blank", rel: "noopener") %>
 
   <button class="close-button" data-close type="button">
     <span aria-hidden="true">&times;</span>

data/app/cells/decidim/follow_button_cell.rb

@@ -7,6 +7,7 @@ module Decidim
 
     def show
       return if model == current_user
+
       render
     end
 
@@ -15,11 +16,13 @@ module Decidim
     def button_classes
       return "card__button secondary text-uppercase follow-button mb-none" if inline?
       return "button secondary hollow expanded button--icon button--sc" if large?
+
       "button secondary hollow expanded small button--icon follow-button"
     end
 
     def icon_options
       return { class: "icon--small" } if inline?
+
       {}
     end
 

data/app/cells/decidim/members_cell.rb

@@ -15,6 +15,7 @@ module Decidim
 
     def membership_cell_name
       return "decidim/user_group_admin_membership_profile" if options[:from_admin].presence
+
       "decidim/user_group_membership_profile"
     end
 

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

@@ -28,7 +28,7 @@
         <li class="card-data__item card-data__item--expand absolutes">
           <div class="mr-s">
             <span class="text-small"><%= notification.event_class.constantize.model_name.human %></span>
-            <br />
+            <br>
             <span>
               <%= notification.event_class_instance.notification_title %>
             </span>

data/app/cells/decidim/profile_cell.rb

@@ -32,6 +32,7 @@ module Decidim
 
     def profile_tabs
       return render :user_group_tabs if profile_holder.is_a?(Decidim::UserGroup)
+
       render :user_tabs
     end
   end

data/app/cells/decidim/profile_sidebar_cell.rb

@@ -36,6 +36,7 @@ module Decidim
     def can_edit_user_group_profile?
       return false unless current_user
       return false if model.is_a?(Decidim::User)
+
       Decidim::UserGroups::ManageableUserGroups.for(current_user).include?(model)
     end
 
@@ -53,18 +54,21 @@ module Decidim
     def can_join_user_group?
       return false unless current_user
       return false if model.is_a?(Decidim::User)
+
       Decidim::UserGroupMembership.where(user: current_user, user_group: model).empty?
     end
 
     def can_leave_group?
       return false unless current_user
       return false if model.is_a?(Decidim::User)
+
       Decidim::UserGroupMembership.where(user: current_user, user_group: model).where.not(role: :creator).any?
     end
 
     def user_group_email_to_be_confirmed?
       return false unless current_user
       return false if model.is_a?(Decidim::User)
+
       !model.confirmed?
     end
   end

data/app/cells/decidim/search_results_cell.rb

@@ -20,6 +20,7 @@ module Decidim
 
     def sections_to_render
       return non_empty_sections.slice(selected_resource_type) if has_selected_resource_type?
+
       non_empty_sections
     end
 

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

@@ -20,5 +20,5 @@
 <% end %>
 
 <% if last_section? %>
-  <hr class="reset mb-m mt-sm" />
+  <hr class="reset mb-m mt-sm">
 <% end %>

data/app/cells/decidim/tos_page_cell.rb

@@ -16,6 +16,7 @@ module Decidim
       return if model.nil?
       return unless current_user
       return if current_user.tos_accepted?
+
       render model
     end
 

data/app/cells/decidim/user_group_pending_invitations_list_cell.rb

@@ -12,6 +12,7 @@ module Decidim
     def show
       return if invitations.empty?
       return unless own_profile?
+
       render :show
     end
 

data/app/cells/decidim/user_group_pending_requests_list_cell.rb

@@ -12,6 +12,7 @@ module Decidim
     def show
       return if requests.empty?
       return unless current_user_is_manager?
+
       render :show
     end
 

data/app/cells/decidim/wizard_step_form/wizard_aside.erb

@@ -0,0 +1,14 @@
+<div class="columns large-3">
+  <% if wizard_aside_back_url %>
+    <div class="m-bottom">
+      <%= link_to wizard_aside_back_url do %>
+        <%= icon "chevron-left", class: "icon--small" %>
+        <%= i18n_wizard_aside_back %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <div class="show-for-large">
+    <%= wizard_stepper %>
+  </div>
+</div>

data/app/cells/decidim/wizard_step_form/wizard_header.erb

@@ -0,0 +1,18 @@
+<%= cell("decidim/announcement", wizard_header_announcement) %>
+
+<div class="proposal_wizard_help_text">
+  <%= cell("decidim/announcement", wizard_header_help_text) %>
+</div>
+
+<h2 class="section-heading">
+  <%= wizard_header_title %>
+  <%= wizard_header_similar_resources_count %>
+</h2>
+
+<div class="hide-for-large m-bottom">
+  <%= wizard_header_see_steps %>
+
+  <ol id="steps" class="wizard__steps steps-toggle is-hidden" data-toggler=".is-hidden">
+    <%= wizard_stepper %>
+  </ol>
+</div>

data/app/cells/decidim/wizard_step_form_cell.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders the wizard step form :wizard_aside or :wizard_header view.
+  # Is designed to be used by different models and so it does not try to compute
+  # the information likely to change. Expects a Hash with all necessary data.
+  class WizardStepFormCell < Decidim::ViewModel
+    include Decidim::LayoutHelper
+
+    def show
+      render view
+    end
+
+    private
+
+    # A Hash with all necessary data to render the view.
+    def view_options
+      model
+    end
+
+    # Returns the name of the view we want to render, as Symbol.
+    def view
+      view_options[:view]
+    end
+
+    # Returns the current step as Integer.
+    def current_step
+      view_options[:current_step]
+    end
+
+    # Returns the total number of steps to build the #wizard_stepper, as Integer.
+    def total_steps
+      view_options[:total_steps]
+    end
+
+    # Returns the list with all the steps, in HTML.
+    def wizard_stepper
+      content_tag :ol, class: "wizard__steps" do
+        (1..total_steps).map { |step| wizard_stepper_step(step) }.join
+      end
+    end
+
+    # Returns the list item of the given step, in HTML.
+    def wizard_stepper_step(step)
+      content_tag(:li, wizard_step_name(step), class: wizard_step_classes(step))
+    end
+
+    # Returns the name of the step, translated
+    def wizard_step_name(step)
+      view_options[:steps][step.to_s.to_sym]
+    end
+
+    # Returns the CSS classes used for the wizard for the given step.
+    def wizard_step_classes(step)
+      if step == current_step
+        %(step--active step_#{step})
+      elsif step < current_step
+        %(step--past step_#{step})
+      else
+        %()
+      end
+    end
+
+    # Returns the url of the back button.
+    def wizard_aside_back_url
+      view_options[:wizard_aside_back_url]
+    end
+
+    # Returns the translation of the back button.
+    def i18n_wizard_aside_back
+      t(".wizard_aside.back")
+    end
+
+    # Returns a Hash to be passed to Decidim::AnnouncementCell.
+    def wizard_header_announcement
+      view_options[:wizard_header_announcement] || {}
+    end
+
+    # Returns a Hash to be passed to Decidim::AnnouncementCell.
+    def wizard_header_help_text
+      view_options[:wizard_header_help_text] || {}
+    end
+
+    # Returns the translation of the header title.
+    def wizard_header_title
+      view_options[:wizard_header_title]
+    end
+
+    # Returns the similar resources count for the compare step.
+    def wizard_header_similar_resources_count
+      count = view_options[:wizard_header_similar_resources_count]
+      "(#{count})" if count
+    end
+
+    # Returns the header see steps information, only visible for small screens.
+    def wizard_header_see_steps
+      content_tag(:span, class: "text-small") do
+        i18n_wizard_header_step_of + " (#{wizard_header_see_steps_link})"
+      end
+    end
+
+    # Returns a translation with the current step number and the total steps number.
+    def i18n_wizard_header_step_of
+      t(".wizard_header.step_of", current_step: current_step, total_steps: total_steps)
+    end
+
+    # Returns a link that toggles the steps in the mobile view.
+    def wizard_header_see_steps_link
+      content_tag(:a, t(".wizard_header.see_steps"), "data-toggle": "steps")
+    end
+  end
+end

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

@@ -32,7 +32,7 @@ module Decidim
           notify_amendable_and_emendation_authors_and_followers
         end
 
-        broadcast(:ok, @amendable)
+        broadcast(:ok, @emendation)
       end
 
       private

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

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Amendable
+    # A command with all the business logic when a user starts amending a resource.
+    class CreateDraft < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # form         - A form object with the params.
+      def initialize(form)
+        @form = form
+        @amendable = form.amendable
+        @current_user = form.current_user
+        @user_group = Decidim::UserGroup.find_by(id: form.user_group_id)
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the amend.
+      # - :invalid if the form wasn't valid and we couldn't proceed.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) if form.invalid?
+
+        transaction do
+          create_emendation!
+          create_amendment!
+        end
+
+        broadcast(:ok, @amendment)
+      end
+
+      private
+
+      attr_reader :form, :amendable, :current_user, :user_group
+
+      # Prevent PaperTrail from creating an additional version
+      # in the amendment multi-step creation process (step 1: create)
+      #
+      # A first version will be created in step 4: publish
+      # for diff rendering in the amendment control version
+      def create_emendation!
+        PaperTrail.request(enabled: false) do
+          @emendation = Decidim.traceability.perform_action!(
+            :create,
+            amendable.class,
+            current_user,
+            visibility: "public-only"
+          ) do
+            emendation = amendable.class.new(form.emendation_params)
+            emendation.component = amendable.component
+            emendation.add_author(current_user, user_group)
+            emendation.save!
+            emendation
+          end
+        end
+      end
+
+      def create_amendment!
+        @amendment = Decidim::Amendment.create!(
+          amender: current_user,
+          amendable: amendable,
+          emendation: @emendation,
+          state: "draft"
+        )
+      end
+    end
+  end
+end