camaleon_cms 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4b0b30448fb0ace3c0211759a1cfa907b13e1be
-  data.tar.gz: 3405faac8eb44d08804b38be753f3f171906c707
+  metadata.gz: a1a20fa498412de4a487828a91854cfe77b7a84d
+  data.tar.gz: b593e384f3f368dc448d7f277d39434263dcec6f
 SHA512:
-  metadata.gz: 19575dfc1efe6398d203e9d69fe65b93bd5a189497396664e78d7f775ae1160651ba9c4de4a7a4d5d3b7b6ae4935c8654c9626656bd9457dd06bc45371e0ea8d
-  data.tar.gz: b58471054de0c1357569b8797279ec499cd873af0fd421d13b0e940f92f26ac6110285dcd3b497da2bc37d7e1d06298d57b1a4a50fd54e3d50d987b780b9e2d0
+  metadata.gz: 34d8cf7a34b944d2330e5c65d622346c506ea1701f378781b3171c5a306b74c3771802b3cc3c19a468a5636db46b8ebf3f3aad2cb0bc6c01148b393b6e306d9a
+  data.tar.gz: fa8b8e7054f8b9999e658d03b9f47e19bfcc7da777c2bc12aea4d8b1b8ee6d30ca781e596ef4827f068128868f75ee7d1c052e329d71bd2bd908a548ab558b84

data/Rakefile

@@ -14,24 +14,19 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-task default: :test
+task :default => :spec

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

@@ -61,7 +61,7 @@ function cama_build_custom_field(panel, field_data, values){
             field.prepend(field_actions);
             if(field_counter == 0) field.children('.actions').find('.fa-times').remove();
         }
-        field.find('input, textarea, select').each(function(){ $(this).attr('name', $(this).attr('name').replace('[]', '['+field_counter+']')) });
+        if(!$field.find('.group-input-fields-content').hasClass('cama_skip_cf_rename_multiple')) field.find('input, textarea, select').each(function(){ $(this).attr('name', $(this).attr('name').replace('[]', '['+field_counter+']')) });
         if(field_data.disabled){
             field.find('input, textarea, select').prop('readonly', true).filter('select').click(function(){ return false; }).focus(function(){ $(this).blur(); });
             field.find('.btn').addClass('disabled').unbind().click(function(){ return false; });
@@ -119,7 +119,6 @@ function custom_field_checkboxs_val($field, values) {
         var selector = values.map(function (value) {
             return "input[value='" + value + "']"
         }).join(',');
-        $field.find('input').prop('checked', false);
         $field.find(selector).prop('checked', true);
     }
 }

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

@@ -60,6 +60,7 @@ function cama_get_tinymce_settings(settings){
         },
         onPostRender: function(editor){}
     };
+    for(var ff in tinymce_global_settings["settings"]) tinymce_global_settings["settings"][ff](settings, def);
     return $.extend({}, def, settings);
 }
 

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

@@ -242,7 +242,7 @@ function init_post(obj) {
             if ($(this).valid()) $form.data("submitted", 1);
         });
         window.onbeforeunload = function () {
-            if ($form.data("submitted"))
+            if ($form.data("submitted") || $('#form-post').length == 0)
                 return;
             if ($form.data("hash") != get_hash_form()) {
                 return "You sure to leave the page without saving changes?";

data/app/assets/javascripts/camaleon_cms/admin/_posttype.js.coffee

@@ -0,0 +1,21 @@
+window['cama_init_posttype_form'] = ->
+  form = $("#post_type_form");
+  form.find('.unput_upload').input_upload();
+
+  # permit hierarchy route only for post types enabled "Manage page hierarchy"
+  form.find("[name='meta[has_parent_structure]']").change(->
+    item = form.find("#meta_contents_route_format_hierarchy_post");
+    item.parent().siblings().find("input").prop("disabled", $(this).is(":checked"))
+    if($(this).is(":checked"))
+      item.prop("checked", true).prop("disabled", false)
+    else
+      item.prop("disabled", true)
+  ).trigger("change")
+
+  form.find('[name="meta[has_picture]"]').change(->
+    items = form.find('.picture_settings input')
+    if($(this).is(":checked"))
+      items.prop("disabled", false)
+    else
+      items.prop("disabled", true)
+  ).trigger("change")

data/app/assets/javascripts/camaleon_cms/admin/admin-manifest.js

@@ -49,3 +49,5 @@
 // post
 //= require ./_jquery.tagsinput.min
 //= require ./_post
+
+//= require ./_posttype

data/app/assets/javascripts/camaleon_cms/admin/jquery_validate/fr.js

@@ -0,0 +1,49 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: FR (French; français)
+ */
+$.extend( $.validator.messages, {
+	required: "Ce champ est obligatoire.",
+	remote: "Veuillez corriger ce champ.",
+	email: "Veuillez fournir une adresse électronique valide.",
+	url: "Veuillez fournir une adresse URL valide.",
+	date: "Veuillez fournir une date valide.",
+	dateISO: "Veuillez fournir une date valide (ISO).",
+	number: "Veuillez fournir un numéro valide.",
+	digits: "Veuillez fournir seulement des chiffres.",
+	creditcard: "Veuillez fournir un numéro de carte de crédit valide.",
+	equalTo: "Veuillez fournir encore la même valeur.",
+	extension: "Veuillez fournir une valeur avec une extension valide.",
+	maxlength: $.validator.format( "Veuillez fournir au plus {0} caractères." ),
+	minlength: $.validator.format( "Veuillez fournir au moins {0} caractères." ),
+	rangelength: $.validator.format( "Veuillez fournir une valeur qui contient entre {0} et {1} caractères." ),
+	range: $.validator.format( "Veuillez fournir une valeur entre {0} et {1}." ),
+	max: $.validator.format( "Veuillez fournir une valeur inférieure ou égale à {0}." ),
+	min: $.validator.format( "Veuillez fournir une valeur supérieure ou égale à {0}." ),
+	maxWords: $.validator.format( "Veuillez fournir au plus {0} mots." ),
+	minWords: $.validator.format( "Veuillez fournir au moins {0} mots." ),
+	rangeWords: $.validator.format( "Veuillez fournir entre {0} et {1} mots." ),
+	letterswithbasicpunc: "Veuillez fournir seulement des lettres et des signes de ponctuation.",
+	alphanumeric: "Veuillez fournir seulement des lettres, nombres, espaces et soulignages.",
+	lettersonly: "Veuillez fournir seulement des lettres.",
+	nowhitespace: "Veuillez ne pas inscrire d'espaces blancs.",
+	ziprange: "Veuillez fournir un code postal entre 902xx-xxxx et 905-xx-xxxx.",
+	integer: "Veuillez fournir un nombre non décimal qui est positif ou négatif.",
+	vinUS: "Veuillez fournir un numéro d'identification du véhicule (VIN).",
+	dateITA: "Veuillez fournir une date valide.",
+	time: "Veuillez fournir une heure valide entre 00:00 et 23:59.",
+	phoneUS: "Veuillez fournir un numéro de téléphone valide.",
+	phoneUK: "Veuillez fournir un numéro de téléphone valide.",
+	mobileUK: "Veuillez fournir un numéro de téléphone mobile valide.",
+	strippedminlength: $.validator.format( "Veuillez fournir au moins {0} caractères." ),
+	email2: "Veuillez fournir une adresse électronique valide.",
+	url2: "Veuillez fournir une adresse URL valide.",
+	creditcardtypes: "Veuillez fournir un numéro de carte de crédit valide.",
+	ipv4: "Veuillez fournir une adresse IP v4 valide.",
+	ipv6: "Veuillez fournir une adresse IP v6 valide.",
+	require_from_group: "Veuillez fournir au moins {0} de ces champs.",
+	nifES: "Veuillez fournir un numéro NIF valide.",
+	nieES: "Veuillez fournir un numéro NIE valide.",
+	cifES: "Veuillez fournir un numéro CIF valide.",
+	postalCodeCA: "Veuillez fournir un code postal valide."
+} );

data/app/controllers/camaleon_cms/admin/appearances/nav_menus_controller.rb

@@ -53,7 +53,7 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
 
   def save_custom_settings
     @nav_menu_item = current_site.nav_menu_items.find(params[:id])
-    @nav_menu_item.set_field_values(params[:field_options])
+    @nav_menu_item.set_field_values(params.require(:field_options).permit!)
     render nothing: true
   end
 
@@ -66,8 +66,8 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
   def update_menu_item
     @nav_menu = current_site.nav_menus.find(params[:nav_menu_id])
     item = current_site.nav_menu_items.find(params[:id])
-    item.update_menu_item({label: params[:external_label], link: params[:external_url]})
-    item.set_options(params[:options]) if params[:options].present?
+    item.update_menu_item(parse_external_menu(params))
+    item.set_options(params.require(:options).permit!) if params[:options].present?
     render partial: 'menu_items', locals: {items: [item], nav_menu: @nav_menu}
   end
 
@@ -94,8 +94,8 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
     items = []
     @nav_menu = current_site.nav_menus.find(params[:nav_menu_id])
     if params[:external].present?
-      item = @nav_menu.append_menu_item({label: params[:external][:external_label], link: params[:external][:external_url], type: "external"})
-      item.set_options(params[:external][:options]) if params[:external][:options].present?
+      item = @nav_menu.append_menu_item(parse_external_menu(params[:external]))
+      item.set_options(params[:external].require(:options).permit!) if params[:external][:options].present?
       items << item
     end
 
@@ -145,6 +145,11 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
   helper_method :parse_menu_item
 
   def check_menu_permission
-    authorize! :manage, :menu
+    authorize! :manage, :nav_menu
+  end
+
+  # return params to be saved for external menu
+  def parse_external_menu(_params)
+    {label: _params[:external_label], link: _params[:external_url], type: "external", target: _params[:target]}
   end
 end

data/app/controllers/camaleon_cms/admin/appearances/themes_controller.rb

@@ -1,4 +1,5 @@
 class CamaleonCms::Admin::Appearances::ThemesController < CamaleonCms::AdminController
+  before_action :check_theme_permission
   # list themes or update a theme status
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.appearance")
   def index
@@ -20,4 +21,9 @@ class CamaleonCms::Admin::Appearances::ThemesController < CamaleonCms::AdminCont
   def preview
     render layout: false
   end
+
+  private
+  def check_theme_permission
+    authorize! :manage, :themes
+  end
 end

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

@@ -31,6 +31,9 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
 
   # render media for modal content
   def ajax
+    if current_site.get_option('file_actions_in_modals') == 'yes'
+      @show_file_actions = true
+    end
     @tree = cama_uploader.search(params[:search]) if params[:search].present?
     if params[:partial].present?
       render partial: "files_list", locals: { files: @tree[:files], folders: @tree[:folders] }

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

@@ -26,11 +26,13 @@ class CamaleonCms::Admin::UsersController < CamaleonCms::AdminController
   end
 
   def update
+    r={user: @user}; hooks_run('user_update', r)
     if @user.update(params.require(:user).permit!)
       @user.set_metas(params[:meta]) if params[:meta].present?
       @user.set_field_values(params[:field_options])
       r = {user: @user, message: t('camaleon_cms.admin.users.message.updated'), params: params}; hooks_run('user_after_edited', r)
       flash[:notice] = r[:message]
+      r={user: @user}; hooks_run('user_updated', r)
       if cama_current_user.id == @user.id
         redirect_to action: :profile_edit
       else
@@ -65,6 +67,7 @@ class CamaleonCms::Admin::UsersController < CamaleonCms::AdminController
   def create
     user_data = params.require(:user).permit!
     @user = current_site.users.new(user_data)
+    r={user: @user}; hooks_run('user_create', r)
     if @user.save
       @user.set_metas(params[:meta]) if params[:meta].present?
       @user.set_field_values(params[:field_options])

data/app/controllers/camaleon_cms/camaleon_controller.rb

@@ -28,6 +28,7 @@ class CamaleonCms::CamaleonController < ApplicationController
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
   layout Proc.new { |controller| controller.request.xhr? ? false : 'default' }
+  helper_method :current_user
 
   # show page error
   def render_error(status = 404, exception = nil, message = "")
@@ -109,4 +110,8 @@ class CamaleonCms::CamaleonController < ApplicationController
       end
     end
   end
+
+  def current_user
+    cama_current_user
+  end
 end

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -2,7 +2,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   before_action :init_frontent
   include CamaleonCms::FrontendConcern
   include CamaleonCms::Frontend::ApplicationHelper
-  layout Proc.new { |controller| params[:cama_ajax_request].present? ? "cama_ajax" : 'index' }
+  layout Proc.new { |controller| args = {layout: (params[:cama_ajax_request].present? ? "cama_ajax" : 'index'), controller: controller}; hooks_run("front_default_layout", args); args[:layout] }
   before_action :before_hooks
   after_action :after_hooks
   # rescue_from ActiveRecord::RecordNotFound, with: :page_not_found

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

@@ -28,7 +28,7 @@ module CamaleonCms::FrontendConcern extend ActiveSupport::Concern
   # save comment from a post
   def save_comment
     @post = current_site.posts.find_by_id(params[:post_id]).decorate
-    user = current_user
+    user = cama_current_user
     comment_data = {}
     if !user.present? && current_site.get_option('permit_anonimos_comment', false)
       user = current_site.get_anonymous_user

data/app/decorators/camaleon_cms/site_decorator.rb

@@ -187,7 +187,7 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
 
   # check if current user can manage sites
   def manage_sites?
-    self.main_site? && h.current_user.admin?
+    self.main_site? && h.cama_current_user.admin?
   end
 
   # return the text status of current site

data/app/decorators/camaleon_cms/user_decorator.rb

@@ -49,6 +49,10 @@ class CamaleonCms::UserDecorator < CamaleonCms::ApplicationDecorator
     h.current_site.posts.where(user_id: object.id)
   end
 
+  def self.object_class_name
+    'CamaleonCms::User'
+  end
+
   private
 
   def avatar_exists?

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

@@ -195,14 +195,14 @@ module CamaleonCms::Admin::CustomFieldsHelper
             {
                 type: 'text_box',
                 key: 'dimension',
-                label: t('camaleon_cms.admin.custom_field.fields.image_dimension', default: 'Dimension'),
-                description: t('camaleon_cms.admin.custom_field.fields.image_dimension_descr', default: 'Crop the image with indicated dimension (widthxheight), sample: 400x300 <br>Possible values: 400x300 | 400x | x300 | ?400x?500 | ?1400x (? => maximum, empty => auto)'),
+                label: cama_t('camaleon_cms.admin.custom_field.fields.image_dimension'),
+                description: cama_t('camaleon_cms.admin.custom_field.fields.image_dimension_descr'),
             },
             {
                 type: 'text_box',
                 key: 'versions',
-                label: t('camaleon_cms.admin.custom_field.fields.image_versions_descr', default: 'Versions'),
-                description: t('camaleon_cms.admin.custom_field.fields.image_versions_descr', default: 'Create addtional multiple versions of the image uploaded, sample: \'300x300,505x350\' ==> Will create two extra images with these dimensions')
+                label: cama_t('camaleon_cms.admin.custom_field.fields.image_versions'),
+                description: cama_t('camaleon_cms.admin.custom_field.fields.image_versions_descr')
             }
         ]
     }

