decidim-decidim_awesome 0.11.4 → 0.12.3

data/app/controllers/decidim/decidim_awesome/admin/{maintenance_controller.rb → private_data_controller.rb}

@@ -6,7 +6,7 @@ module Decidim
   module DecidimAwesome
     module Admin
       # System compatibility analyzer
-      class MaintenanceController < DecidimAwesome::Admin::ApplicationController
+      class PrivateDataController < DecidimAwesome::Admin::ApplicationController
         include NeedsAwesomeConfig
         include MaintenanceContext
         include Decidim::Admin::Filterable
@@ -19,36 +19,36 @@ module Decidim
           enforce_permission_to :edit_config, :private_data, private_data:
         end
 
-        def show
+        def index
           respond_to do |format|
             format.json do
               render json: private_data_finder.for(params[:resources].to_s.split(",")).map { |resource| present(resource) }
             end
             format.all do
-              render :show
+              render :index
             end
           end
         end
 
-        def destroy_private_data
+        def destroy
           if private_data && private_data.total.to_i.positive?
             Decidim::ActionLogger.log("destroy_private_data", current_user, resource, nil, count: private_data.total)
 
             Lock.new(current_organization).get!(resource)
             DestroyPrivateDataJob.set(wait: 1.second).perform_later(resource)
           end
-          redirect_to decidim_admin_decidim_awesome.maintenance_path("private_data"),
-                      notice: I18n.t("destroying_private_data", scope: "decidim.decidim_awesome.admin.maintenance.private_data", title: present_private_data(resource).name)
+          redirect_to decidim_admin_decidim_awesome.private_data_path,
+                      notice: I18n.t("destroying", scope: "decidim.decidim_awesome.admin.private_data.private_data", title: present(resource).name)
         end
 
         private
 
         def resource
-          @resource ||= Component.find_by(id: params[:resource_id])
+          @resource ||= Component.find_by(id: params[:id])
         end
 
         def private_data
-          @private_data ||= present_private_data(resource) if resource
+          @private_data ||= present(resource) if resource
         end
 
         def collection
@@ -60,7 +60,7 @@ module Decidim
         end
 
         def present(resource)
-          present_private_data(resource)
+          PrivateDataPresenter.new(resource)
         end
 
         def private_data_finder

data/app/controllers/decidim/decidim_awesome/utils_controller.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    # Abstract component class for components without any admin controllers (only settings)
+    class UtilsController < DecidimAwesome::ApplicationController
+      def form_builder_i18n
+        lang = I18n.locale
+        folder = "app/packs/src/vendor/form_builder_langs/"
+        file = Decidim::DecidimAwesome::Engine.root.join(folder, "#{lang}.lang")
+        file = Dir[Decidim::DecidimAwesome::Engine.root.join(folder, "#{lang}-*.lang")].first unless File.exist?(file)
+        file = Decidim::DecidimAwesome::Engine.root.join(folder, "en-US.lang") unless file && File.exist?(file)
+        render plain: File.read(file)
+      end
+    end
+  end
+end

data/app/forms/concerns/decidim/decidim_awesome/proposals/{proposal_wizard_create_step_form_override.rb → proposal_form_customizations.rb}

@@ -4,7 +4,7 @@
 module Decidim
   module DecidimAwesome
     module Proposals
-      module ProposalWizardCreateStepFormOverride
+      module ProposalFormCustomizations
         extend ActiveSupport::Concern
 
         included do

data/app/forms/concerns/decidim/decidim_awesome/proposals/proposal_form_override.rb

@@ -8,7 +8,13 @@ module Decidim
 
         included do
           alias_method :decidim_original_map_model, :map_model
-          attribute :private_body, String
+          attribute :private_body, Decidim::Attributes::RichText
+
+          if name == "Decidim::Proposals::ProposalForm"
+            # the original decidim uses CleanString, as no images are allowed for non admins
+            # The RichText attribute transforms signed_id blobs to ObjectIDs
+            attribute :body, Decidim::Attributes::RichText
+          end
 
           def map_model(model)
             decidim_original_map_model(model)

