decidim-core 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd907f208b0e6119def3e21d5aec1deae3572ba56a42a3b45eabd0388b67e023
-  data.tar.gz: 2dba6d175f38c3b27ae0d844f43138fd6d31e4cb7b70eb21529c0acc5e84ed21
+  metadata.gz: 1c3e8587323b6952275094169097efc2f7824cf8691719a12d6ac8582794a12f
+  data.tar.gz: 5fe501e6457f7293a0fa84a5121068cae1c98dc7c2ba0165afb8710139232ab8
 SHA512:
-  metadata.gz: cf9fa7d9de2f139b2a4dbdd88d1089dc7628210f19339424188d9c70f265a2993b883bcfa2731af706732cb04fe22c2948230d083419c23215c0bf1e40148d91
-  data.tar.gz: 8f9185e4d5e70e7894a7b497ab15d974fa49f88656060b2ba62d588a4e0f4ef891647a091df3e37d3df3521573fce100f8d302a4cf7cc380d0f5c73de0cbffeb
+  metadata.gz: 0cf2cecb09703b533b9b4bc7feef749d769a6f9ac7230ee571962e06ed12ed0afec708dcb9ce3735bf9f9f63b56e13279eab9a52e47eef0f15d1676f95614ab4
+  data.tar.gz: 69ec5b7d9e60f9d04faa71da3211708cb41748ec6e5c41062198824fdacf2dfd15dda176ee7d1fe4ec364237056c45c34c2d354834d2c965040921ae2f14256c

data/db/migrate/20180810092428_move_organization_fields_to_hero_content_block.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MoveOrganizationFieldsToHeroContentBlock < ActiveRecord::Migration[5.2]
-  class Organization < ApplicationRecord
+  class ::Decidim::Organization < ApplicationRecord
     self.table_name = :decidim_organizations
 
     mount_uploader :homepage_image, ::Decidim::HomepageImageUploader
@@ -9,7 +9,7 @@ class MoveOrganizationFieldsToHeroContentBlock < ActiveRecord::Migration[5.2]
 
   def change
     Decidim::ContentBlock.reset_column_information
-    Organization.find_each do |organization|
+    Decidim::Organization.find_each do |organization|
       content_block = Decidim::ContentBlock.find_by(organization: organization, scope: :homepage, manifest_name: :hero)
       settings = {}
       welcome_text = organization.welcome_text || {}

data/lib/decidim/content_renderers/hashtag_renderer.rb

@@ -29,6 +29,16 @@ module Decidim
       end
 
       def render_without_link
+        if content.is_a?(Hash)
+          content.each_with_object({}) do |(locale, string), parsed_content|
+            parsed_content[locale] = replace_hashtag_gid_with_hashtag_name(string)
+          end
+        else
+          replace_hashtag_gid_with_hashtag_name(content)
+        end
+      end
+
+      def replace_hashtag_gid_with_hashtag_name(content)
         content.gsub(GLOBAL_ID_REGEX) do |hashtag_gid|
           begin
             hashtag = GlobalID::Locator.locate(hashtag_gid)

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.15.0"
+      "0.15.1"
     end
   end
 end

data/lib/decidim/form_builder.rb

@@ -44,7 +44,7 @@ module Decidim
         )
       end
 
-      tabs_id = options[:tabs_id] || "#{object_name}-#{name}-tabs"
+      tabs_id = sanitize_tabs_selector(options[:tabs_id] || "#{object_name}-#{name}-tabs")
 
       label_tabs = content_tag(:div, class: "label--tabs") do
         field_label = label_i18n(name, options[:label] || label_for(name))
@@ -57,7 +57,7 @@ module Decidim
                 title = I18n.with_locale(locale) { I18n.t("name", scope: "locale") }
                 element_class = nil
                 element_class = "is-tab-error" if error?(name_with_locale(name, locale))
-                tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
+                tab_content_id = sanitize_tabs_selector "#{tabs_id}-#{name}-panel-#{index}"
                 content_tag(:a, title, href: "##{tab_content_id}", class: element_class)
               end
             end
@@ -72,9 +72,7 @@ module Decidim
           tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
           string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id) do
             if options[:hashtaggable]
-              content_tag(:div, class: "hashtags__container") do
-                send(type, name_with_locale(name, locale), options.merge(label: false))
-              end
+              hashtaggable_text_field(type, name, locale, options)
             else
               send(type, name_with_locale(name, locale), options.merge(label: false))
             end
@@ -85,6 +83,23 @@ module Decidim
       safe_join [label_tabs, tabs_content]
     end
 
+    # Public: Generates a field for hashtaggable type.
+    # type - The form field's type, like `text_area` or `text_input`
+    # name - The name of the field
+    # handlers - The social handlers to be created
+    # options - The set of options to send to the field
+    #
+    # Renders form fields for each locale.
+    def hashtaggable_text_field(type, name, locale, options = {})
+      content_tag(:div, class: "hashtags__container") do
+        if options[:value]
+          send(type, name_with_locale(name, locale), options.merge(label: false, value: options[:value][locale]))
+        else
+          send(type, name_with_locale(name, locale), options.merge(label: false))
+        end
+      end
+    end
+
     # Public: Generates an form field for each social.
     #
     # type - The form field's type, like `text_area` or `text_input`
@@ -94,7 +109,7 @@ module Decidim
     #
     # Renders form fields for each locale.
     def social_field(type, name, handlers, options = {})
-      tabs_id = options[:tabs_id] || "#{object_name}-#{name}-tabs"
+      tabs_id = sanitize_tabs_selector(options[:tabs_id] || "#{object_name}-#{name}-tabs")
 
       label_tabs = content_tag(:div, class: "label--tabs") do
         field_label = label_i18n(name, options[:label] || label_for(name))
@@ -105,7 +120,7 @@ module Decidim
             handlers.each_with_index.inject("".html_safe) do |string, (handler, index)|
               string + content_tag(:li, class: tab_element_class_for("title", index)) do
                 title = I18n.t(".#{handler}", scope: "activemodel.attributes.#{object_name}")
-                tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
+                tab_content_id = sanitize_tabs_selector "#{tabs_id}-#{name}-panel-#{index}"
                 content_tag(:a, title, href: "##{tab_content_id}")
               end
             end
@@ -117,7 +132,7 @@ module Decidim
 
       tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: tabs_id }) do
         handlers.each_with_index.inject("".html_safe) do |string, (handler, index)|
-          tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
+          tab_content_id = sanitize_tabs_selector "#{tabs_id}-#{name}-panel-#{index}"
           string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id) do
             send(type, "#{handler}_handler", options.merge(label: false))
           end
@@ -606,5 +621,9 @@ module Decidim
     def ruby_format_to_datepicker(ruby_date_format)
       ruby_date_format.gsub("%d", "dd").gsub("%m", "mm").gsub("%Y", "yyyy").gsub("%H", "hh").gsub("%M", "ii")
     end
+
+    def sanitize_tabs_selector(id)
+      id.tr("[", "-").tr("]", "-")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -456,6 +456,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: rack-attack
   requirement: !ruby/object:Gem::Requirement
@@ -676,28 +690,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.15.1
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com