decidim-admin 0.26.1 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 838ff353bee24a8f82dec6d06f8c04701ff1d1e07eedb876f682f54a21aa40ca
-  data.tar.gz: 10c9cce477a7b3ef4bf4647e4d7cba1b501b8a4b4706e0e3d2120c2bacb17965
+  metadata.gz: a33b1f86d32bce28471d7e0cae6d58f3f0b8734e8588543b249f0eae9a187707
+  data.tar.gz: 5ade51348a77a2ba45c95cb747cdf31ea9f743ce2b36753f102ebd6399fc4789
 SHA512:
-  metadata.gz: e920a9e4c8c02d5b9633bbb4c73b0142979c1cfba995002e0334c7fca776b37d406bea56757a1fcc488c7dee8c901499aefda2f9e5e38e15f43b788b2cba8d91
-  data.tar.gz: 7d1caa9a3dc607071368cf9815847000a5d8a9592853540389805fe902d6171db5676974fda69fd5ff1a808520cb785121bbe111b65e4325bcce706c7cb10ac9
+  metadata.gz: 477ee263630fb1af968f73a922d899819908e60faa909e13ed3c585404b9e4c09fe4dd83bf4c458f1ff62a4e7844e6d663e28f32ed64ad9d7475f5ab5632b463
+  data.tar.gz: eaae371f50ec70b88bc4805a16157aee750bcc8a1b0edcc924f35ea8b4dd434759d36a33874147402c181bf87c6da60cd231bdf3fc97e2222f38cd53a7968412

data/app/controllers/decidim/admin/conflicts_controller.rb

@@ -6,7 +6,9 @@ module Decidim
       layout "decidim/admin/users"
 
       def index
-        @conflicts = Decidim::Verifications::Conflict.all
+        @conflicts = Decidim::Verifications::Conflict.joins(:current_user).where(
+          decidim_users: { decidim_organization_id: current_organization.id }
+        )
       end
 
       def edit

data/app/controllers/decidim/admin/organization_controller.rb

@@ -30,11 +30,11 @@ module Decidim
       end
 
       def users
-        search(current_organization.users)
+        search(current_organization.users.available)
       end
 
       def user_entities
-        search(current_organization.user_entities)
+        search(current_organization.user_entities.available)
       end
 
       private
@@ -51,7 +51,7 @@ module Decidim
                           query.where("email ILIKE ?", "%#{term}%")
                         )
                       end
-              render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname}) #{u.email}" } }
+              render json: query.all.collect { |u| { value: u.id, label: "#{u.name} (@#{u.nickname})" } }
             else
               render json: []
             end

data/app/controllers/decidim/admin/resource_permissions_controller.rb

@@ -83,7 +83,7 @@ module Decidim
       end
 
       def manifest_name
-        @manifest_name ||= resource.manifest.name
+        @manifest_name ||= resource.resource_manifest.name
       end
 
       def permissions

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

@@ -102,7 +102,7 @@ module Decidim
                                                               .find_participatory_space_manifest(manifest_name)
                                                               .participatory_spaces.call(current_organization)
                                                               .published
-                                                              .sort_by { |space| [space.closed? ? 1 : 0, space.title[current_locale]] }
+                                                              .sort_by { |space| [space.try(:closed?) ? 1 : 0, space.title[current_locale]] }
       end
 
       def spaces_user_can_admin

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

@@ -18,16 +18,19 @@ module Decidim
         time: :datetime_field
       }.freeze
 
-      # Public: Renders a form field that matches a settings attribute's
-      # type.
+      # Renders a form field that matches a settings attribute's type.
+      # Besides the field itself, it also renders all the metadata (like the labels and help texts)
       #
-      # form      - The form in which to render the field.
-      # attribute - The Settings::Attribute instance with the
-      #             description of the attribute.
-      # name      - The name of the field.
-      # options   - Extra options to be passed to the field helper.
-      #
-      # Returns a rendered form field.
+      # @param form [Decidim::Admin::FormBuilder] The form in which to render the field
+      # @param attribute [Decidim::SettingsManifest::Attribute] The Settings::Attribute instance with the
+      #   description of the attribute.
+      # @param name [Symbol] The name of the field.
+      # @param i18n_scope [String] The scope where it'll find all the texts for the internationalization (locales)
+      # @param options [Hash] Extra options to be passed to the field helper.
+      # @option options [String] :tabs_prefix The type of the setting.
+      #   It can be "global-settings" or "step-N-settings", where N is the number of the step.
+      # @option options [nil, Boolean] :readonly True if the input is readonly.
+      # @return [ActiveSupport::SafeBuffer] Rendered form field.
       def settings_attribute_input(form, attribute, name, i18n_scope, options = {})
         form_method = form_method_for_attribute(attribute)
 
