decidim-core 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e779623f418954e17c49bbbe1aed14d42299398e
-  data.tar.gz: e8e12710f5181dc29d7b8fa72e665eb1ece8eb90
+  metadata.gz: a44a608e2104f1c2957a934c2940245631472e7b
+  data.tar.gz: f55a0b7a343b75d25b86748edb2e609fa5fa5dd5
 SHA512:
-  metadata.gz: 5be5179eeed80a0941a93b1fdb1c3e18c0a3f688d4876be4abf0fd7bbeb013b212cdbb784bce864ba40c34e829cdd090dd768f90a5442564a1cf4162d7b84228
-  data.tar.gz: bf4373a5f5e9be5ceb6ee9edb388293d515891de27ffd1aff0dc66097b418f76ab17dda44edd364c57935e90c6fc0a36b2ccadeb23ebe0f7060a233b0ea6d4ac
+  metadata.gz: 7b91649a0423ac242042cc8b9c6e48c15a79ba1fb4314938a5534e51fd0c835ffc0eed7cee2d52332adafe9961d257241f168ce6f5a20f493d3ddd8362c63c49
+  data.tar.gz: 3d28ef9ad8d03ba09921d9cacd07c1375d010478200d816ed3422545b10577148085cfa6c6d0d9d8fadaa1a88d6dd447ded49a89b4aaabf92f830f96bc28def6

data/app/controllers/decidim/widgets_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     skip_authorization_check only: :show
     skip_before_action :verify_authenticity_token
     after_action :allow_iframe, only: :show
+    helper ResourceHelper
 
     layout "decidim/widget"
 

data/app/helpers/decidim/decidim_form_helper.rb

@@ -83,8 +83,10 @@ module Decidim
             locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
               string + content_tag(:li, class: tab_element_class_for("title", index)) do
                 title = I18n.with_locale(locale) { I18n.t("name", scope: "locale") }
+                element_class = nil
+                element_class = "is-tab-error" if form_field_has_error?(options[:object], name_with_locale(name, locale))
                 tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
-                content_tag(:a, title, href: "##{tab_content_id}")
+                content_tag(:a, title, href: "##{tab_content_id}", class: element_class)
               end
             end
           end
@@ -116,5 +118,9 @@ module Decidim
     def name_with_locale(name, locale)
       "#{name}_#{locale.to_s.gsub("-", "__")}"
     end
+
+    def form_field_has_error?(object, attribute)
+      object.respond_to?(:errors) && object.errors[attribute].present?
+    end
   end
 end

data/app/presenters/decidim/resource_locator_presenter.rb

@@ -7,6 +7,8 @@ module Decidim
       @resource = resource
     end
 
+    attr_reader :resource
+
     # Builds the path to the resource. Useful when linking to a resource from
     # another engine.
     #
@@ -24,7 +26,7 @@ module Decidim
     #
     # Returns a String.
     def url(options = {})
-      member_route("url", options.merge(host: @resource.organization.host))
+      member_route("url", options.merge(host: resource.organization.host))
     end
 
     # Builds the index path to the associated collection of resources.
@@ -42,7 +44,7 @@ module Decidim
     #
     # Returns a String.
     def member_route(route_type, options)
-      route_proxy.send("#{member_route_name}_#{route_type}", @resource, options)
+      route_proxy.send("#{member_route_name}_#{route_type}", resource, options)
     end
 
     # Private: Build the route to the associated collection of resources.
@@ -53,11 +55,12 @@ module Decidim
     end
 
     def manifest
-      @resource.class.resource_manifest
+      resource.class.try(:resource_manifest) ||
+        resource.class.try(:participatory_space_manifest)
     end
 
     def feature
-      @resource.feature
+      resource.feature if resource.respond_to?(:feature)
     end
 
     def member_route_name
@@ -69,7 +72,7 @@ module Decidim
     end
 
     def route_proxy
-      @route_proxy ||= EngineRouter.main_proxy(feature)
+      @route_proxy ||= EngineRouter.main_proxy(feature || resource)
     end
   end
 end

data/app/services/decidim/resource_search.rb

@@ -39,7 +39,11 @@ module Decidim
     # `"global"` as parameter, and in the method we do the needed changes to search
     # properly.
     def search_scope_id
-      clean_scope_ids = [scope_id].flatten
+      clean_scope_ids = if scope_id.is_a?(Hash)
+                          scope_id.values
+                        else
+                          [scope_id].flatten
+                        end
 
       conditions = []
       conditions << "decidim_scope_id IS NULL" if clean_scope_ids.delete("global")

data/app/views/layouts/decidim/widget.html.erb

@@ -13,7 +13,7 @@
       <%= content_for(:header) %>
     <% else %>
       <div class="participatory-process">
-        <%= link_to translated_attribute(current_participatory_space.title), polymorphic_path(current_participatory_space), target: "_blank" %>
+        <%= link_to translated_attribute(current_participatory_space.title), resource_locator(current_participatory_space).path, target: "_blank" %>
       </div>
     <% end %>
     <div class="row collapse">

data/lib/decidim/core/version.rb

@@ -3,7 +3,7 @@
 # This holds Decidim's version and the Rails version on which it depends.
 module Decidim
   def self.version
-    "0.6.4"
+    "0.6.5"
   end
 
   def self.rails_version

data/lib/decidim/form_builder.rb

@@ -142,6 +142,7 @@ module Decidim
     def scopes_select(name, options = {})
       selected = object.send(name)
       if selected.present?
+        selected = selected.values if selected.is_a?(Hash)
         selected = [selected] unless selected.is_a?(Array)
         scopes = Decidim::Scope.where(id: selected.map(&:to_i)).map { |scope| [scope.name[I18n.locale.to_s], scope.id] }
       else

data/lib/decidim/participatory_space_manifest.rb

@@ -17,6 +17,13 @@ module Decidim
 
     attribute :name, Symbol
 
+    # The ActiveRecord class name of the model we're exposing
+    attribute :model_class_name, String
+
+    # The name of the named Rails route to create the url to the resource.
+    # When not explicitly set, it will use the model name.
+    attribute :route_name, String
+
     # A String with the feature's icon. The icon must be stored in the
     # engine's assets path.
     attribute :icon, String
@@ -36,5 +43,12 @@ module Decidim
     def seed!
       @seeds&.call
     end
+
+    # The name of the named Rails route to create the url to the resource.
+    #
+    # Returns a String.
+    def route_name
+      super || model_class_name.demodulize.underscore
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -466,84 +466,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.5
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com