drg_cms 0.5.52.16 → 0.6.0.1

data/app/models/drgcms_form_fields/tree_select.rb

@@ -47,6 +47,8 @@ module DrgcmsFormFields
 #      name: categories
 #      type: tree_select
 #      eval: 'Categories.all_categories'
+#      multiple: true
+#      select_parent: false
 #      html:
 #        size: 50x10
 ###########################################################################
@@ -60,15 +62,21 @@ def make_tree(parent)
   @html << '<ul>'
   choices = if @choices[parent.to_s].first[3] != 0
     @choices[parent.to_s].sort_by {|e| e[3].to_i } # sort by order if first is not 0
-#    @choices[parent.to_s].sort_alphabetical_by(&:first) # use UTF-8 sort
   else  
     @choices[parent.to_s].sort_alphabetical_by(&:first) # use UTF-8 sort
   end
   choices.each do |choice|
-    jstree = %Q[{"selected" : #{choice.last ? 'true' : 'false'} }]
-# data-jstree must be singe quoted
-    @html << %Q[<li data-id="#{choice[1]}" data-jstree='#{jstree}'>#{choice.first}\n]
-# call recursively for children     
+    data = [ %Q["selected" : #{choice.last ? 'true' : 'false'} ] ]
+    # only for parent objects
+    if @choices[ choice[1].to_s ]
+    # parent is not selectable
+      data << '"disabled" : true' unless @parent.dc_dont?(@yaml['parent_disabled'], true)
+    # parents are opened on start
+      data << '"opened" : true' unless @parent.dc_dont?(@yaml['parent_opened'], true)
+    end
+    # data-jstree must be singe quoted
+    @html << %Q[<li data-id="#{choice[1]}" data-jstree='{#{data.join(' , ')}}'>#{choice.first}\n]
+    # call recursively for children     
     make_tree(choice[1]) if @choices[ choice[1].to_s ]
     @html << "</li>"
   end
@@ -101,7 +109,7 @@ def render
     end
   end
   make_tree(nil)
-  @html << '</ul></div>'
+  @html << '</div>'
 # add hidden communication field  
   @html << @parent.hidden_field(record, @yaml['name'], value: current.join(','))
 # save multiple indicator for data processing on return

data/config/locales/drgcms_en.yml

@@ -69,6 +69,7 @@ en:
     filter: Filter
     refresh: Refresh
     back: Back
+    close: Close
     delete: Delete
     enable: Enable
     disable: Disable

data/config/locales/drgcms_sl.yml

@@ -69,6 +69,7 @@ sl:
     filter: Filter
     refresh: Osveži
     back: Nazaj
+    close: Zapri
     delete: Izbris
     enable: Omogoči
     disable: Onemogoči

data/config/locales/models_en.yml

@@ -150,7 +150,7 @@ en:
         name: Name
         text: Caption
         type: Type
-        Size: Size
+        size: Size
         mandatory: Mandatory
         separator: Separator
         options: Options

data/config/locales/models_sl.yml

@@ -153,12 +153,12 @@ sl:
         name: Naziv
         text: Napis
         type: Vrsta
-        Size: Velikost
+        size: Velikost
         mandatory: Obvezen
         separator: Ločilo
         options: Opcije
         order: Zaporedje
-        active: Active
+        active: Aktivna
 
       dc_policy:
         tabletitle: Politike za dostop

data/drg_cms.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md", "History.log", "drg_cms.gemspec"]
   s.test_files = Dir["test/**/*"]
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.5'
 
-  s.add_dependency 'rails', '>= 5'
+  s.add_dependency 'rails', '~> 6'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
   s.add_dependency 'non-stupid-digest-assets'  
 
   s.add_dependency 'bcrypt' #, '~> 3.0.0'
-  s.add_dependency 'mongoid'#, '~> 5'
+  s.add_dependency 'mongoid', '~> 7.0.5'
 
   s.add_dependency 'kaminari-mongoid'
   s.add_dependency 'kaminari-actionview'

data/lib/drg_cms.rb

@@ -145,3 +145,5 @@ def self.routes
 end
 
 end
+
+DrgCms.add_patches_path(File.dirname(__FILE__) + '../app/models/drgcms_form_fields/patches')

data/lib/drg_cms/version.rb

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
+# drg_cms gem version
 module DrgCms #:nodoc:
-  # drg_cms gem version
-  VERSION = '0.5.52.16'
+  VERSION = '0.6.0.1'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.52.16
+  version: 0.6.0.1
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.5
 - !ruby/object:Gem::Dependency
   name: kaminari-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -312,10 +312,9 @@ files:
 - app/models/drgcms_form_fields/comment.rb
 - app/models/drgcms_form_fields/date_picker.rb
 - app/models/drgcms_form_fields/date_select.rb
-- app/models/drgcms_form_fields/date_time_picker.rb
+- app/models/drgcms_form_fields/datetime_picker.rb
 - app/models/drgcms_form_fields/datetime_select.rb
 - app/models/drgcms_form_fields/drgcms_field.rb
-- app/models/drgcms_form_fields/drgcms_form_fields.rb
 - app/models/drgcms_form_fields/embedded.rb
 - app/models/drgcms_form_fields/file_select.rb
 - app/models/drgcms_form_fields/hidden_field.rb
@@ -418,7 +417,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/app/models/drgcms_form_fields/drgcms_form_fields.rb

@@ -1,25 +0,0 @@
-#--
-# Copyright (c) 2012+ Damjan Rems
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-module DrgcmsFormFields
-end