data/app/forms/concerns/decidim/decidim_awesome/system/organization_form_override.rb

@@ -9,7 +9,7 @@ module Decidim
         included do
           alias_method :decidim_original_map_model, :map_model
 
-          attribute :awesome_admins_available_authorizations, Array[String]
+          attribute :awesome_admins_available_authorizations, [String]
 
           def map_model(model)
             decidim_original_map_model(model)
@@ -19,7 +19,7 @@ module Decidim
           def clean_awesome_admins_available_authorizations
             return unless awesome_admins_available_authorizations
 
-            awesome_admins_available_authorizations.select(&:present?)
+            awesome_admins_available_authorizations.compact_blank
           end
 
           private

data/app/forms/decidim/decidim_awesome/admin/config_form.rb

@@ -20,6 +20,10 @@ module Decidim
         attribute :user_timezone, Boolean
         attribute :force_authorization_after_login, Array
         attribute :force_authorization_with_any_method, Boolean
+        attribute :hashcash_signup, Boolean
+        attribute :hashcash_signup_bits, Integer, default: Decidim::DecidimAwesome.hashcash_signup_bits
+        attribute :hashcash_login, Boolean
+        attribute :hashcash_login_bits, Integer, default: Decidim::DecidimAwesome.hashcash_login_bits
         translatable_attribute :force_authorization_help_text, String
         attribute :scoped_admins, Hash
         attribute :menu, [MenuForm]
@@ -49,6 +53,8 @@ module Decidim
         validates :validate_body_min_length, presence: true, numericality: { greater_than_or_equal_to: 0 }
         validates :validate_body_max_caps_percent, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }
         validates :validate_body_max_marks_together, presence: true, numericality: { greater_than_or_equal_to: 1 }
+        validates :hashcash_signup_bits, presence: true, numericality: { greater_than_or_equal_to: 10, less_than_or_equal_to: 50 }
+        validates :hashcash_login_bits, presence: true, numericality: { greater_than_or_equal_to: 10, less_than_or_equal_to: 50 }
         validate :force_authorization_after_login_is_valid
         # TODO: validate non general admins are here
 
@@ -57,6 +63,7 @@ module Decidim
           instance.force_authorization_after_login = instance.force_authorization_after_login.compact_blank if instance.force_authorization_after_login.present?
           instance.valid_keys = extract_valid_keys_from_params(params)
           instance.sanitize_labels!
+          instance.sanitize_arrays!
           instance
         end
 
@@ -135,6 +142,12 @@ module Decidim
           end
         end
 
+        def sanitize_arrays!
+          scoped_admins.transform_values! do |code|
+            code.is_a?(Array) ? code.compact_blank : code
+          end
+        end
+
         private
 
         def force_authorization_after_login_is_valid

data/app/helpers/decidim/decidim_awesome/admin/config_constraints_helpers.rb

@@ -8,7 +8,7 @@ module Decidim
 
         include Decidim::TranslatableAttributes
 
-        delegate :menus, :config_enabled?, to: "Decidim::DecidimAwesome::Menu"
+        delegate :menus, :main_path_for, :config_enabled?, to: "Decidim::DecidimAwesome::Menu"
 
         def check(status)
           content_tag(:span, icon(status ? "check-line" : "close-line", class: "inline-block", aria_label: status, role: "img"), class: "fill-#{status ? "success" : "alert"}")

data/app/helpers/decidim/decidim_awesome/map_helper.rb

@@ -10,7 +10,7 @@ module Decidim
       end
 
       # rubocop:disable Metrics/CyclomaticComplexity
-      # rubocop:disable Metrics/PerceivedComplexity:
+      # rubocop:disable Metrics/PerceivedComplexity
       def awesome_map_for(components, &)
         return unless map_utility_dynamic
 
