camaleon_cms 2.4.5.1 → 2.4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85e1b055e6161ffaa93a6974f060af2f30d36d08
-  data.tar.gz: 52cd5e9b93f954eb2211bd743221aa7f27c7e42a
+  metadata.gz: bae6a1664516d32407adf0eaf0e3dfd429373592
+  data.tar.gz: ed92a67c425fb5388354f1886a5ab9fdfcaad92a
 SHA512:
-  metadata.gz: 22acb2602e5d8ea3f194be6d5923b61ea1fbef308b41e174ff619ee6e3e415f2f1d01af29669d668a6b6538121fd59f7e26aa10cbd04c701a7493369bc9839eb
-  data.tar.gz: a54d8e653a938354ba5ce9976cfe0096909686ea0822d9ea40a87e803d59b2c6593b038e631f3544a6808b95461c2d98e0b4510edea1bbb0722fb9af3cc5fc45
+  metadata.gz: c70de9d40fbdf31c47eacd42b76c66e907d1a478aa2ac5d41ec53bcc94b4cea30e6d6024aa29854a073c1dab218708849f6b0dc5995fa9ab315c6becab990348
+  data.tar.gz: 446f6d88e6fb65d1c348ae2ca634bc6ed8332d7645a1a32b7ab673ca4e11aa39e4cd4d2ad2878253241d554feb93ace5706bfa71afe81cc3c56566843bda253c

data/app/assets/javascripts/camaleon_cms/admin/_data.js

@@ -32,6 +32,10 @@ function cama_get_tinymce_settings(settings){
                 tinymce.triggerSave();
                 $('textarea#'+editor.id).trigger('change');
             });
+            
+            editor.on('PostProcess', function (ed) {
+                ed.content = ed.content.replace(/(<p><\/p>)/gi,'<br />');
+            });
 
             editor.addMenuItem('append_line', {
                 text: 'New line at the end',

data/app/assets/javascripts/camaleon_cms/admin/_post.js

@@ -110,6 +110,10 @@ function cama_init_post(obj) {
             var slug_tmp = null;
             $input_slug.slugify($this, {
                     change: function (slug) {
+                        if (slug == "") {
+                            // generate 5-length random character slug when slugify result is empty
+                            slug = Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 5);
+                        }
                         slug_tmp = slug;
                         set_slug(slug);
                     }
@@ -294,4 +298,4 @@ function cama_upload_feature_image(data) {
             $('#feature-image').show();
         }
     }, data));
-}
+}

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

@@ -55,6 +55,7 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
     params[:folder] = params[:folder].gsub("//", "/") if params[:folder].present?
     case params[:media_action]
       when "new_folder"
+        params[:folder] = slugify_folder(params[:folder])
         render partial: "render_folder_item", locals: { fname: params[:folder].split("/").last, folder: cama_uploader.add_folder(params[:folder])}
       when "del_folder"
         cama_uploader.delete_folder(params[:folder])

data/app/controllers/camaleon_cms/camaleon_controller.rb

@@ -26,7 +26,9 @@ class CamaleonCms::CamaleonController < ApplicationController
   after_action :cama_after_actions, except: [:render_error, :captcha]
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
+  # Skip forgery check on .js files located in /assets/ to avoid CORS errors
+  # caused by requests for non-existent files.
+  protect_from_forgery with: :exception, unless: -> { request.fullpath.match? /\A\/assets\/.*\.js\z/ }
   layout Proc.new { |controller| controller.request.xhr? ? false : 'default' }
   helper_method :current_user
 
@@ -125,7 +127,7 @@ class CamaleonCms::CamaleonController < ApplicationController
       end
     end
   end
-  
+
   unless ApplicationController.method_defined?(:current_user)
     def current_user
       cama_current_user

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -133,7 +133,12 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   def draft_render
     post_draft = current_site.posts.drafts.find(params[:draft_id])
     @object = post_draft
-    if can?(:update, post_draft)
+
+    # let a hook override the ability for certain roles see drafts
+    args = { permitted: false }
+    hooks_run("on_render_draft_permitted", args)
+
+    if args[:permitted] || can?(:update, post_draft)
       render_post(post_draft)
     else
       page_not_found
@@ -143,7 +148,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   # render a post
   # post_or_slug_or_id: slug_post | id post | post object
   # from_url: true/false => true (true, permit eval hooks "on_render_post")
-  def render_post(post_or_slug_or_id, from_url = false)
+  def render_post(post_or_slug_or_id, from_url = false, status = nil)
     if post_or_slug_or_id.is_a?(String) # slug
       @post = current_site.the_posts.find_by_slug(post_or_slug_or_id)
     elsif post_or_slug_or_id.is_a?(Integer) # id