data/app/helpers/camaleon_cms/camaleon_helper.rb

@@ -74,4 +74,9 @@ module CamaleonCms::CamaleonHelper
     @_cama_timer = Time.current
   end
 
+  # return normal translation with default value with translation of english
+  def cama_t(key, args = {})
+    args[:default] = I18n.t(key, args.dup.merge(locale: :en)) unless args[:default].present?
+    I18n.t(key, args)
+  end
 end

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

@@ -90,7 +90,7 @@ module CamaleonCms::Frontend::NavMenuHelper
       parent_current = true if _is_current || current_children
 
       html += "<#{_args[:item_container]} #{r[:item_container_attrs]} class='#{_args[:item_class]} #{_args[:item_class_parent] if has_children} #{"#{_args[:item_current]}" if _is_current} #{"current-menu-ancestor" if current_children }'>#{_args[:link_before]}
-                <a #{r[:link_attrs]} href='#{data_nav_item[:link]}' class='#{args[:link_current] if _is_current} #{_args[:link_class_parent] if has_children} #{_args[:link_class]}' #{"data-toggle='dropdown'" if has_children } >#{_args[:before]}#{data_nav_item[:name]}#{_args[:after]}</a> #{_args[:link_after]}
+                <a #{r[:link_attrs]} #{" target='#{nav_menu_item.target}'" if nav_menu_item.target.present?} href='#{data_nav_item[:link]}' class='#{args[:link_current] if _is_current} #{_args[:link_class_parent] if has_children} #{_args[:link_class]}' #{"data-toggle='dropdown'" if has_children } >#{_args[:before]}#{data_nav_item[:name]}#{_args[:after]}</a> #{_args[:link_after]}
                 #{ html_children }
               </#{_args[:item_container]}>"
       index += 1
@@ -110,7 +110,7 @@ module CamaleonCms::Frontend::NavMenuHelper
   # internal_level: ingnore (managed by internal recursion)
   def cama_menu_parse_items(items, max_levels=-1, internal_level=0)
     res, is_current_parent, levels = [], false, [0]
-    items.each_with_index do |nav_menu_item, index|
+    items.reorder(:term_order).each_with_index do |nav_menu_item, index|
       data_nav_item = _get_link_nav_menu(nav_menu_item)
       next if data_nav_item == false
       _is_current = data_nav_item[:current] || site_current_path == data_nav_item[:link] || site_current_path == data_nav_item[:link].sub(".html", "")
@@ -129,7 +129,7 @@ module CamaleonCms::Frontend::NavMenuHelper
       }.merge(data_nav_item.except(:current, :name, :link))
 
       if has_children
-        r[:children], _is_current_parent, r[:levels] = cama_menu_parse_items(nav_menu_item.children.reorder(:term_order), max_levels, internal_level + 1)
+        r[:children], _is_current_parent, r[:levels] = cama_menu_parse_items(nav_menu_item.children, max_levels, internal_level + 1)
         if _is_current_parent
           is_current_parent = true
           r[:current_parent] = true
@@ -176,13 +176,12 @@ module CamaleonCms::Frontend::NavMenuHelper
 
   private
   def _get_link_nav_menu(nav_menu_item)
-    type_menu = nav_menu_item.kind
+    type_menu, r = nav_menu_item.kind, false
     begin
       case type_menu
         when 'post'
           post = CamaleonCms::Post.find(nav_menu_item.url).decorate
-          return false unless post.can_visit?
-          r = {link: post.the_url(as_path: true), name: post.the_title, type_menu: type_menu, current: @cama_visited_post.present? && @cama_visited_post.id == post.id}
+          r = {link: post.the_url(as_path: true), name: post.the_title, type_menu: type_menu, current: @cama_visited_post.present? && @cama_visited_post.id == post.id} if post.can_visit?
         when 'category'
           category = CamaleonCms::Category.find(nav_menu_item.url).decorate
           r = {link: category.the_url(as_path: true), name: category.the_title, type_menu: type_menu, current: @cama_visited_category.present? && @cama_visited_category.id == category.id}
@@ -197,25 +196,26 @@ module CamaleonCms::Frontend::NavMenuHelper
           r[:link] = cama_root_path if r[:link] == "root_url"
           r[:link] = site_current_path if site_current_path == "#{current_site.the_path}#{r[:link]}"
           r[:current] = r[:link] == site_current_url || r[:link] == site_current_path
+
           # permit to customize or mark as current menu
           # _args: (HASH) {menu_item: Model Menu Item, parsed_menu: Parsed Menu }
           #   Sample parsed_menu: {link: "url of the link", name: "Text of the menu", type_menu: 'external', current: Boolean (true => is current menu, false => not current menu item)}
           _args = {menu_item: nav_menu_item, parsed_menu: r};  hooks_run("on_external_menu", _args)
           r = _args[:parsed_menu]
-          return false if _args[:parsed_menu] == false
-
-        else
-          return false
       end
     rescue => e
       puts "-------------------------- menu item error: #{e.message}"
-      return false
     end
 
-    # permit to mark as a current menu custom paths
-    # sample: @cama_current_menu_path = '/my_section'
-    # sample2: @cama_current_menu_path = ['/my_section', '/mi_seccion'] # multi language support
-    r[:current] = true if @cama_current_menu_path.present? && !r[:current] && (@cama_current_menu_path.is_a?(String) ? @cama_current_menu_path == r[:link] : @cama_current_menu_path.include?(r[:link]))
-    r
+    if r != false
+      # permit to mark as a current menu custom paths
+      # sample: @cama_current_menu_path = '/my_section'
+      # sample2: @cama_current_menu_path = ['/my_section', '/mi_seccion'] # multi language support
+      r[:current] = true if @cama_current_menu_path.present? && !r[:current] && (@cama_current_menu_path.is_a?(String) ? @cama_current_menu_path == r[:link] : @cama_current_menu_path.include?(r[:link]))
+    end
+
+    # permit to customize data of parsed menu item or skip menu item by assigning false into :parsed_menu
+    _args = {menu_item: nav_menu_item, parsed_menu: r};  hooks_run("on_render_front_menu_item", _args)
+    _args[:parsed_menu]
   end
 end

data/app/helpers/camaleon_cms/hooks_helper.rb

@@ -31,12 +31,18 @@ module CamaleonCms::HooksHelper
     plugin["hooks"][hook_key].each do |hook|
       next if @_hooks_skip.present? && @_hooks_skip.include?(hook)
       begin
-        send(hook, params) unless params.nil?
-        send(hook) if params.nil?
+        if params.nil?
+          send(hook)
+        else
+          send(hook, params)
+        end
       rescue
         plugin_load_helpers(plugin)
-        send(hook, params) unless params.nil?
-        send(hook) if params.nil?
+        if params.nil?
+          send(hook)
+        else
+          send(hook, params)
+        end
       end
     end
   end