@@ -57,7 +57,7 @@ module Decidim
         end
       end
       # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable Metrics/PerceivedComplexity:
+      # rubocop:enable Metrics/PerceivedComplexity
 
       def step_settings
         settings_source.try(:current_settings)
@@ -71,6 +71,7 @@ module Decidim
         try(:current_component) || self
       end
 
+      # rubocop:disable Rails/HelperInstanceVariable
       def current_categories(categories)
         return @current_categories if @current_categories
 
@@ -114,6 +115,7 @@ module Decidim
           color: format("#%02x%02x%02x", r, g, b)
         )
       end
+      # rubocop:enable Rails/HelperInstanceVariable
 
       # HSV values in [0..1[
       # returns [r, g, b] values from 0 to 255

data/app/models/decidim/decidim_awesome/paper_trail_version.rb

@@ -20,7 +20,7 @@ module Decidim
         # add users that might have been completly destroyed in any organization
         relevant_user_ids += user_ids_from_object_changes - Decidim::User.select("id").where(id: user_ids_from_object_changes).pluck(:id)
 
-        role_changes.where("object_changes ~ ANY (array[?])", relevant_user_ids.map { |id| "decidim_user_id:\n- ?\n- #{id}" })
+        role_changes.where("object_changes ~ ANY (array[?])", relevant_user_ids.map { |id| "decidim_user_id:\n- ?\n- #{id}(?!\\d)" })
       }
 
       scope :in_organization, lambda { |organization|

data/app/overrides/decidim/devise/registrations/new/add_hashcash.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_top ".login__links" -->
+
+<%= render partial: "decidim/decidim_awesome/hashcash/hidden_field", locals: { zone: :signup } %>

data/app/overrides/decidim/devise/sessions/new/add_hashcash.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_top ".login__links" -->
+
+<%= render partial: "decidim/decidim_awesome/hashcash/hidden_field", locals: { zone: :login } %>

data/app/overrides/layouts/decidim/_head/add_awesome_custom_styles.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_after "erb[loud]:contains('content_for :header_snippets')" -->
+
+<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_scoped_styles.present? %>

data/app/overrides/layouts/decidim/_head/add_awesome_tags.html.erb.deface

@@ -1,7 +1,5 @@
 <!-- insert_after "erb[loud]:contains('append_stylesheet_pack_tag')" -->
 
 <% append_stylesheet_pack_tag "decidim_decidim_awesome", media: "all" %>
-<%= render(partial: "layouts/decidim/decidim_awesome/custom_styles") if awesome_scoped_styles.present? %>
-
 <% append_javascript_pack_tag "decidim_decidim_awesome", defer: false %>
 <% append_javascript_pack_tag("decidim_decidim_awesome_custom_fields") if Decidim::DecidimAwesome.enabled?(:proposal_custom_fields) %>

data/app/packs/entrypoints/decidim_admin_decidim_awesome_search_form.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/decidim_awesome/admin/admin_accountability";

data/app/packs/entrypoints/decidim_decidim_awesome_hashcash.js

@@ -0,0 +1,4 @@
+import Hashcash from "src/vendor/hashcash";
+
+Hashcash.setup();
+

data/app/packs/src/decidim/decidim_awesome/admin/auto_edit.js

@@ -14,8 +14,8 @@ document.addEventListener("DOMContentLoaded", () => {
 
       const key = target.dataset.key;
       const attribute = target.dataset.var;
-      const inputField = document.querySelector(`[name="config[${attribute}][${key}]"]`);
-      const multipleField = document.querySelector(`[name="config[${attribute}][${key}][]"]`);
+      const inputFields = document.querySelectorAll(`[name="config[${attribute}][${key}]"]`);
+      const multipleFields = document.querySelectorAll(`[name="config[${attribute}][${key}][]"]`);
       const container = document.querySelector(`.js-box-container[data-key="${key}"]`);
       const deleteBox = container.querySelector(".awesome-auto-delete");
 
@@ -32,11 +32,15 @@ document.addEventListener("DOMContentLoaded", () => {
       const rebuildHtml = (result) => {
         rebuildLabel(result.key, result.scope);
         constraints.outerHTML = result.html;
-        if (inputField) {
-          inputField.setAttribute("name", `config[${attribute}][${result.key}]`);
+        if (inputFields.length > 0) {
+          inputFields.forEach((inputField) => {
+            inputField.setAttribute("name", `config[${attribute}][${result.key}]`);
+          });
         }
-        if (multipleField) {
-          multipleField.setAttribute("name", `config[${attribute}][${result.key}][]`);
+        if (multipleFields.length > 0) {
+          multipleFields.forEach((multipleField) => {
+            multipleField.setAttribute("name", `config[${attribute}][${result.key}][]`);
+          });
         }
         container.dataset.key = result.key;
         container.setAttribute("data-key", result.key);

data/app/packs/src/decidim/decidim_awesome/admin/custom_fields_builder.js

@@ -1,5 +1,6 @@
 import "formBuilder/dist/form-builder.min.js";
 import "src/decidim/decidim_awesome/forms/rich_text_plugin"
+
 // formBuilder uses jquery-ui-sortable which is a very dirty npm package with no neat source code available, and causes problems with the webpacker configuration of Decidim.
 // For the moment, we'll remove the sortable functionality with a dummy jQuery plugin until we find another sortable plugin (or keep it disabled for good)
 jQuery.fn.sortable = () => {}
@@ -10,6 +11,7 @@ $(() => {
   $(".awesome-edit-config .proposal_custom_fields_editor").each((_idx, el) => {
     const key = $(el).closest(".proposal_custom_fields_container").data("key");
     const configVar = $(el).closest(".proposal_custom_fields_container").data("var");
+
     // DOCS: https://formbuilder.online/docs
     window.CustomFieldsBuilders.push({
       el: el,
@@ -17,8 +19,8 @@ $(() => {
       var: configVar,
       config: {
         i18n: {
-          locale: "en-US",
-          location: "https://cdn.jsdelivr.net/npm/formbuilder-languages@1.1.0/"
+          locale: window.DecidimAwesome.currentLocale,
+          location: window.DecidimAwesome.formBuilderLangsLocation
         },
         formData: $(`input[name="config[${configVar}][${key}]"]`).val(),
         disableFields: ["button", "file"],

data/app/packs/src/decidim/decidim_awesome/admin/verifications.js

@@ -17,10 +17,13 @@ document.addEventListener("DOMContentLoaded", () => {
   });
   
   
-  document.body.addEventListener("ajax:complete", (responseText) => {
-    const response = JSON.parse(responseText.detail[0].response)
+  document.body.addEventListener("ajax:error", (responseText) => {
+    container.innerHTML = `<div>${responseText.detail[0]}</div>`;
+  });
+  document.body.addEventListener("ajax:success", (responseText) => {
+    // console.log("ajax:success", responseText);
+    const response = responseText.detail[0];
     const button = document.querySelector(`[data-verification-handler="${response.handler}"][data-verification-user-id="${response.userId}"]`);
-    // console.log("ajax:complete", responseText, "response", response, "button", button);
     container.innerHTML = response.message;
 
     if (response.granted) {

data/app/packs/src/decidim/decidim_awesome/awesome_map/api/proposals_fetcher.js

@@ -58,7 +58,7 @@ export default class ProposalsFetcher extends Fetcher {
 
   decorateNode(node) {
     super.decorateNode(node);
-    node.authorName = node.author && node.author.name || window.DecidimAwesome.texts.officialAuthor;
+    node.authorName = node.author && node.author.name || window.DecidimAwesome.i18n.officialAuthor;
     node.humanState = window.AwesomeMapProposalTexts[node.state];
     switch (node.state) {
     case "accepted":

data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/controller.js

@@ -16,7 +16,7 @@ export default class Controller {
   getLabel() {
     let text = this.component.name;
     if (!text || this.awesomeMap.config.menu.mergeComponents) {
-      text = window.DecidimAwesome.texts[this.component.type];
+      text = window.DecidimAwesome.i18n[this.component.type];
     }
     return `<span class="awesome_map-component" id="awesome_map-component_${this.component.id}" title="0" data-layer="${this.component.type}">${text}</span>`
   }

data/app/packs/src/decidim/decidim_awesome/awesome_map/controllers/proposals_controller.js

@@ -16,7 +16,7 @@ export default class ProposalsController extends Controller {
     // add control layer for amendments if any
     if (this.awesomeMap.config.menu.amendments && this.component.amendments && !this.awesomeMap.layers.amendments) {
       this.awesomeMap.layers.amendments = {
-        label: `<span class="awesome_map-component" id="awesome_map-amendments_${this.component.id}" title="0" data-layer="amendments">${window.DecidimAwesome.texts.amendments}</span>`,
+        label: `<span class="awesome_map-component" id="awesome_map-amendments_${this.component.id}" title="0" data-layer="amendments">${window.DecidimAwesome.i18n.amendments}</span>`,
         group: new L.FeatureGroup.SubGroup(this.awesomeMap.cluster)
       }
       this.awesomeMap.controls.main.addOverlay(this.awesomeMap.layers.amendments.group, this.awesomeMap.layers.amendments.label);

data/app/packs/src/decidim/decidim_awesome/awesome_map/controls_ui.js

@@ -82,8 +82,8 @@ export default class ControlsUI {
   addSearchControls() {
     const section = this.main.getContainer().querySelector(".leaflet-control-layers-list");
     if (section) {
-      section.insertAdjacentHTML("beforeend", `<div id="awesome_map-categories-control" class="active"><b class="awesome_map-title-control">${window.DecidimAwesome.texts.categories}</b><div class="categories-container"></div></div>
-    <div id="awesome_map-hashtags-control"><b class="awesome_map-title-control">${window.DecidimAwesome.texts.hashtags}</b><div class="hashtags-container"></div><a href="#" class="awesome_map-toggle_all_tags">${window.DecidimAwesome.texts.selectDeselectAll}</a></div>`);
+      section.insertAdjacentHTML("beforeend", `<div id="awesome_map-categories-control" class="active"><b class="awesome_map-title-control">${window.DecidimAwesome.i18n.categories}</b><div class="categories-container"></div></div>
+    <div id="awesome_map-hashtags-control"><b class="awesome_map-title-control">${window.DecidimAwesome.i18n.hashtags}</b><div class="hashtags-container"></div><a href="#" class="awesome_map-toggle_all_tags">${window.DecidimAwesome.i18n.selectDeselectAll}</a></div>`);
     } else {
       console.error("Can't find the section to insert the controls");
     }
@@ -158,7 +158,7 @@ export default class ControlsUI {
 
         const label = document.querySelector(`label.awesome_map-hashtag-${hashtag.tag}`);
         // update number of items
-        label.setAttribute("title", `${parseInt(label.title || 0, 10) + 1} ${window.DecidimAwesome.texts.items}`);
+        label.setAttribute("title", `${parseInt(label.title || 0, 10) + 1} ${window.DecidimAwesome.i18n.items}`);
       });
     }
   }
@@ -171,12 +171,12 @@ export default class ControlsUI {
     if (label) {      
       label.style.display = "block";
       // update number of items
-      label.setAttribute("title", `${parseInt(label.title || 0, 10) + 1} ${window.DecidimAwesome.texts.items}`);
+      label.setAttribute("title", `${parseInt(label.title || 0, 10) + 1} ${window.DecidimAwesome.i18n.items}`);
     }
     if (parent) {
       // show parent if apply
       parent.style.display = "block"
-      parent.setAttribute("title", `${parseInt(parent.title || 0, 10) + 1} ${window.DecidimAwesome.texts.items}`);
+      parent.setAttribute("title", `${parseInt(parent.title || 0, 10) + 1} ${window.DecidimAwesome.i18n.items}`);
     }
   }
 
@@ -224,7 +224,7 @@ export default class ControlsUI {
   updateStats(uid, total) {
     // update component stats
     const $component = $(`#awesome_map-${uid}`);
-    $component.attr("title", `${total} ${window.DecidimAwesome.texts.items}`);
+    $component.attr("title", `${total} ${window.DecidimAwesome.i18n.items}`);
   }
 
   _indeterminateParentInput(cat) {

data/app/packs/src/decidim/decidim_awesome/awesome_map/load_map.js

@@ -25,7 +25,7 @@ document.addEventListener("DOMContentLoaded", () => {
   const dataset = document.getElementById("awesome-map").dataset;
   const config = {
     length: parse(dataset.truncate) || 254,
-    center: sanitizeCenter(parse(dataset.mapCenter)),
+    center: sanitizeCenter(dataset.mapCenter),
     zoom: parse(dataset.mapZoom),    
     menu: {
       amendments: parse(dataset.menuAmendments),

data/app/packs/src/decidim/decidim_awesome/forms/autosave.js

@@ -55,12 +55,12 @@ document.addEventListener("DOMContentLoaded", () => {
   };
 
   if (!window.localStorage) {
-    showMsg(window.DecidimAwesome.texts.autosavedError, true);
+    showMsg(window.DecidimAwesome.i18n.autosavedError, true);
     return;
   }
 
   if (window.localStorage.getItem(storeId)) {
-    showMsg(window.DecidimAwesome.texts.autosavedRetrieved, false, 5000);
+    showMsg(window.DecidimAwesome.i18n.autosavedRetrieved, false, 5000);
   }
 
   // restore if available
@@ -85,7 +85,7 @@ document.addEventListener("DOMContentLoaded", () => {
       checkboxes[el.id] = el.checked;
     });
     window.localStorage.setItem(storeCheckboxesId, JSON.stringify(checkboxes));
-    showMsg(window.DecidimAwesome.texts.autosavedSuccess);
+    showMsg(window.DecidimAwesome.i18n.autosavedSuccess);
   };
 
   // save changes when modifications

data/app/packs/src/decidim/decidim_awesome/forms/custom_fields_renderer.js

@@ -2,53 +2,6 @@ import "formBuilder/dist/form-render.min.js";
 import "src/decidim/decidim_awesome/forms/rich_text_plugin"
 
 export default class CustomFieldsRenderer { // eslint-disable-line no-unused-vars
-  constructor() {
-    this.lang = this.getLang(window.DecidimAwesome.currentLocale);
-  }
-
-  getLang(lang) {
-    const langs = {
-      // ar: 'ar-SA', // Not in decidim yet
-      "ar": "ar-TN",
-      "ca": "ca-ES",
-      "cs": "cs-CZ",
-      "da": "da-DK",
-      "de": "de-DE",
-      "el": "el-GR",
-      "en": "en-US",
-      "es": "es-ES",
-      "fa": "fa-IR",
-      "fi": "fi-FI",
-      "fr": "fr-FR",
-      "he": "he-IL",
-      "hu": "hu-HU",
-      "it": "it-IT",
-      "ja": "ja-JP",
-      "my": "my-MM",
-      "nb": "nb-NO",
-      "nl": "nl-NL",
-      "pl": "pl-PL",
-      "pt": "pt-BR",
-      "qz": "qz-MM",
-      "ro": "ro-RO",
-      "ru": "ru-RU",
-      "sl": "sl-SI",
-      "th": "th-TH",
-      "tr": "tr-TR",
-      "uk": "uk-UA",
-      "vi": "vi-VN",
-      "zh-TW": "zh-TW",
-      "zh": "zh-CN"
-    };
-    if (langs[lang]) {
-      return langs[lang];
-    }
-    if (langs[lang.substr(0, 2)]) {
-      return langs[lang.substr(0, 2)];
-    }
-    return "en-US";
-  }
-
   /*
   * Creates an XML document with a subset of html-compatible dl/dd/dt elements
   * to store the custom fields answers
@@ -116,70 +69,6 @@ export default class CustomFieldsRenderer { // eslint-disable-line no-unused-var
     return `<xml>${$dl[0].outerHTML}</xml>`;
   }
 
-  fixBuggyFields() {
-    if (!this.$element) {
-      return false;
-    }
-
-    /**
-    * Hack to fix required checkboxes being reset
-    * Issue: https://github.com/decidim-ice/decidim-module-decidim_awesome/issues/82
-    */
-    this.$element.find(".formbuilder-checkbox-group").each((_key, group) => {
-      const inputs = $(".formbuilder-checkbox input", group);
-      const $label = $(group).find("label");
-      const data = this.spec.find((obj) => obj.type === "checkbox-group" && obj.name === $label.attr("for"));
-      let values = data.userData;
-      if (!inputs.length || !data || !values) {
-        return;
-      }
-
-      inputs.each((_idx, input) => {
-        let index = values.indexOf(input.value);
-        if (index >= 0) {
-          values.splice(index, 1)
-          // setting checked=true do not makes the browser aware that the form is valid if the field is required
-          if (!input.checked)
-          {$(input).click();}
-        } else if (input.checked)
-        {$(input).click();}
-      });
-
-      // Fill "other" option
-      const otherOption = $(".other-option", inputs.parent())[0];
-      const otherVal = $(".other-val", inputs.parent())[0];
-      const otherText = values.join(" ");
-
-      if (otherOption) {
-        if (otherText) {
-          otherOption.checked = true;
-          otherOption.value = otherText;
-          otherVal.value = otherText;
-        } else {
-          otherOption.checked = false;
-          otherOption.value = "";
-          otherVal.value = "";
-        }
-      }
-    });
-
-    /**
-    * Hack to fix required radio buttons "other" value
-    * Issue: https://github.com/decidim-ice/decidim-module-decidim_awesome/issues/133
-    */
-    this.$element.find(".formbuilder-radio input.other-val").on("input", (input) => {
-      const $input = $(input.currentTarget);
-      const $group = $input.closest(".formbuilder-radio-group");
-      $group.find("input").each((_key, radio) => {
-        const name = $(radio).attr("name");
-        if (name && name.endsWith("[]")) {
-          $(radio).attr("name", name.slice(0, -2));
-        }
-      });
-    });
-    return this;
-  }
-
   // Saves xml to the hidden input
   storeData() {
     if (!this.$element) {
@@ -203,7 +92,7 @@ export default class CustomFieldsRenderer { // eslint-disable-line no-unused-var
     // in case of multilang tabs we only render one form due a limitation in the library for handling several instances
     this.instance = $element.formRender({
       i18n: {
-        locale: this.lang,
+        locale: window.DecidimAwesome.currentLocale,
         location: window.DecidimAwesome.formBuilderLangsLocation
       },
       formData: this.spec,
@@ -215,6 +104,5 @@ export default class CustomFieldsRenderer { // eslint-disable-line no-unused-var
         }
       }
     });
-    this.fixBuggyFields();
   }
 }

data/app/packs/src/decidim/decidim_awesome/proposals/images.js

@@ -15,7 +15,7 @@ document.addEventListener("DOMContentLoaded", () => {
 
     const span = document.createElement("span");
     span.className = "input-character-counter__text";
-    span.innerHTML = window.DecidimAwesome.texts.dragAndDropImage;
+    span.innerHTML = window.DecidimAwesome.i18n.dragAndDropImage;
     textarea.parentNode.appendChild(span);
     attach(textarea, {
       uploadUrl: window.DecidimAwesome.editorUploaderPath,