rocket_cms 0.11.5 → 0.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a97ff759324e6fae31050031ba5e19c30df9d597
-  data.tar.gz: 18b02e11213d16fbba0eaa2efee88874eeb79bd9
+  metadata.gz: e2fc8bfe778da8b1d13841783aba1c8484656ef0
+  data.tar.gz: 43d78affecec0f888270ea14bad035ac62834864
 SHA512:
-  metadata.gz: 4fdf4a12de024bdc2470457756957c6e9fca71e04bc4b805f515b9a1257b04061fd88c9e40adffdfd8c7da076cfc506b1ac9eb0998603cf7d7be16f6500060fc
-  data.tar.gz: a0d1093abd7d50ad8611e47c33afa41e8573d554decad106065c651a6caed2d8cc0710644e275e1929fc668cb2a004860274cdabd1758fc18780f4c2edc5c322
+  metadata.gz: fd235011829b66610a997f9e4b4fc4ea3f8bdbdeb7b85c24bd7c0c285e41505ed1cba9e8cb3988d9c3b6bcaedf313ee0ee34081232da6a7a43b17a7527335be7
+  data.tar.gz: 4d1266716f6829cf0cdcec168412e2c3e1f66d36418d8560d9fddc6901ab69269bb8ad6ae0a55f884b255927beb00fdd9292ca9441cca7b991d038dc894f9c09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.11.5)
+    rocket_cms (0.11.7)
       addressable
       coffee-rails
       devise
@@ -72,12 +72,11 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     concurrent-ruby (1.0.1)
-    devise (3.5.6)
+    devise (4.0.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0, < 5.1)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.6.0)

data/app/controllers/concerns/rs_localizeable.rb

@@ -16,7 +16,12 @@ module RsLocalizeable
     if RocketCMS.mongoid?
       pages = pages.where(:"name.#{I18n.locale}".exists => true)
     elsif RocketCMS.active_record?
-      pages = pages.where(["EXIST(name_translations, ?) = TRUE AND name_translations -> ? != ''", I18n.locale, I18n.locale])
+      if defined?(JsonbTranslate)
+        
+        pages = pages.where(["(name_translations -> ?)::text != ''", I18n.locale])
+      elsif defined?(HstoreTranslate)
+        pages = pages.where(["EXIST(name_translations, ?) = TRUE AND name_translations -> ? != ''", I18n.locale, I18n.locale])
+      end
     end
     pages.sorted.to_a
   end

data/app/views/rails_admin/main/_enum_check_boxes.html.haml

@@ -1,2 +1,2 @@
-- values = form.object.class.send(field.method_name).values.map { |v| [t("enumerize.#{form.object.class.name.downcase}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v] }
+- values = form.object.class.send(field.method_name).values.map { |v| [t("enumerize.#{form.object.class.name.underscore}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v] }
 = form.collection_check_boxes field.method_name, values, :last, :first, {}, {} { |i| i.label( class: 'checkbox' ) { i.check_box + i.text } }

data/app/views/rails_admin/main/_enum_radio_buttons.html.haml

@@ -1,2 +1,2 @@
-- values = form.object.class.send(field.method_name).values.map { |v| [t("enumerize.#{form.object.class.name.downcase}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v] }
+- values = form.object.class.send(field.method_name).values.map { |v| [t("enumerize.#{form.object.class.name.underscore}.#{field.method_name}.#{v}", default: t("enumerize.defaults.#{field.method_name}.#{v}")), v] }
 = form.collection_radio_buttons field.method_name, values, :last, :first, {}, {} { |i| i.label(class: 'radio') { i.radio_button + i.text } }

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.11.5"
+  VERSION = "0.11.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.7
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler