coalla-cms 0.6.0.9 → 0.7.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDE4OTZlZWE2NzIwZjEzZTY1MmVkYjU2MjIxMjdjZTUxNjIzZmY2Yg==
+    NWRkOWY2ZWVmOTdmNGJkZTkwMmJkZTEyNTYzZjQ2MDhkM2Y1MjQzMA==
   data.tar.gz: !binary |-
-    YTMzYjQyOTE2NGUzMjEzZTVkNzQ3YTI4N2M4NWZlYmRlYmY3ZTIyMg==
+    ZTUxMDliMmJhZTVlMmJiZDcwNzRmOGE2Y2Y4NjMyZWNiMmRmNjY0Yg==
 SHA512:
   metadata.gz: !binary |-
-    MzAxNmMwNDM2ZGVmYzk4NmViYTY0YTNkZWZiNjU4NWFhZjY3Y2E1NmZkNmY0
-    ZmM0NzBkM2JhNzY0NzAzMGJjNzRkNTU3NzU2ZmFiYzFjODQzNjQ2YjMyZGE2
-    YmRlMTAzOTk0ZTBkMjgyMThkNWY2MDgzMjYwNjRmZGU1OTkxZGE=
+    Yjk4YzEzNzFkZjYxMDkwNWRiMWMzMWFlOWI1ZDY3OWFlNjRmNjdhZTNmMGRh
+    NDMzMmI3ZTMzYTlhNDdkOWUyNmRjMjI5ZjMxMWMyMjVlZDExNmE1MzAyOTU4
+    N2I4NjJiZThkYWMzYzI2Y2U1NmIzMzg4MzgxNTNlYmZhNzM0ZDM=
   data.tar.gz: !binary |-
-    MTBlM2UzNDNjODY1YjMwZTMwZWJmYTZhMjE3MDQ4MGM1ZWU3NGU4N2M3MzBi
-    MjYxZjQ4ZGM5MWU5Yzg5MDU4ZjE5MTA1MThiYjgyZDQzYzlhMzlkYzY4YWQ3
-    YTk1NjY2Mjg4NzE1MDY4OGQzY2U2YjA3OWMwMGE5MDFjOWJiMmE=
+    OTk3NzU4YzU4NDllYzJmNTA1ODMyYjI3NTU5MzM1YmY2YThhNzdiODY4ZTRh
+    ZDY4OGZiMTUyZjY2YWEwMGVlM2Q4ZDExNTQyODU2OTIyMDAzNWJhYjA0MDc3
+    ZTYxN2RkN2YzMjAzYjFmYjg0OWUyYzMxMGUwOGVlMmUxMTkzODI=

data/app/assets/javascripts/admin/admin.js

@@ -287,7 +287,7 @@ $(function () {
         return false
     });
 
-    $('[data-sortable-blocks]').sortable({
+    $('[data-sortable-blocks="true"]').sortable({
         items: '.fields_container',
         cancel: 'input,textarea,button,select,option,a',
         stop: function (e, ui) {

data/coalla-cms.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'rails', '~> 5.0'
+  s.add_dependency 'rails', '~> 6.0'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'listen'
   s.add_dependency 'jquery-ui-rails'
@@ -35,7 +35,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'rmagick'
   s.add_dependency 'will_paginate'
   s.add_dependency 'standalone_typograf', '~> 3.0.2'
-  s.add_dependency 'meta-tags', '~> 2.4.0'
+  s.add_dependency 'meta-tags', '~> 2.13'
 
-  s.required_ruby_version = '>= 2.0.0'
+
+  s.required_ruby_version = '>= 2.3'
 end

data/lib/coalla/builders/form_builder.rb

@@ -102,7 +102,7 @@ module Coalla
     end
 
     def combobox(method, choices, options = {}, html_options = {})
-      row method, select(method, choices, options, with_default_options(html_options)), div_class: options.delete(:div_class) || 'col-md-6'
+      row method, select(method, choices, options, with_default_options(html_options)), options
     end
 
     def enum(method, options = {}, html_options = {})

data/lib/coalla/cms/version.rb

@@ -1,5 +1,5 @@
 module Coalla
   module Cms
-    VERSION = '0.6.0.9'
+    VERSION = '0.7.0.0'
   end
 end

data/lib/coalla/orm/multi_field.rb

@@ -2,12 +2,12 @@ module Coalla
   module MultiField
     def multi_field(relation_name, options = {})
       through_collection_name = options[:through_collection_name] || "#{self.model_name.singular}_#{relation_name}".to_sym
-      reflection = self.reflections[through_collection_name] || self.reflections[through_collection_name.to_s]
+      reflection = reflections[through_collection_name] || reflections[through_collection_name.to_s]
       through_class = reflection.klass
 
       self_foreign_key_method = options.fetch(:self_foreign_key_method, reflection.foreign_key.gsub('_id', ''))
 
-      reflection = self.reflections[relation_name] || self.reflections[relation_name.to_s]
+      reflection = reflections[relation_name] || reflections[relation_name.to_s]
       association_model_name = reflection.source_reflection_name.to_sym
       association_foreign_key = reflection.foreign_key
 
@@ -20,13 +20,19 @@ module Coalla
           item.position = position
           item
         end
-        self.send("#{through_collection_name}=", new_through_collection)
+        send("#{through_collection_name}=", new_through_collection)
       end
 
       define_method "#{relation_name}_json" do |search_field|
-        send(through_collection_name).map { |c| {id: c.send(association_model_name).id, name: c.send(association_model_name).send(search_field)} }
+        association_model = association_model_name.to_s.classify.constantize
+        send(through_collection_name).map do |c|
+          item = association_model.find(c.send(association_foreign_key))
+          {
+            id: item.id,
+            name: item.send(search_field)
+          }
+        end
       end
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coalla-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.0.9
+  version: 0.7.0.0
 platform: ruby
 authors:
 - coalla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.13'
 description: Coalla CMS gem
 email:
 - dev@coalla.ru
@@ -555,7 +555,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='