enjoy_cms 0.3.7.1 → 0.3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edb1ca4cc4a6285dc5cec5cdf79c7616d24c9f62
-  data.tar.gz: 3fccd7d654da9a4f4673cb3ea69b48a9e9827c10
+  metadata.gz: 5f1cb1feaa0b839df0a8128985310e1c4c38a356
+  data.tar.gz: e8bb0a7c98be9e948611b92cd705fd12a2e3b4cd
 SHA512:
-  metadata.gz: 43484a9b08f3bd5135d1961eca438da61f00957b09793d16084d624b88d123a86c5ca26660574843249813c371b8771a7f4b9d9559721a194315a89b16b6ee02
-  data.tar.gz: 0bcf54b781a1a2c4914ad6a725c0806197063977ea4e1cefa86e4a641e9ff3543c15ef522733e831c6a27bbfbed712a66de6c604d2e3cad158b18177e702566d
+  metadata.gz: 74e9903e8f49ce914c5aed3e9a4df33af7af34b9b90086f9ca65acfc6bebe50913aefefa4f8420fb33302d1306bee6db4ce8ec46b69e511a4ce5890cd01bad6c
+  data.tar.gz: 1f4aee3b89eea66ddc74656bdc12c624d2168a97028f81cbb4549ff6aaabfd128867c5fcfffde7f2823c30129d47c90367f51b6f581c58269dab1d7e9626d0f2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.7.1)
+    enjoy_cms (0.3.7.2)
       ack_rails_admin_jcrop
       addressable
       ckeditor

data/app/controllers/concerns/enjoy/localizeable.rb

@@ -39,7 +39,7 @@ module Enjoy::Localizeable
       _url = item.redirect.blank? ? item.fullpath : item.redirect
     end
     _localizable_regexp = Regexp.new("^(#{I18n.available_locales.map { |l| "\\/#{l}"}.join("|")})")
-    ((params[:locale].blank? or _url != _localizable_regexp) ? "" : "/#{params[:locale]}") + _url
+    ((params[:locale].blank? or _url =~ _localizable_regexp) ? "" : "/#{params[:locale]}") + _url
   end
   def find_seo_extra(path)
     _localizable_regexp = Regexp.new("^(#{I18n.available_locales.map { |l| "\\/#{l}"}.join("|")})")

data/app/controllers/concerns/enjoy/nav_menu.rb

@@ -56,7 +56,8 @@ module Enjoy::NavMenu
     if _connectable and _connectable.enabled
       begin
         _routes_namespace = _connectable.respond_to?(:routes_namespace) ? _connectable.routes_namespace : :main_app
-        send(_routes_namespace.to_sym).url_for([_connectable, {only_path: true}])
+        _url = send(_routes_namespace.to_sym).url_for([_connectable, {only_path: true}])
+        _url
       rescue Exception => exception
         Rails.logger.error exception.message
         Rails.logger.error exception.backtrace.join("\n")

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.7.1"
+  VERSION = "0.3.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.7.1
+  version: 0.3.7.2
 platform: ruby
 authors:
 - Alexander Kiseliev