@@ -187,7 +192,12 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       layout_ = meta_layout if meta_layout.present? && lookup_context.template_exists?("layouts/#{meta_layout}")
       r = {post: @post, post_type: @post_type, layout: layout_, render: r_file}
       hooks_run("on_render_post", r) if from_url
-      render r[:render], (!r[:layout].nil? ? {layout: r[:layout]} : {})
+      
+      if status.present?
+        render r[:render], (!r[:layout].nil? ? {layout: r[:layout], status: status} : {status: status})  
+      else
+        render r[:render], (!r[:layout].nil? ? {layout: r[:layout]} : {})
+      end
     end
   end
 
@@ -197,8 +207,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     if @_site_options[:error_404].present? # render a custom error page
       page_404 = current_site.posts.find(@_site_options[:error_404]) rescue ""
       if page_404.present?
-        page_404 = page_404.decorate
-        redirect_to page_404.the_url
+        render_post(page_404, false, :not_found)
         return
       end
     end

data/app/helpers/camaleon_cms/admin/application_helper.rb

@@ -26,10 +26,10 @@ module CamaleonCms::Admin::ApplicationHelper
     custom_class = will_paginate_options[:panel_class]
     will_paginate_options.delete(:panel_class)
     "<div class='row #{custom_class} pagination_panel cama_ajax_request'>
-        <div class='col-md-6'>
+        <div class='col-md-10'>
           #{will_paginate(items, will_paginate_options) rescue '' }
         </div>
-        <div class='col-md-6 text-right total-items'>
+        <div class='col-md-2 text-right total-items'>
           <strong>#{I18n.t('camaleon_cms.admin.table.total', default: 'Total')}: #{items.total_entries rescue items.count} </strong>
         </div>
     </div>"

data/app/helpers/camaleon_cms/admin/menus_helper.rb

@@ -169,8 +169,8 @@ module CamaleonCms::Admin::MenusHelper
   def _admin_menu_draw(items)
     res = []
     res  << "<ul class='treeview-menu'>"
-    items.each do |item|
-      res  << "<li class='#{"xn-openable" if item.has_key?(:items)} #{'active' if is_active_menu(item[:key])}' #{item[:datas]}>
+    items.each_with_index do |item, index|
+      res  << "<li class='#{"xn-openable" if item.has_key?(:items)} item_#{index + 1} #{'active' if is_active_menu(item[:key])}' #{item[:datas]}>
                 <a href='#{item[:url]}'><i class='fa fa-#{item[:icon]}'></i> #{item[:title]} #{'<i class="fa fa-angle-left pull-right"></i>' if item.has_key?(:items) }</a>
                 #{_admin_menu_draw(item[:items]) if item.has_key?(:items)}
               </li>"

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -281,6 +281,16 @@ module CamaleonCms::UploaderHelper
     }.call
   end
 
+  def slugify(val)
+    val.to_s.downcase.strip.gsub(' ', '-').gsub(/[^\w-]/, '')
+  end
+
+  def slugify_folder(val)
+    splitted_folder = val.split('/')
+    splitted_folder[-1] = slugify(splitted_folder.last)
+    splitted_folder.join('/')
+  end
+
   private
   # helper for resize and crop method
   def cama_crop_offsets_by_gravity(gravity, original_dimensions, cropped_dimensions)

data/app/models/camaleon_cms/post.rb

@@ -259,6 +259,7 @@ class CamaleonCms::Post < CamaleonCms::PostDefault
   private
   # calculate a post order when it is empty
   def fix_post_order
-    self.post_order = (post_type.posts.count) + 1
+    last_post = post_type.posts.where.not(id: nil).last
+    self.post_order = last_post.present? ? last_post.post_order + 1 : 1
   end
 end

data/app/views/camaleon_cms/admin/post_tags/_form.html.erb

@@ -1,4 +1,4 @@
-<% @post_tag = CamaleonCms::PostTag.new if @post_tag.nil? %>
+<% @post_tag = CamaleonCms::PostTag.new(parent_id: params[:post_type_id]) if @post_tag.nil? %>
 <%= form_for @post_tag, as: "post_tag", url:{action: @post_tag.new_record? ? :create : :update} , html:{class: 'validate-post-tag cama_ajax_request'} do |f| %>
     <%= f.hidden_field :parent_id  %>
     <%= f.hidden_field :taxonomy %>

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.5.1'
+  VERSION = '2.4.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.5.1
+  version: 2.4.5.2
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt