camaleon_cms 2.4.0 → 2.4.1

data/app/assets/javascripts/camaleon_cms/admin/uploader/_media_manager.js.coffee

@@ -32,6 +32,10 @@ window["cama_init_media"] = (media_panel) ->
     media_info.html(tpl)
     media_info.find(".p_thumb").html(item.find(".thumb").html())
     if data["format"] == "image"
+      if item.find('.edit_item') # add button to edit image
+        edit_img = $('<button type="button" class="pull-right btn btn-default" title="Edit"><i class="fa fa-pencil"></i></button>').click ->
+          item.find('.edit_item').trigger('click')
+      media_info.find('.p_footer').append(edit_img)
       draw_image = ->
         ww = parseInt(data['dimension'].split("x")[0])
         hh = parseInt(data['dimension'].split("x")[1])
@@ -46,7 +50,7 @@ window["cama_init_media"] = (media_panel) ->
             btn.prop('disabled', false)
           else
             media_info.find(".cdimension").css("color", 'red')
-            cut = $("<button class='btn btn-info pull-right'><i class='fa fa-crop'></i> "+I18n("button.crop_image")+"</button>").click(->
+            cut = $("<button class='btn btn-info pull-right'><i class='fa fa-crop'></i> "+I18n("button.auto_crop")+"</button>").click(->
               crop_name = data["name"].split('.')
               crop_name[crop_name.length-2] += '_' + media_panel.attr("data-dimension")
               $.fn.upload_url({url: data["url"], name: crop_name.join('.')})
@@ -74,6 +78,10 @@ window["cama_init_media"] = (media_panel) ->
   media_panel.on("click", ".file_item", ->
     show_file($(this))
     return false
+  ).on('dblclick', '.file_item', -> ## auto select on double click
+    btn = media_info.find('.insert_btn')
+    if btn && !btn.attr('disabled') && !btn.attr('readonly')
+      btn.trigger('click')
   )
 
   media_files_panel.scroll(->
@@ -85,7 +93,9 @@ window["cama_init_media"] = (media_panel) ->
   ########## file uploader
   p_upload = media_panel.find(".cama_media_fileuploader")
   customFileData = ->
-    return cama_media_get_custom_params()
+    r = cama_media_get_custom_params()
+    r['skip_auto_crop'] = true
+    return r
 
   p_upload.uploadFile({
     url: p_upload.attr("data-url"),
@@ -156,8 +166,11 @@ window["cama_init_media"] = (media_panel) ->
     showLoading()
     $.getJSON(media_panel.attr("data-url"), media_panel.data('last_req_params'), (res)->
       if data["paginate"]
-        last_folder = media_files_panel.children('.folder_item:last')
-        if last_folder.length ==1 then last_folder.after(res.html) else  media_files_panel.append(res.html)
+        if media_files_panel.children('.file_item').length > 0
+          media_files_panel.append(res.html)
+        else
+          last_folder = media_files_panel.children('.folder_item:last')
+          if last_folder.length ==1 then last_folder.after(res.html) else  media_files_panel.append(res.html)
       else
         media_files_panel.html(res.html)
       media_files_panel.attr('data-next-page', res.next_page)
@@ -238,8 +251,10 @@ window["cama_init_media"] = (media_panel) ->
     cropper_data = null
 
     edit_callback = (modal)->
+      field_width = modal.find('.export_image .with_image')
+      field_height = modal.find('.export_image .height_image')
       save_image = (name, same_name)->
-        $.fn.upload_url({url: cropper.cropper('getCroppedCanvas').toDataURL('image/jpeg'), name: name, same_name: same_name, callback: (res)->
+        $.fn.upload_url({url: cropper.cropper('getCroppedCanvas', { width: field_width.val(), height: field_height.val() }).toDataURL('image/jpeg'), name: name, same_name: same_name, callback: (res)->
           modal.modal('hide')
         })
 
@@ -260,9 +275,11 @@ window["cama_init_media"] = (media_panel) ->
         )
 
       # save editted image
-      save_btn = $('<button type="button" class="btn btn-default"><i class="fa fa-save"></i> '+I18n('button.save', 'Save Image')+'</button>').click(->
+      save_btn = modal.find('.export_image').submit(->
+        unless $(this).valid()
+          return false
         save_buttons = (modal2)->
-          modal2.find('img.preview').attr('src', cropper.cropper('getCroppedCanvas').toDataURL('image/jpeg'))
+          modal2.find('img.preview').attr('src', cropper.cropper('getCroppedCanvas', { width: field_width.val(), height: field_height.val() }).toDataURL('image/jpeg'))
           modal2.find('.save_btn').click(->
             save_image(data['name'], true)
             modal2.modal('hide')
@@ -273,9 +290,16 @@ window["cama_init_media"] = (media_panel) ->
             modal2.modal('hide')
             return false
           })
-        open_modal({zindex: 999992, id: 'media_preview_editted_image', content: '<div class="text-center" style="overflow: auto;"><img class="preview"></div><br><div class="row"><div class="col-md-4">'+(if link.attr('data-permit-overwrite') then '<button class="btn save_btn btn-default">'+I18n('button.replace_image')+'</button>' else '')+'</div><div class="col-md-8"><form class="input-group"><input type="text" class="form-control file_name required" name="file_name"><div class="input-group-btn"><button class="btn btn-primary" type="submit">'+I18n('button.save_new_image')+'</button></div></form></div></div>', callback: save_buttons})
+        open_modal({zindex: 999992, modal_size: 'modal-lg', id: 'media_preview_editted_image', content: '<div class="text-center" style="overflow: auto;"><img class="preview"></div><br><div class="row"><div class="col-md-4"><button class="btn save_btn btn-default">'+I18n('button.replace_image')+'</button></div><div class="col-md-8"><form class="input-group"><input type="text" class="form-control file_name required" name="file_name"><div class="input-group-btn"><button class="btn btn-primary" type="submit">'+I18n('button.save_new_image')+'</button></div></form></div></div>', callback: save_buttons})
+        return false
+      ).validate()
+
+      # custom sizes auto calculate aspect ratio
+      field_width.change(->
+        unless field_width.attr("readonly")
+          croper_area = modal.find('.cropper-crop-box')
+          field_height.val(parseInt((parseInt($(this).val()) / croper_area.width())*croper_area.height()))
       )
-      modal.find('.editor_controls').append(save_btn)
 
       # show cropper image
       showLoading()
@@ -283,26 +307,11 @@ window["cama_init_media"] = (media_panel) ->
         setTimeout(->
           label = modal.find('.label_dimension')
           cropper_data = {data: {}, minContainerHeight: 450, modal: true, crop: (e)->
-            dim = cropper_data['data']['dim']
-            r = false
-            if dim && dim[0].search(/\?/) > -1 && parseFloat(dim[0].match(/\d+/)[0]) < e.width # max width
-              cropper.cropper('setData', {width: parseFloat(dim[0].match(/\d+/)[0])})
-              r = true
-
-            if dim && dim[1].search(/\?/) > -1 && parseFloat(dim[1].match(/\d+/)[0]) < e.height # max height
-              cropper.cropper('setData', {height: parseFloat(dim[1].match(/\d+/)[0])})
-              r = true
-
-            if dim && dim[0] && dim[0].search(/\?/) == -1 && e.width != parseFloat(dim[0]) # same width
-              cropper.cropper('setData', {width: parseFloat(dim[0])})
-              r = true
-
-            if dim && dim[1] && dim[1].search(/\?/) == -1 && e.height != parseFloat(dim[1]) # same width
-              cropper.cropper('setData', {height: parseFloat(dim[1])})
-              r = true
-
-            unless r
-              label.html(Math.round(e.width) + " x "+Math.round(e.height))
+            label.html(Math.round(e.width) + " x "+Math.round(e.height))
+            unless field_width.attr("readonly")
+              field_width.val(Math.round(e.width))
+            unless field_height.attr("readonly")
+              field_height.val(Math.round(e.height))
           , built: ()->
             if modal.find('.cropper-canvas img').attr('crossorigin')
               modal.find('.modal-body').html('<div class="alert alert-danger">'+I18n('msg.cors_error', 'Please verify the following: <ul><li>If the image exist: %{url_img}</li> <li>Check if cors configuration are defined well, only for external images: S3, cloudfront(if you are using cloudfront).</li></ul><br> More information about CORS: <a href="%{url_blog}" target="_blank">here.</a>', {url_img: data['url'], url_blog: 'http://blog.celingest.com/en/2014/10/02/tutorial-using-cors-with-cloudfront-and-s3/'})+'</div>')
@@ -310,20 +319,50 @@ window["cama_init_media"] = (media_panel) ->
 
           if media_panel.attr("data-dimension") # TODO: control dimensions
             dim = media_panel.attr("data-dimension").split('x')
-            cropper_data['data']['dim'] = dim
             if dim[0]
               cropper_data['data']['width'] = parseFloat(dim[0].match(/\d+/)[0])
+              field_width.val(cropper_data['data']['width'])
+              if dim[0].search(/\?/) > -1
+                field_width.attr('min', cropper_data['data']['width'])
+              else
+                field_width.prop('readonly', true)
             if dim[1]
               cropper_data['data']['height'] = parseFloat(dim[1].match(/\d+/)[0])
+              field_height.val(cropper_data['data']['height'])
+              if dim[1].search(/\?/) > -1
+                field_height.attr('min', cropper_data['data']['height'])
+              else
+                field_height.prop('readonly', true)
             if dim[0] && dim[0].search(/\?/) == -1 && dim[1] && dim[1].search(/\?/) == -1
               cropper_data['cropBoxResizable'] = false
-              cropper_data['zoomable'] = false
 
           cropper = modal.find('img.editable').cropper(cropper_data)
           hideLoading()
         , 300)
       )
-    open_modal({zindex: 999991, id: 'media_panel_editor_image', title: 'Edit Image - ' + data['name'], content: '<div><div class="editable_wrapper"><img style="max-width: 100%;" class="editable" id="media_editable_image" src="'+data['url']+'"></div><div class="editor_controls btn-group"></div><span class="label label-default pull-right label_dimension"></span></div>', callback: edit_callback, modal_size: 'modal-lg'})
+    open_modal({
+      zindex: 999991,
+      id: 'media_panel_editor_image',
+      title: I18n('button.edit_image', 'Edit Image')+' - ' + data['name'] + (if media_panel.attr("data-dimension") then " <small><i>("+media_panel.attr("data-dimension")+")</i></small>" else ''),
+      content: '<div>' +
+                '<div class="editable_wrapper">' +
+                  '<img style="max-width: 100%;" class="editable" id="media_editable_image" src="'+data['url']+'">' +
+                '</div>' +
+                '<div class="row" style="margin-top: 5px;">' +
+                  '<div class="col-md-8">' +
+                    '<div class="editor_controls btn-group"></div>' +
+                  '</div>' +
+                  '<div class="col-md-4">' +
+                    '<form class="export_image"> ' +
+                      '<div class="input-group"><input class="form-control with_image data-error-place-parent required number" placeholder="Width"><span class="input-group-addon">x</span>' +
+                      '<input class="form-control height_image data-error-place-parent required number" placeholder="Height"> ' +
+                      '<span class="input-group-btn"><button class="btn btn-primary save_image" type="submit"><i class="fa fa-save"></i> '+I18n('button.save', 'Save Image')+'</button> </span> </div>' +
+                    '</form>' +
+                  '</div>' +
+                '</div>' +
+                '<!--span class="label label-default pull-right label_dimension"></span-->' +
+              '</div>',
+      callback: edit_callback, modal_size: 'modal-lg'})
     return false
   )
 
@@ -331,7 +370,7 @@ window["cama_init_media"] = (media_panel) ->
   media_panel.find("#cama_media_external").submit( ->
     unless $(this).valid()
       return false
-    $.fn.upload_url({url: $(this).find("input").val(), callback: ->
+    $.fn.upload_url({url: $(this).find("input").val(), skip_auto_crop: true, callback: ->
       media_panel.find("#cama_media_external")[0].reset();
     })
     return false

data/app/controllers/camaleon_cms/admin/media_controller.rb

@@ -78,6 +78,7 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
 
   # upload files from media uploader
   def upload(settings = {})
+    params[:dimension] = nil if params[:skip_auto_crop].present?
     f = {error: "File not found."}
     if params[:file_upload].present?
       f = upload_file(params[:file_upload], {folder: params[:folder], dimension: params['dimension'], formats: params[:formats], versions: params[:versions], thumb_size: params[:thumb_size]}.merge(settings))

data/app/controllers/camaleon_cms/admin/sessions_controller.rb

@@ -30,7 +30,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
         cama_captcha_reset_attack("login")
         r={user: @user, redirect_to: params[:format] == 'json' ? false : nil}; hooks_run('after_login', r)
         login_user(@user, params[:remember_me].present?, r[:redirect_to])
-        render(json: flash.to_hash) if params[:format] == 'json'
+        render(json: flash.discard.to_hash) if params[:format] == 'json'
         return
       else
         flash[:error] = t('camaleon_cms.admin.login.message.email_not_validated')
@@ -47,7 +47,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
       @user = current_site.users.new(data_user)
       login if params[:format] != 'json'
     end
-    render(json: flash.to_hash) if params[:format] == 'json'
+    render(json: flash.discard.to_hash) if params[:format] == 'json'
   end
 
   def logout

data/app/controllers/camaleon_cms/admin/user_roles_controller.rb

@@ -37,9 +37,11 @@ class CamaleonCms::Admin::UserRolesController < CamaleonCms::AdminController
   end
 
   def update
-    if @user_role.editable? && @user_role.update(params.require(:user_role).permit!)
-      @user_role.set_meta("_post_type_#{current_site.id.to_s}", defined?(params[:rol_values][:post_type]) ? params[:rol_values][:post_type] : {})
-      @user_role.set_meta("_manager_#{current_site.id.to_s}", defined?(params[:rol_values][:post_type]) ? params[:rol_values][:manager] : {})
+    if @user_role.update(params.require(:user_role).permit!)
+      if @user_role.editable?
+        @user_role.set_meta("_post_type_#{current_site.id.to_s}", defined?(params[:rol_values][:post_type]) ? params[:rol_values][:post_type] : {})
+        @user_role.set_meta("_manager_#{current_site.id.to_s}", defined?(params[:rol_values][:post_type]) ? params[:rol_values][:manager] : {})
+      end
       flash[:notice] = t('camaleon_cms.admin.users.message.rol_updated')
       redirect_to action: :edit, id: @user_role.id
     else
@@ -48,8 +50,11 @@ class CamaleonCms::Admin::UserRolesController < CamaleonCms::AdminController
   end
 
   def destroy
-    @user_role.destroy
-    flash[:notice] = t('camaleon_cms.admin.users.message.rol_deleted')
+    if @user_role.editable? && @user_role.destroy
+      flash[:notice] = t('camaleon_cms.admin.users.message.rol_deleted')
+    else
+      flash[:error] = t('camaleon_cms.admin.users.message.role_can_not_be_deleted', default: 'This role can not be deleted')
+    end
     redirect_to action: :index
   end
 
@@ -60,7 +65,7 @@ class CamaleonCms::Admin::UserRolesController < CamaleonCms::AdminController
 
   def set_user_roles
     begin
-      @user_role = current_site.user_roles.find(params[:id])
+      @user_role = current_site.user_roles.find(params[:id]).decorate
     rescue
       flash[:error] = t('camaleon_cms.admin.users.message.rol_error')
       redirect_to action: :index

data/app/controllers/camaleon_cms/admin/users_controller.rb

@@ -5,7 +5,7 @@ class CamaleonCms::Admin::UsersController < CamaleonCms::AdminController
 
   def index
     add_breadcrumb I18n.t("camaleon_cms.admin.users.list_users")
-    @users = current_site.users.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
+    @users = current_site.users.paginate(:page => params[:page], :per_page => current_site.admin_per_page).decorate
   end
 
   def profile

data/app/controllers/camaleon_cms/apps/plugins_front_controller.rb

@@ -8,7 +8,7 @@ class CamaleonCms::Apps::PluginsFrontController < CamaleonCms::FrontendControlle
     @plugin = current_site.plugins.where(slug: plugin_name).first_or_create
     unless @plugin.active?
       flash[:error] = t("camaleon_cms.plugin_not_installed", default: "This plugin is not installed, please contact to the administrator.")
-      params[:format] == 'json' ? render(json: flash.to_hash) : (redirect_to cama_root_url)
+      params[:format] == 'json' ? render(json: flash.discard.to_hash) : (redirect_to cama_root_url)
       return
     end
     if !@plugin.settings["gem_mode"].present?

data/app/controllers/concerns/camaleon_cms/frontend_concern.rb

@@ -56,6 +56,6 @@ module CamaleonCms::FrontendConcern extend ActiveSupport::Concern
     else
       flash[:error] = t('camaleon_cms.admin.message.unauthorized')
     end
-    params[:format] == 'json' ? render(json: flash.to_hash) : redirect_to(:back)
+    params[:format] == 'json' ? render(json: flash.discard.to_hash) : redirect_to(:back)
   end
 end

data/app/decorators/camaleon_cms/site_decorator.rb

@@ -133,7 +133,7 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
   # return the role_id of current visitor for this site
   # if the visitor was not logged in, then return -1
   def visitor_role
-    h.signin? ? h.cama_current_user.get_role(object).slug : "-1"
+    h.signin? ? h.cama_current_user.role : '-1'
   end
 
   # check if plugin_key is already installed for this site

data/app/decorators/camaleon_cms/user_decorator.rb

@@ -14,7 +14,7 @@ class CamaleonCms::UserDecorator < CamaleonCms::ApplicationDecorator
 
   # return the role title of this user for current site
   def the_role
-    object.get_role(h.current_site).name.titleize
+    object.get_role(h.current_site).try(:decorate).try(:the_title) || ''
   end
 
   # return the avatar for this user, default: assets/admin/img/no_image.jpg

data/app/decorators/camaleon_cms/user_role_decorator.rb

@@ -0,0 +1,12 @@
+class CamaleonCms::UserRoleDecorator < CamaleonCms::ApplicationDecorator
+  include CamaleonCms::CustomFieldsConcern
+  delegate_all
+
+  def the_title
+    object.name.to_s.translate(get_locale)
+  end
+
+  def the_content
+    object.description.to_s.translate(get_locale)
+  end
+end

data/app/helpers/camaleon_cms/session_helper.rb

@@ -110,7 +110,7 @@ module CamaleonCms::SessionHelper
   # return the role for current user
   # if not logged in, then return 'public'
   def cama_current_role
-    (cama_sign_in?) ? cama_current_user.role : 'public'
+    current_site.visitor_role
   end
 
   # return current user logged in

data/app/helpers/camaleon_cms/short_code_helper.rb

@@ -10,11 +10,15 @@ module CamaleonCms::ShortCodeHelper
                 Sample: [widget widget_key]")
 
     shortcode_add("load_libraries",
-                  lambda{|attrs, args| cama_load_libraries(*attrs["data"].to_s.split(",")); return ""; },
+                  lambda{|attrs, args|
+                    return args[:shortcode] unless attrs.present?
+                    cama_load_libraries(*attrs["data"].to_s.split(",")); return "";
+                  },
                   "Permit to load libraries on demand, sample: [load_libraries data='datepicker,tinymce']")
 
     shortcode_add("asset",
                   lambda{|attrs, args|
+                    return args[:shortcode] unless attrs.present?
                     url = attrs["as_path"].present? ? ActionController::Base.helpers.asset_url(attrs["file"]) : ActionController::Base.helpers.asset_url(attrs["file"])
                     if attrs["image"].present?
                       ActionController::Base.helpers.image_tag(attrs["file"], class: attrs["class"], style: attrs["style"])
@@ -32,7 +36,7 @@ module CamaleonCms::ShortCodeHelper
 
     shortcode_add("data",
                   lambda{|attrs, args|
-                    cama_shortcode_data(attrs, args) rescue ""
+                    attrs.present? ? (cama_shortcode_data(attrs, args) rescue "") : args[:shortcode]
                   },
                   "Permit to generate specific data of a post.
                   Attributes:
@@ -96,8 +100,7 @@ module CamaleonCms::ShortCodeHelper
   def do_shortcode(content, args = {})
     args = {owner: args} unless args.is_a?(Hash)
     content.scan(/#{cama_reg_shortcode}/) do |item|
-      shortcode, code, space, attrs = item
-      content = content.sub(shortcode, _eval_shortcode(code, attrs, args))
+      content = _cama_replace_shortcode(content, item, args)
     end
     content
   end
@@ -118,20 +121,35 @@ module CamaleonCms::ShortCodeHelper
   # render_shortcode("asda dasdasdas[owen a='1'] [bbb] sdasdas dasd as das[owen a=213]", "owen", lambda{|attrs, args| puts attrs; return "my test"; })
   def render_shortcode(text, key, template = nil)
     text.scan(/#{cama_reg_shortcode(key)}/).each do |item|
-      shortcode, code, space, attrs = item
-      text = text.sub(shortcode, _eval_shortcode(code, attrs, {}, template))
+      text = _cama_replace_shortcode(text, item, {}, template)
     end
     text
   end
 
   private
+  # helper to replace shortcodes adding support for closed shortcodes, sample: [title]my title[/title]
+  def _cama_replace_shortcode(content, item, args = {}, template = nil)
+    shortcode, code, attrs = item
+    close_code = "[/#{code}]"
+    if content.include?(close_code)
+      shortcode_bk = shortcode
+      tmp_content = content[content.index(shortcode)..-1]
+      shortcode =  tmp_content[0..(tmp_content.index(close_code) + close_code.size - 1)]
+      args[:shortcode_content] = shortcode.sub(shortcode_bk, '').sub(close_code, '')
+    end
+    args[:shortcode] = shortcode
+    args[:code] = code
+    content.sub(shortcode, _eval_shortcode(code, attrs, args, template))
+  end
+
   # create the regexpression for shortcodes
   # codes: (String) shortcode keys separated by |
   # sample: load_libraries|asset
   # if empty, codes will be replaced with all registered shortcodes
   # Return: (String) reg expression string
   def cama_reg_shortcode(codes = nil)
-    "(\\[(#{codes || (@_shortcodes || []).join("|")})(\s|\\]){0}(.*?)\\])"
+    # "(\\[(#{codes || (@_shortcodes || []).join("|")})(\s|\\]){0}(.*?)\\])" # doesn't support for similar names, like: [media] and [media_gallery]
+    "(\\[(#{codes || (@_shortcodes || []).join("|")})((\s)((?!\\]).)*|)\\])"
   end
 
   # determine the content to replace instead the shortcode

data/app/models/concerns/camaleon_cms/user_methods.rb

@@ -27,8 +27,6 @@ module CamaleonCms::UserMethods extend ActiveSupport::Concern
     # relations
 
     has_many :metas, ->{ where(object_class: 'User')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
-    has_many :user_relationships, class_name: "CamaleonCms::UserRelationship", foreign_key: :user_id, dependent: :destroy#,  inverse_of: :user
-    has_many :term_taxonomies, foreign_key: :term_taxonomy_id, class_name: "CamaleonCms::TermTaxonomy", through: :user_relationships, :source => :term_taxonomies
     has_many :all_posts, class_name: "CamaleonCms::Post"
 
     #scopes
@@ -86,11 +84,6 @@ module CamaleonCms::UserMethods extend ActiveSupport::Concern
     end
   end
 
-  # DEPRECATED, please use user.the_role
-  def roleText
-    User::ROLE[self.role]
-  end
-
   def created
     self.created_at.strftime('%d/%m/%Y %H:%M')
   end

data/app/uploaders/camaleon_cms_aws_uploader.rb

@@ -21,15 +21,12 @@ class CamaleonCmsAwsUploader < CamaleonCmsUploader
     objects
   end
 
-  def objects(prefix = '/')
+  def objects(prefix = '/', sort = 'created_at')
     if @aws_settings["inner_folder"].present?
       prefix = "#{@aws_settings["inner_folder"]}/#{prefix}".gsub('//', '/')
       prefix = prefix[0..-2] if prefix.end_with?('/')
     end
-
-    prefix = "/#{prefix}" unless prefix.starts_with?('/')
-    db = @current_site.get_meta(cache_key, nil) || browser_files
-    db[prefix.gsub('//', '/')] || {files: {}, folders: {}}
+    super(prefix, sort)
   end
 
   # parse an AWS file into custom file_object

data/app/uploaders/camaleon_cms_uploader.rb

@@ -18,10 +18,14 @@ class CamaleonCmsUploader
   # return all files structure, within folder prefix
   # return json like:
   # {files: {'file_name': {'name'=> 'a.jpg', key: '/test/a.jpg', url: '', url: '', size: '', format: '', thumb: 'thumb_url', type: '', created_at: '', dimension: '120x120'}}, folders: {'folder name' => {name: 'folder name', key: '/folder name', ...}}}
-  def objects(prefix = '/')
+  # sort: (String, default 'created_at'), accept for: created_at | name | size | type | format
+  def objects(prefix = '/', sort = 'created_at')
     prefix = "/#{prefix}" unless prefix.starts_with?('/')
     db = @current_site.get_meta(cache_key, nil) || browser_files
-    db[prefix.gsub('//', '/')] || {files: {}, folders: {}}
+    res = db[prefix.gsub('//', '/')] || {files: {}, folders: {}}
+    res[:files] = res[:files].sort_by{|k, v| v[sort] }.reverse.to_h
+    res[:folders] = res[:folders].sort_by{|k, v| v['name'] }.reverse.to_h
+    res
   end
 
   # clean cached of files structure saved into DB