camaleon_cms 2.4.5.14 → 2.4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0ebfaaa321010561d4583a38122cb11c97e98aec6b88d302e697c360485bcb
-  data.tar.gz: e820315d99ea44d5ea52bdb85a07eeeaf224da7cce8e4d350ba8b09120401a50
+  metadata.gz: edf7d17c2ecab36f403abf53b59be1137d30ba0c43f5a42e7be0f1c2daa72107
+  data.tar.gz: 4657f09eda8fad47aa818b5ce2f280b38cd8af275b422d0e1f24b2c022dfb694
 SHA512:
-  metadata.gz: 11eab3a425b657bd240e2cdfa6497257d190dd3fe424c93341b490fab2a8d837afe8fa2ee9f2de4386044e8ef9c66acd2e8a353bce5e94b6eabd92b7bd89e845
-  data.tar.gz: 948f09e2d26e83ef2defb827fb200bda1d284714c56ff6e21c5ac77660b31a3a953252fed523ec7db6aadbb5ac657541b45f1af3c32fcc5d7cae502660ebdea4
+  metadata.gz: 90daa373bc76c095d1a000860e9107cb5d093283d8395af7af567564b9d1687f6ee6460837a5253946db5eba35b1648012305eaee19ff4698f7cadfaa7d2b536
+  data.tar.gz: 7afd87501344e6c1d27f9d715b6ad10daa53047d60f000b98cec9e389581a2000e73f6c0ed422e8fb6742bd5a40d3bd4949797f1b1bfa91a4485cc1995849d11

data/app/controllers/camaleon_cms/admin_controller.rb

@@ -43,15 +43,15 @@ class CamaleonCms::AdminController < CamaleonCms::CamaleonController
     add_breadcrumb I18n.t("camaleon_cms.admin.button.search")
     params[:kind] = "content" unless params[:kind].present?
     params[:q] = (params[:q] || '').downcase
-    case params[:kind]
+    @items = case params[:kind]
       when "post_type"
-        @items = current_site.post_types.where("LOWER(#{Cama::PostType.table_name}.name) LIKE ? OR LOWER(#{Cama::PostType.table_name}.slug) LIKE ? OR LOWER(#{Cama::PostType.table_name}.description) LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%")
+        current_site.post_types.where("LOWER(#{Cama::PostType.table_name}.name) LIKE ? OR LOWER(#{Cama::PostType.table_name}.slug) LIKE ? OR LOWER(#{Cama::PostType.table_name}.description) LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%")
       when "category"
-        @items = current_site.full_categories.where("LOWER(#{Cama::Category.table_name}.name) LIKE ? OR LOWER(#{Cama::Category.table_name}.slug) LIKE ? OR LOWER(#{Cama::Category.table_name}.description) LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%")
+        current_site.full_categories.where("LOWER(#{Cama::Category.table_name}.name) LIKE ? OR LOWER(#{Cama::Category.table_name}.slug) LIKE ? OR LOWER(#{Cama::Category.table_name}.description) LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%")
       when "tag"
-        @items = current_site.post_tags.where("LOWER(#{Cama::PostTag.table_name}.name) LIKE ? OR LOWER(#{Cama::PostTag.table_name}.slug) LIKE ? OR LOWER(#{Cama::PostTag.table_name}.description) LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%")
+        current_site.post_tags.where("LOWER(#{Cama::PostTag.table_name}.name) LIKE ? OR LOWER(#{Cama::PostTag.table_name}.slug) LIKE ? OR LOWER(#{Cama::PostTag.table_name}.description) LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%")
       else
-        @items = current_site.posts.where("LOWER(#{Cama::Post.table_name}.title) LIKE ? OR LOWER(#{Cama::Post.table_name}.slug) LIKE ? OR LOWER(#{Cama::Post.table_name}.content_filtered) LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%")
+        current_site.posts.where("LOWER(#{Cama::Post.table_name}.title) LIKE ? OR LOWER(#{Cama::Post.table_name}.slug) LIKE ? OR LOWER(#{Cama::Post.table_name}.content_filtered) LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%")
     end
     @items = @items.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
   end

