camaleon_cms 2.1.1 → 2.1.1.4

data/app/helpers/camaleon_cms/frontend/seo_helper.rb

@@ -43,11 +43,13 @@ module CamaleonCms::Frontend::SeoHelper
   # create seo attributes with options + default attributes
   def cama_build_seo(options = {})
     options[:image] = current_site.get_option("screenshot", current_site.the_logo) unless options[:image].present?
-    options[:title] = I18n.transliterate(options[:title].present? ? options[:title] : current_site.the_title)
-    options[:description] = I18n.transliterate(options[:description].present? ? options[:description].to_s : current_site.the_option("seo_description"))
+    options[:title] = current_site.the_title unless options[:title].present?
+    options[:description] = current_site.the_option("seo_description") unless options[:description].present?
     options[:url] = request.original_url
+    options[:keywords] = current_site.the_option("keywords") unless options[:keywords].present?
+
     s = {
-      keywords: I18n.transliterate(options[:keywords].present? ? options[:keywords] : current_site.the_option("keywords")),
+      keywords: options[:keywords],
       author: current_site.get_option('seo_author'),
       icon: current_site.the_icon,
       og: {

data/app/helpers/camaleon_cms/html_helper.rb

@@ -119,8 +119,8 @@ module CamaleonCms::HtmlHelper
     return @_cama_assets_libraries if @_cama_assets_libraries.present?
     libs = {}
     libs[:colorpicker] = {js: ['camaleon_cms/admin/bootstrap-colorpicker'], css: ["camaleon_cms/admin/colorpicker.css"]}
-    libs[:datepicker] = {js: ['camaleon_cms/admin/bootstrap-datepicker']}
-    libs[:datetimepicker] = {js: ['camaleon_cms/admin/bootstrap-datetimepicker.min']}
+    libs[:datepicker] = {js: []}
+    libs[:datetimepicker] = {js: [], css: []}
     libs[:tinymce] = {js: ['camaleon_cms/admin/tinymce/tinymce.min', "camaleon_cms/admin/tinymce/plugins/filemanager/plugin.min"], css: ["camaleon_cms/admin/tinymce/skins/lightgray/content.min"]}
     libs[:form_builder] = {css:['camaleon_cms/admin/form-builder/formbuilder'],js: ['camaleon_cms/admin/form-builder/vendor', 'camaleon_cms/admin/form-builder/formbuilder' ]}
     libs[:form_ajax] = {js: ['camaleon_cms/admin/form/jquery.form']}

data/app/helpers/camaleon_cms/site_helper.rb

@@ -15,25 +15,21 @@ module CamaleonCms::SiteHelper
     if PluginRoutes.get_sites.size == 1
       site = CamaleonCms::Site.first.decorate
     else
-      host = request.original_url.to_s.parse_domain
-      if host == PluginRoutes.system_info["base_domain"]
-        site = CamaleonCms::Site.first.decorate rescue nil
-      else
-        s = [host]
-        s << request.subdomain if request.subdomain.present?
-        site = CamaleonCms::Site.where(slug: s).first.decorate rescue nil
-      end
+      host = [request.original_url.to_s.parse_domain]
+      host << request.subdomain if request.subdomain.present?
+      site = CamaleonCms::Site.where(slug: host).first.decorate rescue nil
     end
-    puts "============================ Please define the $current_site = CamaleonCms::Site.first.decorate " unless site.present?
-    @current_site = site
+    r = {site: site, request: request};
+    cama_current_site_helper(r) rescue nil
+    puts "============================ Please define the $current_site = CamaleonCms::Site.first.decorate " unless r[:site].present?
+    @current_site = r[:site]
   end
 
   # check if current site exist, if not, this will be redirected to main domain
   def cama_site_check_existence()
     if !current_site.present?
-      if (PluginRoutes.main_site).present?
-        base_domain = PluginRoutes.system_info["base_domain"]
-        redirect_to cama_root_url(host: base_domain.split(":").first, port: (base_domain.split(":")[1] rescue nil))
+      if Cama::Site.main_site.present?
+        redirect_to Cama::Site.main_site.decorate.the_url
       else
         redirect_to cama_admin_installers_path
       end
@@ -113,7 +109,7 @@ module CamaleonCms::SiteHelper
   # load all custom models customized by plugins or templates in custom_models.rb
   def site_load_custom_models(site)
     PluginRoutes.enabled_apps(site).each{ |app|
-      next unless app["path"].present?
+      next if !app.present? || !app["path"].present?
       s = File.join(app["path"], "config", "custom_models.rb")
       eval(File.read(s)) if File.exist?(s)
     }

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -13,6 +13,7 @@ module CamaleonCms::UploaderHelper
   #     sample: temporal => will save in /rails_path/public/temporal
   #   generate_thumb: true, # generate thumb image if this is image format (default true)
   #   maximum: maximum bytes permitted to upload (default: 1000MG)
+  #   dimension: dimension for the image (sample: 30x30 | x30 | 30x)
   #   formats: extensions permitted, sample: jpg,png,... or generic: images | videos | audios | documents (default *)
   #   remove_source: Boolean (delete source file after saved if this is true, default false)
   #   same_name: Boolean (save the file with the same name if defined true, else search for a non used name)
@@ -26,8 +27,12 @@ module CamaleonCms::UploaderHelper
       return {error: "File is empty", file: nil, size: nil}
     end
     uploaded_io = File.open(uploaded_io) if uploaded_io.is_a?(String)
+
+    uploaded_io = File.open(cama_resize_upload(uploaded_io.path, settings[:dimension])) if settings[:dimension].present? # resize file into specific dimensions
+
     cama_uploader_init_connection(true)
     settings = settings.to_sym
+    settings[:uploaded_io] = uploaded_io
     settings = {
         folder: "",
         maximum: 100.megabytes,
@@ -39,29 +44,12 @@ module CamaleonCms::UploaderHelper
         remove_source: false,
         same_name: false
     }.merge(settings)
+    hooks_run("before_upload", settings)
 
     res = {error: nil}
 
     # formats validations
-    if settings[:formats] != "*"
-      case settings[:formats]
-        when "images"
-          settings[:formats] = "jpg,jpeg,png,gif,bmp"
-        when "videos"
-          settings[:formats] = "flv,webm,wmv,avi,swf,mp4"
-        when "audios"
-          settings[:formats] = "mp3,ogg"
-        when "documents"
-          settings[:formats] = "pdf,xls,xlsx,doc,docx,ppt,pptx,html,txt"
-        when "compresed"
-          settings[:formats] = "zip,7z,rar,tar,bz2,gz,rar2"
-      end
-
-      unless settings[:formats].downcase.split(",").include?(File.extname(settings[:filename]).sub(".", "").downcase)
-        res[:error] = ct("file_format_error")
-        return res
-      end
-    end
+    return {error: "#{ct("file_format_error")} (#{settings[:formats]})"} unless cama_verify_format(uploaded_io.path, settings[:formats])
 
     # file size validations
     if settings[:maximum] < settings[:file_size]
@@ -69,6 +57,8 @@ module CamaleonCms::UploaderHelper
       return res
     end
 
+    File.chmod(0644, uploaded_io.path) # fix reading permission (Fix Fog-Local)
+
     # save file
     if settings[:same_name]
       partial_path = "#{current_site.upload_directory_name}/#{"#{settings[:folder]}/" if settings[:folder].present?}#{settings[:filename]}"
@@ -90,14 +80,20 @@ module CamaleonCms::UploaderHelper
 
     # generate thumb
     if settings[:generate_thumb] && res["format"] == "image" && File.extname(file.key) != ".gif"
-      thumb_name = cama_parse_for_thumb_name(file.key)
-      path_thumb = cama_resize_and_crop(uploaded_io.path, @fog_connection_hook_res[:thumb][:w], @fog_connection_hook_res[:thumb][:h], {overwrite: false, output_name: thumb_name.split("/").last})
-      thumb_res = upload_file(path_thumb, {generate_thumb: false, same_name: true, remove_source: true, folder: settings[:folder].split("/").push(@fog_connection_hook_res[:thumb_folder_name]).join("/")})
+
+      cama_uploader_generate_thumbnail(uploaded_io.path, file.key, settings[:folder].split("/").push(@fog_connection_hook_res[:thumb_folder_name]).join("/"))
     end
     FileUtils.rm_f(uploaded_io.path) if settings[:remove_source]
     res
   end
 
+  # generate thumbnail
+  def cama_uploader_generate_thumbnail(source_path, filename, folder)
+    thumb_name = cama_parse_for_thumb_name(filename)
+    path_thumb = cama_resize_and_crop(source_path, @fog_connection_hook_res[:thumb][:w], @fog_connection_hook_res[:thumb][:h], {overwrite: false, output_name: thumb_name.split("/").last})
+    upload_file(path_thumb, {generate_thumb: false, same_name: true, remove_source: true, folder: folder})
+  end
+
   # destroy file from fog
   # sample: "owen/campaign-date-picker_1.png"
   def cama_uploader_destroy_file(file_path, destroy_thumb = true)
@@ -123,9 +119,9 @@ module CamaleonCms::UploaderHelper
   # add a new folder in fog
   def cama_uploader_add_folder(folder)
     cama_uploader_init_connection(true)
-    key = "#{current_site.upload_directory_name}/#{folder}/".split("/").clean_empty.join("/")
-    key += '/_tmp.txt' unless @fog_connection.class.name.include?("AWS")
-    @fog_connection_bucket_dir.files.create({:key => key, content: "", :public => true})
+    key = "#{@fog_connection_hook_res[:bucket_name]}/#{current_site.upload_directory_name}/#{folder}/".split("/").clean_empty.join("/")
+    dir = @fog_connection.directories.create(:key => key)
+    dir.files.create({:key => '_tmp.txt', content: "", :public => true}) unless @fog_connection.class.name.include?("AWS")
   end
 
   # initialize fog uploader and trigger hook to customize fog storage
@@ -178,6 +174,20 @@ module CamaleonCms::UploaderHelper
     return res
   end
 
+  # search for a file by filename
+  # sample: cama_media_search_file("")
+  def cama_media_search_file(filename)
+    cama_uploader_init_connection(true)
+
+    prefix  = current_site.upload_directory_name.gsub(/(\/){2,}/, "/")
+
+    @fog_connection.directories
+    .get(@fog_connection_hook_res[:bucket_name], prefix: prefix)
+    .files
+    .select { |file| file.key.split('/').last.include?(filename) && !file.key.include?('/_tmp.txt') }
+    .map { |file| cama_uploader_parse_file(file) }
+  end
+
   # parse file information of FOG file
   def cama_uploader_parse_file(file)
     res = {"name"=> File.basename(file.key), "file"=> file.key, "size"=> file.content_length, "url"=> (file.public_url rescue [current_site.get_option("filesystem_s3_endpoint"), file.key ].join("/")), "deleteUrl"=> "" }
@@ -197,8 +207,8 @@ module CamaleonCms::UploaderHelper
     if "mp3,ogg".split(",").include?(ext)
       res["format"] = "audio"
     end
-    if "pdf,xls,xlsx,doc,docx,ppt,pptx,html,txt".split(",").include?(ext)
-      res["format"] = "doc"
+    if "pdf,xls,xlsx,doc,docx,ppt,pptx,html,txt,xml,json".split(",").include?(ext)
+      res["format"] = "document"
     end
     if "zip,7z,rar,tar,bz2,gz,rar2".split(",").include?(ext)
       res["format"] = "compress"
@@ -245,15 +255,19 @@ module CamaleonCms::UploaderHelper
   #   (true => resize the image to this dimension)
   #   (false => crop the image with this dimension)
   # replace: Boolean (replace current image or create another file)
-  def cama_crop_image(file_path, w, h, w_offset, h_offset, resize = nil , replace: true)
+  def cama_crop_image(file_path, w=nil, h=nil, w_offset = 0, h_offset = 0, resize = false , replace = true)
+    force = ""
+    force = "!" if w.present? && h.present? && !w.include?("?") && !h.include?("?")
     image = MiniMagick::Image.open(file_path)
+    w = image[:width].to_f > w.sub('?', '').to_i ? w.sub('?', "") : image[:width] if w.present? && w.to_s.include?('?')
+    h = image[:height].to_f > h.sub('?', '').to_i ? h.sub('?', "") : image[:height] if h.present? && h.to_s.include?('?')
     image.combine_options do |i|
-      i.resize(resize) if resize.present?
-      i.crop "#{w.to_i}x#{h.to_i}+#{w_offset}+#{h_offset}!"
+      i.resize("#{w if w.present?}x#{h if h.present?}#{force}") if resize
+      i.crop "#{w if w.present?}x#{h if h.present?}+#{w_offset}+#{h_offset}#{force}" unless resize
     end
 
     res = file_path
-    if replace
+    unless replace
       ext = File.extname(file_path)
       res = file_path.gsub(ext, "_crop#{ext}")
     end
@@ -275,7 +289,11 @@ module CamaleonCms::UploaderHelper
   def cama_resize_and_crop(file, w, h, settings = {})
     settings = {gravity: :north_east, overwrite: true, output_name: ""}.merge(settings)
     img = MiniMagick::Image.open(file)
+    w = img[:width].to_f > w.sub('?', '').to_i ? w.sub('?', "") : img[:width] if w.present? && w.to_s.include?('?')
+    h = img[:height].to_f > h.sub('?', '').to_i ? h.sub('?', "") : img[:height] if h.present? && h.to_s.include?('?')
     w_original, h_original = [img[:width].to_f, img[:height].to_f]
+    w = w.to_i if w.present?
+    h = h.to_i if h.present?
 
     # check proportions
     if w_original * h < h_original * w
@@ -306,6 +324,76 @@ module CamaleonCms::UploaderHelper
     file
   end
 
+  # upload tmp file
+  # support for url and local path
+  # sample:
+  # cama_tmp_upload('http://camaleon.tuzitio.com/media/132/logo2.png')  ==> /var/rails/my_project/public/tmp/1/logo2.png
+  # cama_tmp_upload('/var/www/media/132/logo 2.png')  ==> /var/rails/my_project/public/tmp/1/logo-2.png
+  # accept args:
+  #   name: to indicate the name to use, sample: cama_tmp_upload('/var/www/media/132/logo 2.png', {name: 'owen.png', formats: 'images'})
+  #   formats: extensions permitted, sample: jpg,png,... or generic: images | videos | audios | documents (default *)
+  #   dimension: 20x30
+  def cama_tmp_upload(uploaded_io, args = {})
+    tmp_path = args[:path] || Rails.public_path.join("tmp", current_site.id.to_s)
+    FileUtils.mkdir_p(tmp_path) unless Dir.exist?(tmp_path)
+    if uploaded_io.is_a?(String) && (uploaded_io.start_with?("http://") || uploaded_io.start_with?("https://"))
+      return {error: "#{ct("file_format_error")} (#{args[:formats]})"} unless cama_verify_format(uploaded_io, args[:formats])
+      name = args[:name] || uploaded_io.split("/").last
+      name = "#{File.basename(name, File.extname(name)).underscore}#{File.extname(name)}"
+      path = uploader_verify_name( File.join(tmp_path, name))
+      File.open(path, 'wb'){|file| file.write(open(uploaded_io).read) }
+      path = cama_resize_upload(path, args[:dimension]) if args[:dimension].present?
+    else
+      uploaded_io = File.open(uploaded_io) if uploaded_io.is_a?(String)
+      return {error: "#{ct("file_format_error")} (#{args[:formats]})"} unless cama_verify_format(uploaded_io.path, args[:formats])
+      name = args[:name] || uploaded_io.path.split("/").last
+      name = "#{File.basename(name, File.extname(name)).underscore}#{File.extname(name)}"
+      path = uploader_verify_name( File.join(tmp_path, name))
+      File.open(path, "wb"){|f| f.write(uploaded_io.read) }
+      path = cama_resize_upload(path, args[:dimension]) if args[:dimension].present?
+    end
+    {file_path: path, error: nil}
+  end
+
+  # resize image if the format is correct
+  # return resized file path
+  def cama_resize_upload(image_path, dimesion)
+    if cama_verify_format(image_path, 'image') && dimesion.present?
+      r={file: image_path, w: dimesion.split('x')[0], h: dimesion.split('x')[1], w_offset: 0, h_offset: 0, resize: !dimesion.split('x')[2] || dimesion.split('x')[2] == "resize", replace: true, gravity: :north_east}; hooks_run("on_uploader_resize", r)
+      if r[:w].present? && r[:h].present?
+        image_path = cama_resize_and_crop(r[:file], r[:w], r[:h], {overwrite: r[:replace], gravity: r[:gravity] })
+      else
+        image_path = cama_crop_image(r[:file], r[:w], r[:h], r[:w_offset], r[:h_offset], r[:resize] , r[:replace])
+      end
+    end
+    image_path
+  end
+
+  # verify permitted formats (return boolean true | false)
+  # true: if format is accepted
+  # false: if format is not accepted
+  # sample: cama_verify_format(file_path, 'image,audio,docx,xls') => return true if the file extension is in formats
+  def cama_verify_format(file_path, formats)
+    return true if formats == "*" || !formats.present?
+    formats = formats.downcase.split(",")
+    if formats.include? "image"
+      formats += "jpg,jpeg,png,gif,bmp,ico".split(',')
+    end
+    if formats.include? "video"
+      formats += "flv,webm,wmv,avi,swf,mp4".split(',')
+    end
+    if formats.include? "audio"
+      formats += "mp3,ogg".split(',')
+    end
+    if formats.include? "document"
+      formats += "pdf,xls,xlsx,doc,docx,ppt,pptx,html,txt,htm,json,xml".split(',')
+    end
+    if formats.include?("compress") || formats.include?("compres")
+      formats += "zip,7z,rar,tar,bz2,gz,rar2".split(',')
+    end
+    formats.include?(File.extname(file_path).sub(".", "").downcase)
+  end
+
   private
   # helper for resize and crop method
   def cama_crop_offsets_by_gravity(gravity, original_dimensions, cropped_dimensions)

data/app/mailers/camaleon_cms/html_mailer.rb

@@ -14,19 +14,21 @@ class CamaleonCms::HtmlMailer < ActionMailer::Base
   default from: "Camaleon CMS <owenperedo@gmail.com>"
   after_action :set_delivery_options
 
-  def sender(email, subject='Hello', content='', from=nil, attachs=[], url_base='', current_site, template_name, layout_name, extra_data)
+  # content='', from=nil, attachs=[], url_base='', current_site, template_name, layout_name, extra_data, format, cc_to
+  def sender(email, subject='Hello', data = {})
+    data[:current_site] = CamaleonCms::Site.main_site.decorate unless data[:current_site].present?
+    data[:current_site] = CamaleonCms::Site.find(data[:current_site]).decorate if data[:current_site].is_a?(Integer)
+    @current_site = data[:current_site]
+    current_site = data[:current_site]
+    data = {cc_to: [], from: current_site.get_option("email"), template_name: 'mailer', layout_name: 'camaleon_cms/mailer', format: 'html'}.merge(data)
     @subject = subject
-    @html = content
-    @url_base = url_base
-    @current_site = current_site
-    @extra_data = extra_data
+    @html = data[:content]
+    @url_base = data[:url_base]
+    @extra_data = data[:extra_data]
+    data[:cc_to] = [data[:cc_to]] if data[:cc_to].is_a?(String) || !data[:cc_to].present?
 
     mail_data = {to: email, subject: subject}
-    mail_data[:from] = from if from.present?
-
     if current_site.get_option("mailer_enabled") == 1
-      mail_data[:from] = current_site.get_option("email_from")
-      mail_data[:cc] = current_site.get_option("email_cc")
       mail_data[:delivery_method] = :smtp
       mail_data[:delivery_method_options] = {user_name: current_site.get_option("email_username"),
                                              password: current_site.get_option("email_pass"),
@@ -36,7 +38,11 @@ class CamaleonCms::HtmlMailer < ActionMailer::Base
                                              authentication: "plain",
                                              enable_starttls_auto: true
       }
+      data[:cc_to].push(current_site.get_option("email_cc"))
+      data[:from] = current_site.get_option("email_from", data[:from])
     end
+    mail_data[:cc] = data[:cc_to].clean_empty.join(",") if data[:cc_to].present?
+    mail_data[:from] = data[:from] if data[:from].present?
 
     views_dir = "app/apps/"
     self.prepend_view_path(File.join($camaleon_engine_dir, views_dir).to_s)
@@ -45,19 +51,19 @@ class CamaleonCms::HtmlMailer < ActionMailer::Base
     theme = current_site.get_theme
     lookup_context.prefixes.prepend("themes/#{theme.slug}") if theme.settings["gem_mode"]
     lookup_context.prefixes.prepend("themes/#{theme.slug}/views") unless theme.settings["gem_mode"]
-
-    # run hook "email" to customize values
-    r = {template_name: template_name, layout_name: layout_name, mail_data: mail_data, files: attachs, format: "html"}
-    hooks_run("email", r)
-
-    if r[:files].present?
-      r[:files].each { |attach| attachments["#{File.basename(attach)}"] = File.open(attach, 'rb') { |f| f.read } }
+    if data[:files].present?
+      data[:files].each { |attach| attachments["#{File.basename(attach)}"] = File.open(attach, 'rb') { |f| f.read } }
     end
 
-    mail(r[:mail_data]) { |format| format.html { render r[:template_name], layout: r[:layout_name] } } if r[:format] == "html"
-    mail(r[:mail_data]) { |format| format.text { render r[:template_name], layout: r[:layout_name] } } if r[:format] == "txt"
-    mail(r[:mail_data]) unless r[:format].present?
-
+    layout = data[:layout_name].present? ? data[:layout_name] : false
+    if data[:template_name].present? # render email with template
+      mail(mail_data) { |format| format.html { render data[:template_name], layout: layout } } if data[:format] == "html"
+      mail(mail_data) { |format| format.text { render data[:template_name], layout: layout } } if data[:format] == "txt"
+    else # inline render content
+      mail(mail_data) { |format| format.html { render inline: @html, layout: layout } } if data[:format] == "html"
+      mail(mail_data) { |format| format.text { render inline: @html, layout: layout } } if data[:format] == "txt"
+    end
+    mail(mail_data) unless data[:format].present?
   end
 
   private

data/app/models/camaleon_cms/custom_field.rb

@@ -7,6 +7,7 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::CustomField < ActiveRecord::Base
+  self.primary_key = :id
   include CamaleonCms::Metas
   has_many :metas, ->{ where(object_class: 'CustomField')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
   self.table_name = "#{PluginRoutes.static_system_info["db_prefix"]}custom_fields"

data/app/models/camaleon_cms/custom_field_group.rb

@@ -7,6 +7,7 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::CustomFieldGroup < CamaleonCms::CustomField
+  self.primary_key = :id
   # attrs required: name, slug, description
   default_scope { where.not(object_class: '_fields').reorder("#{CamaleonCms::CustomField.table_name}.field_order ASC") }
 
@@ -68,7 +69,7 @@ class CamaleonCms::CustomFieldGroup < CamaleonCms::CustomField
       end
     end
     ids_deletes = ids_old - ids_saved
-    self.fields.where(id: ids_deletes).destroy_all if ids_deletes.present?
+    self.fields.where(id: ids_deletes).destroy_all if ids_deletes.any?
   end
 
   # generate the caption for this group

data/app/models/camaleon_cms/nav_menu.rb

@@ -7,7 +7,7 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::NavMenu < CamaleonCms::TermTaxonomy
-  default_scope { where(taxonomy: :nav_menu) }
+  default_scope { where(taxonomy: :nav_menu).order(id: :asc) }
   has_many :metas, ->{ where(object_class: 'NavMenu')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
   has_many :children, class_name: "CamaleonCms::NavMenuItem", foreign_key: :parent_id, dependent: :destroy
   belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :parent_id
@@ -44,13 +44,12 @@ class CamaleonCms::NavMenu < CamaleonCms::TermTaxonomy
         saved_nav_items(item, value[:children]) if value[:children].present?
 
         # save custom fields for this menu item
-        if value[:fields].present?
-          value[:fields].each do |k, v|
-            item.save_field_value(k, v)
-          end
-        end
-
+        item.set_field_values(value[:fields]) if value[:fields].present?
       end
     end
   end
+
+  # overwrite termtaxonomy method
+  def destroy_dependencies
+  end
 end

data/app/models/camaleon_cms/nav_menu_item.rb

@@ -7,7 +7,7 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::NavMenuItem < CamaleonCms::TermTaxonomy
-  default_scope { where(taxonomy: :nav_menu_item) }
+  default_scope { where(taxonomy: :nav_menu_item).order(id: :asc) }
   has_many :metas, ->{ where(object_class: 'NavMenuItem')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
   belongs_to :parent, class_name: "CamaleonCms::NavMenu"
   belongs_to :parent_item, class_name: "CamaleonCms::NavMenuItem", foreign_key: :parent_id
@@ -15,6 +15,7 @@ class CamaleonCms::NavMenuItem < CamaleonCms::TermTaxonomy
 
   after_create :update_count
   #before_destroy :update_count
+  alias_attribute :site_id, :term_group
 
   # return the main menu
   def main_menu