decidim-admin 0.18.1 → 0.19.0

data/app/forms/decidim/admin/managed_user_promotion_form.rb

@@ -17,6 +17,7 @@ module Decidim
           organization: context.current_organization,
           email: email
         ).where.not(id: context.current_user.id).empty?
+
         errors.add :email, :taken
         false
       end

data/app/forms/decidim/admin/participatory_space_private_user_csv_import_form.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # A form object used to upload CSV to batch participatory space private users.
+    #
+    class ParticipatorySpacePrivateUserCsvImportForm < Form
+      attribute :file
+
+      validates :file, presence: true
+    end
+  end
+end

data/app/forms/decidim/admin/selective_newsletter_form.rb

@@ -28,6 +28,7 @@ module Decidim
 
       def at_least_one_participatory_space_selected
         return if send_to_all_users && current_user.admin?
+
         errors.add(:base, "Select atleast one participatory space") if spaces_selected.blank?
       end
 

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

@@ -25,7 +25,7 @@ module Decidim
       # Returns a String with a link wrapped in a <li> element.
       def public_page_link(url)
         content_tag(:li) do
-          link_to url, class: "button", style: "color: #fff", target: "_blank" do
+          link_to url, class: "button", style: "color: #fff", target: "_blank", rel: "noopener" do
             I18n.t("decidim.admin.view_public_page")
           end
         end

data/app/helpers/decidim/admin/attributes_display_helper.rb

@@ -52,6 +52,7 @@ module Decidim
       # Holds the logic to render a label for a given attribute.
       def display_label(record, attr, locale = nil)
         return content_tag(:dt, record.class.human_attribute_name(attr)) unless locale
+
         content_tag(:dt, record.class.human_attribute_name(attr) + " (#{locale})")
       end
 
@@ -70,6 +71,7 @@ module Decidim
 
       def display_available_locales(record)
         return record.available_locales if record.respond_to?(:available_locales)
+
         record.organization.available_locales if record.respond_to?(:organization)
         current_organization.available_locales if respond_to?(:current_organization)
       end

data/app/helpers/decidim/admin/newsletters_helper.rb

@@ -14,6 +14,7 @@ module Decidim
 
       def participatory_space_types_form_object(form_object, space_type)
         return if spaces_user_can_admin[space_type.manifest_name.to_sym].blank?
+
         html = ""
         form_object.fields_for "participatory_space_types[#{space_type.manifest_name}]", space_type do |ff|
           html += ff.hidden_field :manifest_name, value: space_type.manifest_name
@@ -24,6 +25,7 @@ module Decidim
 
       def select_tag_participatory_spaces(manifest_name, spaces, child_form)
         return unless spaces