data/app/models/camaleon_cms/post.rb

@@ -6,8 +6,7 @@ class CamaleonCms::PostUniqValidator < ActiveModel::Validator
       if ptype.present? # only for posts that belongs to a post type model
         posts = ptype.site.posts
                     .where("(#{slug_array.map {|s| "#{CamaleonCms::Post.table_name}.slug LIKE '%-->#{s}<!--%'"}.join(" OR ")} ) OR #{CamaleonCms::Post.table_name}.slug = ?",  record.slug)
-                    .where("#{CamaleonCms::Post.table_name}.status != 'draft' AND #{CamaleonCms::Post.table_name}.status != 'draft_child'")
-                    .where.not(id: record.id)
+                    .where.not(id: record.id, status: [:draft, :draft_child, :trash])
         if posts.size > 0
           if slug_array.size > 1
             record.errors[:base] << "#{I18n.t('camaleon_cms.admin.post.message.requires_different_slug')}: #{posts.pluck(:slug).map{|slug| record.slug.to_s.translations.map{|lng, r_slug| "#{r_slug} (#{lng})" if slug.translations_array.include?(r_slug) }.join(",") }.join(",").split(",").uniq.clean_empty.join(", ")} "

data/lib/camaleon_cms/engine.rb

@@ -27,7 +27,7 @@ module CamaleonCms
       g.test_framework :rspec
     end
     config.before_initialize do |app|
-      app.config.active_record.belongs_to_required_by_default = false if PluginRoutes.isRails5?
+      app.config.active_record.belongs_to_required_by_default = false if PluginRoutes.isRails5? || PluginRoutes.isRails6?
       if app.respond_to?(:console)
         app.console do
           # puts "******** Camaleon CMS: ********"

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.5.14'
+  VERSION = '2.4.6.0'
 end

data/lib/plugin_routes.rb

@@ -105,11 +105,16 @@ class PluginRoutes
     def isRails5?
       Rails.version.to_s[0].to_i == 5
     end
+
+    def isRails6?
+      Rails.version.to_s[0].to_i == 6
+    end
+
     # convert action parameter into hash
     def fixActionParameter(h)
       (h.is_a?(ActionController::Parameters) ? (h.permit!.to_h rescue h.to_hash) : h)
     end
-    
+
     # add a new anonymous hook
     # sample: PluginRoutes.add_anonymous_hook('before_admin', lambda{|params| puts params })
     # @param hook_key [String], key of hook
@@ -127,7 +132,7 @@ class PluginRoutes
     def get_anonymous_hooks(hook_key)
       (@@anonymous_hooks[hook_key.to_s] || []).map{|item| item[:callback] }
     end
-    
+
     # return all registered anonymous hooks for hook_key
     # @param hook_key [String] name of the hook
     # @param hook_id [String] identifier of the anonymous hooks
@@ -135,7 +140,7 @@ class PluginRoutes
     def remove_anonymous_hook(hook_key, hook_id)
       (@@anonymous_hooks[hook_key.to_s] || []).delete_if{|item| item[:id] == hook_id }
     end
-    
+
     # return the class name for user model
     def get_user_class_name
       static_system_info['user_model'].presence || 'CamaleonCms::User'
@@ -394,12 +399,12 @@ class PluginRoutes
   rescue
     Gem.available?(name)
   end
-  
+
   # return the default url options for Camaleon CMS
   def self.default_url_options
     {host: (CamaleonCms::Site.main_site.slug rescue "")}
   end
-  
+
   def self.migration_class
     isRails4? ? ActiveRecord::Migration : ActiveRecord::Migration[4.2]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.5.14
+  version: 2.4.6.0
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2019-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -28,16 +28,22 @@ dependencies:
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: draper
   requirement: !ruby/object:Gem::Requirement
@@ -196,16 +202,16 @@ dependencies:
   name: cama_contact_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.28
 - !ruby/object:Gem::Dependency
   name: cama_meta_tag
   requirement: !ruby/object:Gem::Requirement