media.rb in camaleon_cms-2.4.5.9

- old
+ new

@@ -1,10 +1,10 @@
 class CamaleonCms::Media < ActiveRecord::Base
   self.table_name = "#{PluginRoutes.static_system_info['db_prefix']}media"
   belongs_to :site, class_name: 'CamaleonCms::Site'
   validates :name, uniqueness: {
-    scope: [:site_id, :is_folder, :folder_path],
+    scope: [:site_id, :is_folder, :folder_path, :is_public],
     message: 'Duplicates not allowed'
   }
   scope :only_folder, ->{ where(is_folder: true) }
   scope :only_file, ->{ where(is_folder: false) }
   default_scope { order(is_folder: :asc, name: :asc) }
@@ -16,27 +16,27 @@
       where(folder_path: folder)
     else
       where('name like ?', "%#{search_expression}%")
     end
   end
-  
+
   # search file or folder by key
   def self.find_by_key(key)
     key = key.cama_fix_media_key
     if key == '/'
       where(folder_path: File.dirname(key))
     else
       where(folder_path: File.dirname(key), name: File.basename(key))
     end
   end
-  
+
   # return all items of current folder
   def items
     coll = is_public ? site.public_media : site.private_media
     coll.where(folder_path: "#{folder_path}/#{name}".cama_fix_media_key)
   end
-  
+
   private
   # recover folder or file format
   def create_parent_folders
     coll = is_public ? site.public_media : site.private_media
     _p = []
@@ -44,10 +44,10 @@
       _path = ('/'+_p.join('/')).cama_fix_media_key
       coll.only_folder.where(name: f_name, folder_path: _path).first_or_create() if "#{_path}/#{f_name}".cama_fix_media_key != '/'
       _p.push(f_name)
     end
   end
-  
+
   # return all children items
   def delete_folder_items
     items.destroy_all if is_folder
   end
 end