@@ -62,6 +65,18 @@ module Decidim
 
       private
 
+      # Renders a select field collection input for the given attribute
+      #
+      # @param form (see #settings_attribute_input)
+      # @param attribute (see #settings_attribute_input)
+      # @param name (see #settings_attribute_input)
+      # @param i18n_scope (see #settings_attribute_input)
+      # @param options (see #settings_attribute_input)
+      # @option :tabs_prefix (see #settings_attribute_input)
+      # @option :readonly (see #settings_attribute_input)
+      # @option options [String] :label The label that this field has
+      # @option options [String] :help_text The help text shown after the input field
+      # @return (see #settings_attribute_input)
       def render_select_form_field(form, attribute, name, i18n_scope, options)
         html = form.select(
           name,
@@ -73,6 +88,17 @@ module Decidim
       end
 
       # Returns a radio buttons collection input for the given attribute
+      #
+      # @param form (see #settings_attribute_input)
+      # @param attribute (see #settings_attribute_input)
+      # @param name (see #settings_attribute_input)
+      # @param i18n_scope (see #settings_attribute_input)
+      # @param options (see #settings_attribute_input)
+      # @option :tabs_prefix (see #settings_attribute_input)
+      # @option :readonly (see #settings_attribute_input)
+      # @option :label (see #render_select_form_field)
+      # @option :help_text (see #render_select_form_field)
+      # @return (see #settings_attribute_input)
       def render_enum_form_field(form, attribute, name, i18n_scope, options)
         html = label_tag(name) do
           concat options[:label]
@@ -88,13 +114,25 @@ module Decidim
         html
       end
 
+      # Get the translation for a given attribute
       # Returns a translation or nil. If nil, ZURB Foundation won't add the help_text.
+      #
+      # @param name (see #settings_attribute_input)
+      # @param suffix [String] What suffix the i18n key has
+      # @param i18n_scope (see #settings_attribute_input)
+      # @return [String, nil]
       def text_for_setting(name, suffix, i18n_scope)
+        html_key = "#{i18n_scope}.#{name}_#{suffix}_html"
+        return t(html_key) if I18n.exists?(html_key)
+
         key = "#{i18n_scope}.#{name}_#{suffix}"
         return t(key) if I18n.exists?(key)
       end
 
-      # Returns the FormBuilder's method used to render
+      # Which form method is being used for this attribute
+      #
+      # @param attribute [Decidim::SettingsManifest::Attribute]
+      # @return [Symbol] The FormBuilder's method used to render
       def form_method_for_attribute(attribute)
         return :editor if attribute.type.to_sym == :text && attribute.editor?
 
@@ -102,7 +140,9 @@ module Decidim
       end
 
       # Handles special cases.
-      # Returns an empty Hash or a Hash with extra HTML options.
+      #
+      # @param input_type [Symbol]
+      # @return [Hash] Empty Hash or a Hash with extra HTML options.
       def extra_options_for_type(input_type)
         case input_type
         when :text_area
@@ -113,6 +153,12 @@ module Decidim
       end
 
       # Build options for enum attributes
+      # Get the translation for a given attribute of type choice
+      #
+      # @param name (see #settings_attribute_input)
+      # @param i18n_scope (see #settings_attribute_input)
+      # @param choices [Array<Symbol>]
+      # @return [Array<Array<String>>]
       def build_enum_choices(name, i18n_scope, choices)
         choices.map do |choice|
           [t("#{name}_choices.#{choice}", scope: i18n_scope), choice]

data/app/packs/entrypoints/decidim_admin.js

@@ -14,7 +14,7 @@ import "jquery.autocomplete"
 import "jquery-serializejson"
 
 import "src/decidim/admin/tab_focus"
-import "src/decidim/admin/choose_language"
+import initLanguageChangeSelect from "src/decidim/admin/choose_language"
 import "src/decidim/admin/application"
 import "src/decidim/admin/resources_permissions"
 import "src/decidim/admin/welcome_notification"
@@ -40,3 +40,7 @@ import "entrypoints/decidim_admin.scss";
 
 // This needs to be loaded after confirm dialog to bind properly
 Rails.start()
+
+window.addEventListener("DOMContentLoaded", () => {
+  initLanguageChangeSelect(document.querySelectorAll("select.language-change"));
+});

data/app/packs/src/decidim/admin/choose_language.js

@@ -1,12 +1,14 @@
 /* eslint-disable no-invalid-this */
+/* eslint-disable require-jsdoc */
 
-$(() => {
-  $("select.language-change").change(function () {
-    let $select = $(this);
-    let targetTabPaneSelector = $select.val();
-    let $tabsContent = $select.parent().parent().siblings();
+export default function initLanguageChangeSelect(elements) {
+  elements.forEach((select) => {
+    select.addEventListener("change", () => {
+      let targetTabPaneSelector = select.value;
+      let tabsContent = select.parentElement.parentElement.nextElementSibling;
 
-    $tabsContent.children(".is-active").removeClass("is-active");
-    $tabsContent.children(targetTabPaneSelector).addClass("is-active");
-  })
-});
+      tabsContent.querySelector(".is-active").classList.remove("is-active");
+      tabsContent.querySelector(targetTabPaneSelector).classList.add("is-active");
+    })
+  });
+}

data/app/packs/src/decidim/admin/dynamic_fields.component.js

@@ -70,6 +70,7 @@ class DynamicFieldsComponent {
       $(this).replaceAttribute("for", placeholder, value);
       $(this).replaceAttribute("tabs_id", placeholder, value);
       $(this).replaceAttribute("href", placeholder, value);
+      $(this).replaceAttribute("value", placeholder, value);
 
       return this;
     }

data/app/packs/stylesheets/decidim/admin/modules/_forms.scss

@@ -116,6 +116,12 @@ label,
   margin-bottom: $input-margin;
 }
 