+
         content_tag :div, class: "#{manifest_name}-block spaces-block-tag cell small-12 medium-6" do
           child_form.select :ids, options_for_select(spaces),
                             { prompt: t("select_recipients_to_deliver.none", scope: "decidim.admin.newsletters"),
@@ -43,6 +45,7 @@ module Decidim
       def selective_newsletter_to(newsletter)
         return content_tag(:strong, t("index.not_sent", scope: "decidim.admin.newsletters"), class: "text-warning") unless newsletter.sent?
         return content_tag(:strong, t("index.all_users", scope: "decidim.admin.newsletters"), class: "text-success") if newsletter.sent? && newsletter.extended_data.blank?
+
         content_tag :div do
           concat sent_to_users newsletter
           concat sent_to_spaces newsletter
@@ -64,6 +67,7 @@ module Decidim
         html = "<p style='margin-bottom:0;'> "
         newsletter.sended_to_partipatory_spaces.try(:each) do |type|
           next if type["ids"].blank?
+
           html += t("index.segmented_to", scope: "decidim.admin.newsletters", subject: t("activerecord.models.decidim/#{type["manifest_name"].singularize}.other"))
           if type["ids"].include?("all")
             html += "<strong> #{t("index.all", scope: "decidim.admin.newsletters")} </strong>"
@@ -106,6 +110,7 @@ module Decidim
         Decidim.participatory_space_manifests.each do |manifest|
           organization_participatory_space(manifest.name)&.each do |space|
             next unless space.admins.exists?(id: current_user.id)
+
             @spaces_user_can_admin[manifest.name] ||= []
             space_as_option_for_select_data = space_as_option_for_select(space)
             @spaces_user_can_admin[manifest.name] << space_as_option_for_select_data unless @spaces_user_can_admin[manifest.name].detect do |x|
@@ -118,6 +123,7 @@ module Decidim
 
       def space_as_option_for_select(space)
         return unless space
+
         [
           translated_attribute(space.title),
           space.id,

data/app/helpers/decidim/admin/resource_permissions_helper.rb

@@ -29,7 +29,7 @@ module Decidim
         return unless resource.allow_resource_permissions? && allowed_to?(:update, resource_key, resource_key => resource)
 
         icon_link_to "key",
-                     send("edit_#{resource_key}_permissions_path", resource.id, resource_name: resource.resource_manifest.name),
+                     send("edit_#{resource_key}_permissions_path", resource, resource_name: resource.resource_manifest.name),
                      t("actions.permissions", scope: "decidim.admin"),
                      class: "action-icon--permissions #{"action-icon--highlighted" if resource.permissions.present?}"
       end

data/app/helpers/decidim/admin/settings_helper.rb

@@ -23,36 +23,78 @@ module Decidim
       #
       # Returns a rendered form field.
       def settings_attribute_input(form, attribute, name, options = {})
-        if attribute.translated?
+        if name == :amendments_visibility
+          amendments_visibility_form_field(form, options)
+        elsif attribute.translated?
           form.send(:translated, form_method_for_attribute(attribute), name, options.merge(tabs_id: "#{options[:tabs_prefix]}-#{name}-tabs"))
         else
           form.send(form_method_for_attribute(attribute), name, options.merge(extra_options_for(name)))
         end
       end
 
+      # Returns a translation or nil. If nil, ZURB Foundation won't add the help_text.
+      def help_text_for_component_setting(field_name, settings_name, component_name)
+        key = "decidim.components.#{component_name}.settings.#{settings_name}.#{field_name}_help"
+        return t(key) if I18n.exists?(key)
+      end
+
       private
 
+      # Returns a radio buttons collection input for the component's step setting
+      # :amendments_visibility; all wrap in a label tag and with help text.
+      def amendments_visibility_form_field(form, options)
+        html = label_tag(:amendments_visibility) do
+          concat options[:label]
+          concat tag(:br)
+          concat form.collection_radio_buttons(:amendments_visibility,
+                                               Decidim::Amendment::VisibilityStepSetting.options,
+                                               :last,
+                                               :first,
+                                               { checked: form.object.amendments_visibility },
+                                               amendments_extra_options) { |b| b.label { b.radio_button + b.text } }
+        end
+        html << content_tag(:p, help_text_for_component_setting(:amendments_visibility, :step, :proposals), class: "help-text")
+        html.html_safe
+      end
+
       def form_method_for_attribute(attribute)
         return :editor if attribute.type.to_sym == :text && attribute.editor?
+
         TYPES[attribute.type.to_sym]
       end
 
-      # Marks :participatory_texts_enabled checkbox with a unique class if
-      # the Proposals component has existing proposals, and stores the help text
-      # that will be added in a new div via JavaScript in "decidim/admin/form".
-      #
-      # field_name - The name of the field to disable.
-      #
+      # Handles special cases.
       # Returns an empty Hash or a Hash with extra HTML options.
       def extra_options_for(field_name)
-        return {} unless field_name == :participatory_texts_enabled &&
-                         Decidim::Proposals::Proposal.where(component: @component).any?
+        case field_name
+        when :participatory_texts_enabled
+          participatory_texts_extra_options
+        when :amendment_creation_enabled,
+            :amendment_reaction_enabled,
+            :amendment_promotion_enabled
+          amendments_extra_options
+        else
+          {}
+        end
+      end
+
+      # Marks :participatory_texts_enabled setting with a CSS class if the
+      # Proposals component has existing proposals, so it can be identified
+      # in "decidim/admin/form.js". Also, adds a help_text.
+      def participatory_texts_extra_options
+        return {} unless Decidim::Proposals::Proposal.where(component: @component).any?
 
         {
           class: "participatory_texts_disabled",
-          data: { text: t("decidim.admin.components.form.participatory_texts_enabled_help") }
+          help_text: help_text_for_component_setting(:participatory_texts_disabled, :global, :proposals)
         }
       end
+
+      # Marks component_step_settings related to amendments with a CSS class,
+      # so they can be identified in "decidim/admin/form.js".
+      def amendments_extra_options
+        { class: "amendments_step_settings" }
+      end
     end
   end
 end

data/app/jobs/decidim/admin/expire_impersonation_job.rb

@@ -8,6 +8,7 @@ module Decidim
       def perform(user, current_user)
         impersonation_log = Decidim::ImpersonationLog.where(admin: current_user, user: user).active.first
         return unless impersonation_log
+
         impersonation_log.expired_at = Time.current
         impersonation_log.save!
       end

data/app/jobs/decidim/admin/import_participatory_space_private_user_csv_job.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Admin
+    # Custom ApplicationJob scoped to the admin panel.
+    #
+    class ImportParticipatorySpacePrivateUserCsvJob < ApplicationJob
+      queue_as :default
+
+      def perform(email, user_name, privatable_to, current_user)
+        return if email.blank? || user_name.blank?
+
+        params = {
+          name: user_name,
+          email: email.downcase.strip
+        }
+        private_user_form = ParticipatorySpacePrivateUserForm.from_params(params, privatable_to: privatable_to)
+                                                             .with_context(
+                                                               current_user: current_user,
+                                                               current_particiaptory_space: privatable_to
+                                                             )
+
+        Decidim::Admin::CreateParticipatorySpacePrivateUser.call(private_user_form, current_user, privatable_to, true)
+      end
+    end
+  end
+end

data/app/jobs/decidim/admin/newsletter_job.rb

@@ -14,6 +14,7 @@ module Decidim
 
         @newsletter.with_lock do
           raise "Newsletter already sent" if @newsletter.sent?
+
           @newsletter.update!(
             sent_at: Time.current,
             extended_data: extended_data,

data/app/jobs/decidim/admin/verify_user_group_from_csv_job.rb

@@ -13,6 +13,7 @@ module Decidim
 
         return if email.blank?
         return unless user_group
+
         Decidim::Admin::VerifyUserGroup.call(user_group, verifier, true)
       end
 

data/app/permissions/decidim/admin/permissions.rb

@@ -61,6 +61,7 @@ module Decidim
                       permission_action.action == :read
 
         return user_manager_permissions if user_manager?
+
         toggle_allow(user.admin? || space_allows_admin_access_to_current_action?)
       end
 
@@ -68,6 +69,7 @@ module Decidim
         return unless permission_action.subject == :newsletter
         return allow! if user.admin?
         return unless space_allows_admin_access?
+
         newsletter = context.fetch(:newsletter, nil)
 
         case permission_action.action
@@ -94,6 +96,7 @@ module Decidim
 
       def static_page_action?
         return unless permission_action.subject == :static_page
+
         static_page = context.fetch(:static_page, nil)
 
         case permission_action.action
@@ -132,6 +135,7 @@ module Decidim
 
       def user_action?
         return unless [:user, :impersonatable_user].include?(permission_action.subject)
+
         subject_user = context.fetch(:user, nil)
 
         case permission_action.action

data/app/permissions/decidim/admin/user_manager_permissions.rb

@@ -5,6 +5,7 @@ module Decidim
     class UserManagerPermissions < Decidim::DefaultPermissions
       def permissions
         return permission_action unless user_manager? || user.admin?
+
         allow! if read_admin_dashboard_action?
 
         allow! if managed_user_action?
@@ -37,6 +38,7 @@ module Decidim
 
       def user_action?
         return unless [:user, :impersonatable_user].include?(permission_action.subject)
+
         subject_user = context.fetch(:user, nil)
 
         case permission_action.action

data/app/queries/decidim/admin/newsletter_recipients.rb

@@ -41,6 +41,7 @@ module Decidim
 
         @form.participatory_space_types.map do |type|
           next if type.ids.blank?
+
           object_class = "Decidim::#{type.manifest_name.classify}"
           if type.ids.include?("all")
             object_class.constantize.where(organization: @organization)
@@ -55,6 +56,7 @@ module Decidim
       def user_id_of_followers
         return if spaces.blank?
         return unless @form.send_to_followers
+
         Decidim::Follow.user_follower_ids_for_participatory_spaces(spaces)
       end
 
@@ -74,6 +76,7 @@ module Decidim
             end
           end
           next unless defined?(Decidim::Comments)
+
           Decidim::Comments.newsletter_participant_entities.flatten.each do |object|
             klass = Object.const_get(object)
             participant_ids << klass.newsletter_participant_ids(space)

data/app/queries/decidim/admin/user_filter.rb

@@ -46,6 +46,7 @@ module Decidim
 
       def filter_by_search(users)
         return users if name_query.blank?
+
         users.where("LOWER(name) LIKE LOWER(?)", "%#{name_query}%")
       end
 

data/app/queries/decidim/admin/user_groups_evaluation.rb

@@ -35,6 +35,7 @@ module Decidim
 
       def filter_by_search(user_groups)
         return user_groups if @query.blank?
+
         user_groups.where("LOWER(name) LIKE LOWER(?)", "%#{@query}%")
       end
 

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

@@ -22,7 +22,7 @@
             <% collection_for.attachment_collections.each do |attachment_collection| %>
               <tr data-id="<%= attachment_collection.id %>">
                 <td>
-                  <%= link_to translated_attribute(attachment_collection.name), edit_polymorphic_path([collection_for, attachment_collection]) %><br />
+                  <%= link_to translated_attribute(attachment_collection.name), edit_polymorphic_path([collection_for, attachment_collection]) %><br>
                 </td>
                 <td class="table-list__actions">
                   <% if allowed_to? :update, :attachment_collection, attachment_collection: attachment_collection %>

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

@@ -1,7 +1,7 @@
 <h3><%= translated_attribute(@attachment_collection.name) %></h3>
 
 <div class="actions">
-  <hr />
+  <hr>
   <%= link_to t("decidim.admin.actions.edit"), ["edit", @attachment_collection.collection_for, @attachment_collection], class: "button" if allowed_to? :update, :attachment_collection, attachment_collection: @attachment_collection %>
   <%= link_to t("decidim.admin.actions.destroy"), [@attachment_collection.collection_for, @attachment_collection], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :attachment_collection, attachment_collection: @attachment_collection %>
 </div>

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

@@ -25,7 +25,7 @@
             <% attached_to.attachments.each do |attachment| %>
               <tr data-id="<%= attachment.id %>">
                 <td>
-                  <%= link_to translated_attribute(attachment.title), edit_polymorphic_path([attached_to, attachment]) %><br />
+                  <%= link_to translated_attribute(attachment.title), edit_polymorphic_path([attached_to, attachment]) %><br>
                 </td>
                 <td>
                   <%= translated_attribute(attachment.attachment_collection&.name) %>

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

@@ -1,7 +1,7 @@
 <h3><%= translated_attribute(@attachment.title) %></h3>
 
 <div class="actions">
-  <hr />
+  <hr>
   <%= link_to t("decidim.admin.actions.edit"), ["edit", @attachment.attached_to, @attachment] if allowed_to? :update, :attachment, attachment: @attachment %>
   <%= link_to t("decidim.admin.actions.destroy"), [@attachment.attached_to, @attachment], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :attachment, attachment: @attachment %>
 </div>

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

@@ -22,7 +22,7 @@
             <% current_participatory_space.categories.first_class.each do |category| %>
               <tr>
                 <td>
-                  <%= link_to translated_attribute(category.name), edit_category_path(current_participatory_space, category) %><br />
+                  <%= link_to translated_attribute(category.name), edit_category_path(current_participatory_space, category) %><br>
                 </td>
                 <td class="table-list__actions">
                   <% if allowed_to? :update, :category, category: category %>
@@ -43,7 +43,7 @@
               <% category.subcategories.each do |subcategory| %>
                 <tr class="extra__table-list__subcategory">
                   <td>
-                    <%= link_to translated_attribute(subcategory.name), edit_category_path(current_participatory_space, subcategory) %><br />
+                    <%= link_to translated_attribute(subcategory.name), edit_category_path(current_participatory_space, subcategory) %><br>
                   </td>
                   <td class="table-list__actions">
                   <% if allowed_to? :update, :category, category: subcategory %>

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

@@ -1,7 +1,7 @@
 <h3><%= translated_attribute(@category.name) %></h3>
 
 <div class="actions">
-  <hr />
+  <hr>
   <%= link_to t("decidim.admin.actions.edit"), ["edit", participatory_space, @category] if allowed_to? :update, :category, category: @category %>
   <%= link_to t("decidim.admin.actions.destroy"), [participatory_space, @category], method: :delete, class: "alert button", data: { confirm: t("decidim.admin.actions.confirm_destroy") } if allowed_to? :destroy, :category, category: @category %>
 </div>

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

@@ -19,8 +19,8 @@
                 <%= render partial: "decidim/admin/components/settings_fields",
                            locals: {
                              form: settings_fields,
-                             component: @component,
-                             settings_name: "global",
+                             manifest: form.object.manifest,
+                             settings_name: :global,
                              tabs_prefix: "global-settings"
                            } %>
               <% end %>
@@ -46,8 +46,8 @@
                       <%= render partial: "decidim/admin/components/settings_fields",
                                  locals: {
                                    form: settings_fields,
-                                   component: component,
-                                   settings_name: "step",
+                                   manifest: form.object.manifest,
+                                   settings_name: :step,
                                    tabs_prefix: "step-#{step.id}-settings"
                                  } %>
                     <% end %>
@@ -68,8 +68,8 @@
                 <%= render partial: "decidim/admin/components/settings_fields",
                            locals: {
                              form: settings_fields,
-                             component: @component,
-                             settings_name: "step",
+                             manifest: form.object.manifest,
+                             settings_name: :step,
                              tabs_prefix: "default-step-settings"
                            } %>
               <% end %>