+.form-input-extra-before{
+  margin-bottom: $form-spacing * 1.5;
+  display: block;
+  margin-top: $form-spacing * -1;
+}
+
 .custom-error{
   @extend .form-error;
 }

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

@@ -51,11 +51,12 @@ module Decidim
         @spaces ||= @form.participatory_space_types.map do |type|
           next if type.ids.blank?
 
-          object_class = "Decidim::#{type.manifest_name.classify}"
+          object_class = Decidim.participatory_space_registry.find(type.manifest_name).model_class_name.constantize
+
           if type.ids.include?("all")
-            object_class.constantize.where(organization: @organization)
+            object_class.where(organization: @organization)
           else
-            object_class.constantize.where(id: type.ids.reject(&:blank?))
+            object_class.where(id: type.ids.reject(&:blank?))
           end
         end.flatten.compact
       end

data/app/views/decidim/admin/organization_appearance/form/_colors.html.erb

@@ -2,13 +2,13 @@
   <div class="card-divider">
     <h2 class="card-title"><%= t ".colors_title" %></h2>
   </div>
-  <div class="callout warning">
-    <p>
-      <%= icon "warning" %>
-      <%= t ".colors_warning_html", link: "https://webaim.org/resources/contrastchecker" %>
-    </p>
-  </div>
   <div class="card-section">
+    <div class="callout warning">
+      <p>
+        <%= icon "warning" %>
+        <%= t ".colors_warning_html", link: "https://webaim.org/resources/contrastchecker" %>
+      </p>
+    </div>
     <div class="organization-colors">
       <%= form.color_field :primary_color, value: current_organization.colors["primary"] %>
       <%= form.color_field :secondary_color, value: current_organization.colors["secondary"] %>

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

@@ -21,7 +21,7 @@
           <% if @component %>
             <div class="card-divider"><%= t("#{@component.manifest.name}.actions.#{action}", scope: "decidim.components") %></div>
           <% else %>
-            <div class="card-divider"><%= t("#{resource.manifest.name}.actions.#{action}", scope: "decidim.resources") %></div>
+            <div class="card-divider"><%= t("#{resource.resource_manifest.name}.actions.#{action}", scope: "decidim.resources") %></div>
           <% end %>
 
           <div class="card-section">