camaleon_cms 2.4.3.5 → 2.4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a70abf6d23b59ecc47fdf7666258242f837fe8af
-  data.tar.gz: 3e1bc98690fd647da857231f85be2f9bb844d2e1
+  metadata.gz: 6b264403b317f1fc7b159a14442421358ab80d98
+  data.tar.gz: bd2ddf3797fc12138f8d0080767ae8517af75e36
 SHA512:
-  metadata.gz: 4fba30af329005cdbfd531987208ee1d763b7d80be12b5b44f2a0e00fb13ac50b941c17bbda2a80361272fab3ecad728acc92e6e94c7623bbc64abd37badae14
-  data.tar.gz: 8c31ce3068330cd538ac544e5a641b4171c9ee80011e443d5a203ff5f9633e0643743be3db1c24cf40f94c2a49972d0d44d646e667a54d0e54bf8d18f0c06ba3
+  metadata.gz: 7e739c3983fb4c3cb399f1c53ac56505821fb810468af2e014c8e413d0be7f9362a8b0a18c02d73a2691ba8fd75522b1dd45909fb5dda600a1f3e6cfc87d75fc
+  data.tar.gz: b668dba2056ce6b4daa25b149a876316f0143e8c15a98730ab6b255b966d9488cea61d09629b1436378896e65a317cd4e1c23c071152ed5e6eb3e350fb862479

data/README.md

@@ -46,15 +46,15 @@
   
   Add in your Gemfile draper for Rails 5
   ```
-  gem 'draper', github: 'drapergem/draper'
+  gem 'draper', '~> 3'
   ```
-  In your Gemfile, change sass-rails into (Camaleon doesn't support for sprockets >= 4 which is included in sass-rails >= 6)
+  Be careful with sass-rails, recommended v5 (Camaleon doesn't support for sprockets >= 4 which is included in sass-rails 6)
   ```
   gem 'sass-rails', '~> 5.0'
   ```
-  Add this configuration to your config/application.rb
+  Update bundle
   ```
-  config.active_record.belongs_to_required_by_default = false
+  bundle update
   ```
   
 * Install required Gem and dependencies
@@ -172,7 +172,7 @@ http://camaleon.tuzitio.com/license.html
 RAILS_ENV=test bundle exec rake app:db:migrate
 RAILS_ENV=test bundle exec rake app:db:test:prepare
 ```
-* Configure/Install Poltergaist and change your phanthomjs path in spec/spec_helper.rb
+* Configure/Install Poltergeist and change your phanthomjs path in spec/spec_helper.rb
 
 * Run testing
 ```

data/app/assets/javascripts/camaleon_cms/admin/jquery.validate.js

@@ -5,8 +5,7 @@
 
 //***************customization*****************/
 // jquery custom validations and default values
-(function ($) {
-
+jQuery(function(){
     // file formats
     $.file_formats = {
         jpg: "image",
@@ -120,4 +119,5 @@
     jQuery.validator.addClassRules({
         file_format: {file_format: true}
     });
-})(jQuery);
+    $('form.cama_form_validate').validate();
+});

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/zh-CN.js

@@ -129,6 +129,15 @@ tinymce.addI18n('zh-CN',{
 "Poster": "\u5c01\u9762",
 "Alternative source": "\u955c\u50cf",
 "Paste your embed code below:": "\u5c06\u5185\u5d4c\u4ee3\u7801\u7c98\u8d34\u5728\u4e0b\u9762:",
+"Insert file": "插入文件",
+"Media": "媒体文件",
+"Image": "图片",
+"Link": "链接",
+"New line at the end": "在末尾插入新行",
+"New line": "新行",
+"Date/time": "日期/时间",
+"Template": "模板",
+"Insert/edit media": "插入/编辑媒体文件",
 "Insert video": "\u63d2\u5165\u89c6\u9891",
 "Embed": "\u5185\u5d4c",
 "Nonbreaking space": "\u4e0d\u95f4\u65ad\u7a7a\u683c",
@@ -216,4 +225,4 @@ tinymce.addI18n('zh-CN',{
 "View": "\u89c6\u56fe",
 "Table": "\u8868\u683c",
 "Format": "\u683c\u5f0f"
-});
+});

data/app/assets/stylesheets/camaleon_cms/admin/uploader/_uploadfile.css.scss

@@ -10,6 +10,11 @@
   padding: 5px 5px 5px 15px
 }
 
+.ajax-file-upload-filename {
+  overflow: auto;
+  max-width: 100%;
+}
+
 .ajax-file-upload-filesize {
 width: 50px;
 height: auto;
@@ -20,7 +25,7 @@ vertical-align:middle;
 .ajax-file-upload-progress {
 margin: 5px 10px 5px 0px;
 position: relative;
-width: 250px;
+width: 98%;
 border: 1px solid #ddd;
 padding: 1px;
 border-radius: 3px;
@@ -221,6 +226,13 @@ margin: 5px 10px 5px 0px;
           font-size: 120px;
         }
       }
+      .p_label {
+        span {
+          overflow: auto;
+          max-width: 100%;
+          display: inline-block;
+        }
+      }
       .p_footer{
         border-top: 1px solid #ccc;
         margin-top: 12px;
@@ -241,4 +253,4 @@ margin: 5px 10px 5px 0px;
       width: 100% !important;
     }
   }
-}
+}

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

@@ -55,7 +55,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.require(:field_options).permit!)
-    render nothing: true
+    head :ok
   end
 
   # render edit external menu item
@@ -75,7 +75,7 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
   def delete_menu_item
     # @nav_menu = current_site.nav_menus.find(params[:nav_menu_id])
     current_site.nav_menu_items.find(params[:id]).destroy
-    render nothing: true
+    head :ok
   end
 
   # update the reorder of items
@@ -102,7 +102,8 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
 
     if params[:custom_items].present? # custom menu items
       params[:custom_items].each do |index, item|
-        item = @nav_menu.append_menu_item({label: item['label'], link: item['url'], type: item['kind'] || 'external'})
+        type = item['kind'].present? ? item['kind'] : 'external'
+        item = @nav_menu.append_menu_item({label: item['label'], link: item['url'], type: type})
         items << item
       end
     end

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

@@ -17,9 +17,12 @@ class CamaleonCms::Admin::CategoriesController < CamaleonCms::AdminController
   end
 
   def update
+    hooks_run("update_category", {category: @category, post_type: @post_type})
+
     if @category.update(params.require(:category).permit!)
       @category.set_options(params[:meta])
       @category.set_field_values(params[:field_options])
+      hooks_run("updated_category", {category: @category, post_type: @post_type})
       flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
       redirect_to action: :index
     else

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

@@ -1,3 +1,4 @@
+require 'will_paginate/array'
 class CamaleonCms::Admin::CommentsController < CamaleonCms::AdminController
   include CamaleonCms::CommentHelper
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.comments"), :cama_admin_comments_url

data/app/controllers/camaleon_cms/admin/posts/drafts_controller.rb

@@ -48,7 +48,7 @@ class CamaleonCms::Admin::Posts::DraftsController < CamaleonCms::Admin::PostsCon
     post_data = params.require(:post).permit!
     post_data.delete(:created_at) unless params[:post][:created_at].present?
     post_data.delete(:updated_at) unless params[:post][:updated_at].present?
-    post_data[:status] = 'draft'
+    post_data[:status] = 'draft_child'
     post_data[:post_parent] = params[:post_id]
     post_data[:user_id] = cama_current_user.id unless post_data[:user_id].present?
     post_data[:data_tags] = params[:tags].to_s

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

@@ -35,14 +35,15 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     @lists_tab = params[:s]
     add_breadcrumb I18n.t("camaleon_cms.admin.post_type.#{params[:s]}") if params[:s].present?
     case params[:s]
-      when "published", "pending", "draft", "trash"
-        @posts = @posts.where(status:  params[:s])
-
+      when "published", "pending", "trash"
+        @posts = @posts.send(params[:s])
+      when "draft"
+        @posts = @posts.drafts
       when "all"
         @posts = @posts.no_trash
     end
 
-    @btns = {published: "#{t('camaleon_cms.admin.post_type.published')} (#{posts_all.where(status: "published").size})", all: "#{t('camaleon_cms.admin.post_type.all')} (#{posts_all.no_trash.size})", pending: "#{t('camaleon_cms.admin.post_type.pending')} (#{posts_all.where(status: "pending").size})", draft: "#{t('camaleon_cms.admin.post_type.draft')} (#{posts_all.where(status: "draft").size})", trash: "#{t('camaleon_cms.admin.post_type.trash')} (#{posts_all.where(status: "trash").size})"}
+    @btns = {published: "#{t('camaleon_cms.admin.post_type.published')} (#{posts_all.published.size})", all: "#{t('camaleon_cms.admin.post_type.all')} (#{posts_all.no_trash.size})", pending: "#{t('camaleon_cms.admin.post_type.pending')} (#{posts_all.pending.size})", draft: "#{t('camaleon_cms.admin.post_type.draft')} (#{posts_all.drafts.size})", trash: "#{t('camaleon_cms.admin.post_type.trash')} (#{posts_all.trash.size})"}
     r = {posts: @posts, post_type: @post_type, btns: @btns, all_posts: posts_all, render: 'index', per_page: per_page }
     hooks_run("list_post", r)
     per_page = 9999999 if @post_type.manage_hierarchy?
@@ -91,13 +92,24 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
   end
 
   def update
-    @post = @post.parent if @post.draft? && @post.parent.present?
-    authorize! :update, @post
-    @post.drafts.destroy_all
     post_data = get_post_data
+    delete_drafts = false
+    if @post.draft_child? && @post.parent.present?
+      # This is a draft (as a child of the original post)
+      original_parent = @post.parent.parent
+      post_data[:post_parent] = original_parent.present? ? original_parent.id : nil
+      @post = @post.parent
+      delete_drafts = true
+    elsif @post.draft?
+      # This is a normal draft (post whose status was set to 'draft')
+      @post.status = 'published' if post_data[:status].blank?
+    end
+    authorize! :update, @post
     r = {post: @post, post_type: @post_type}; hooks_run("update_post", r)
     @post = r[:post]
     if @post.update(post_data)
+      # delete drafts only on successful update operation
+      @post.drafts.destroy_all if delete_drafts
       @post.set_metas(params[:meta])
       @post.set_field_values(params[:field_options])
       @post.set_options(params[:options])
@@ -116,6 +128,7 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     # @post.children.destroy_all unless @post.draft? TODO: why delete children?
     @post.update_column('status', 'trash')
     @post.update_extra_data
+    hooks_run("trashed_post", {post: @post, post_type: @post_type})
     flash[:notice] = t('camaleon_cms.admin.post.message.trash', post_type: @post_type.decorate.the_title)
     redirect_to action: :index, s: params[:s]
   end
@@ -125,6 +138,7 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     authorize! :update, @post
     @post.update_column('status', @post.options[:status_default] || 'pending')
     @post.update_extra_data
+    hooks_run("restored_post", {post: @post, post_type: @post_type})
     flash[:notice] = t('camaleon_cms.admin.post.message.restore', post_type: @post_type.decorate.the_title)
     redirect_to action: :index, s: params[:s]
   end

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

@@ -18,8 +18,6 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
 
   def login_post
     data_user = user_permit_data
-    cipher = Gibberish::AES::CBC.new(cama_get_session_id)
-    data_user[:password] = cipher.decrypt(data_user[:password]) rescue nil
     @user = current_site.users.by_username(data_user[:username]).first
     captcha_validate = captcha_verify_if_under_attack("login")
     r = {user: @user, params: params, password: data_user[:password], captcha_validate: captcha_validate, stop_process: false}; hooks_run("user_before_login", r)

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

@@ -68,7 +68,7 @@ class CamaleonCms::Admin::SettingsController < CamaleonCms::AdminController
   def test_email
     begin
       CamaleonCms::HtmlMailer.sender(params[:email], 'Test', {content: 'Test content'}).deliver_now
-      render nothing: true
+      head :ok
     rescue => e
       render inline: e.message, status: 502
     end

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

@@ -27,7 +27,7 @@ class CamaleonCms::Admin::UsersController < CamaleonCms::AdminController
 
   def update
     r={user: @user}; hooks_run('user_update', r)
-    if @user.update(params.require(:user).permit!)
+    if @user.update(user_params)
       @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)
@@ -80,7 +80,9 @@ class CamaleonCms::Admin::UsersController < CamaleonCms::AdminController
   end
 
   def destroy
-    if @user.destroy
+    if current_user.id == @user.id
+      flash[:error] = t('camaleon_cms.admin.users.message.user_can_not_delete_own_account', default: 'User can not delete own account')
+    elsif @user.destroy
       flash[:notice] = t('camaleon_cms.admin.users.message.deleted')
       r={user: @user}; hooks_run('user_destroyed', r)
     end
@@ -99,7 +101,16 @@ class CamaleonCms::Admin::UsersController < CamaleonCms::AdminController
   end
 
   def user_id_param
-    user_params = params[:id] || params[:user_id]
+    params[:id] || params[:user_id]
+  end
+
+  def user_params
+    parameters = params.require(:user)
+    if current_user.role_grantor?(@user)
+      parameters.permit(:username, :email, :role, :first_name, :last_name)
+    else
+      parameters.permit(:username, :email, :first_name, :last_name)
+    end
   end
 
   def set_user

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -156,7 +156,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       if params[:format] == 'html' || !params[:format].present?
         page_not_found()
       else
-        render nothing: true, status: 404
+        head 404
       end
     else
       @post = @post.decorate

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

@@ -31,14 +31,14 @@ module CamaleonCms::FrontendConcern extend ActiveSupport::Concern
     @post = current_site.posts.find_by_id(params[:post_id]).decorate
     user = cama_current_user
     comment_data = {}
-    if !user.present? && current_site.get_option('permit_anonimos_comment', false)
+    if user.present?
+      comment_data[:author] = user.fullname
+      comment_data[:author_email] = user.email
+    elsif current_site.get_option('permit_anonimos_comment', false)
       user = current_site.get_anonymous_user
       comment_data[:is_anonymous] = true
       comment_data[:author] = params[:post_comment][:name]
       comment_data[:author_email] = params[:post_comment][:email]
-    else
-      comment_data[:author] = user.fullname
-      comment_data[:author_email] = user.email
     end
 
     if @post.can_commented? && user.present?

data/app/decorators/camaleon_cms/application_decorator.rb

@@ -26,7 +26,7 @@ class CamaleonCms::ApplicationDecorator < Draper::Decorator
 
   # return updated at date formatted
   def the_updated_at(format = :long)
-    h.l(object.created_at, format: format.to_sym)
+    h.l(object.updated_at, format: format.to_sym)
   end
 
   # draw breadcrumb for this model

data/app/decorators/camaleon_cms/post_decorator.rb

@@ -150,7 +150,7 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
       when "published"
         color = "info"
         status = I18n.t('camaleon_cms.admin.post_type.published', default: 'Published')
-      when "draft"
+      when "draft", "draft_child"
         color = "warning"
         status = I18n.t('camaleon_cms.admin.table.draft', default: 'Draft')
       when "trash"
@@ -227,7 +227,7 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
   # return all related posts of current post
   def the_related_posts
     ptype = self.the_post_type
-    ptype.the_posts.joins(:categories).where("#{CamaleonCms::TermRelationship.table_name}" => {term_taxonomy_id: the_categories.pluck(:id)})
+    ptype.the_posts.joins(:categories).where("#{CamaleonCms::TermRelationship.table_name}" => {term_taxonomy_id: the_categories.pluck(:id)}).distinct
   end
 
   # fix for "Using Draper::Decorator without inferred source class"

data/app/decorators/camaleon_cms/post_type_decorator.rb

@@ -10,7 +10,9 @@ class CamaleonCms::PostTypeDecorator < CamaleonCms::TermTaxonomyDecorator
     args[:locale] = get_locale unless args.include?(:locale)
     args[:format] = args[:format] || "html"
     as_path = args.delete(:as_path)
-    h.cama_url_to_fixed("cama_post_type_#{self.id}_#{as_path.present? ? "path" : "url"}", args)
+    route = "cama_post_type_#{self.id}_#{as_path.present? ? "path" : "url"}"
+    PluginRoutes.reload unless Rails.application.routes.url_helpers.method_defined?(route.to_sym)
+    h.cama_url_to_fixed(route, args)
   end
 
   # return the public url with group structure

data/app/decorators/camaleon_cms/user_decorator.rb

@@ -51,6 +51,10 @@ class CamaleonCms::UserDecorator < CamaleonCms::ApplicationDecorator
     h.current_site.posts.where(user_id: object.id)
   end
 
+  def role_grantor?(other_user)
+    h.can?(:manage, :users) && id != other_user.id
+  end
+
   def self.object_class_name
     'CamaleonCms::User'
   end

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

@@ -30,7 +30,7 @@ module CamaleonCms::Admin::ApplicationHelper
           #{will_paginate(items, will_paginate_options) rescue '' }
         </div>
         <div class='col-md-6 text-right total-items'>
-          <strong>Total: #{items.total_entries rescue items.count} </strong>
+          <strong>#{I18n.t('camaleon_cms.admin.table.total', default: 'Total')}: #{items.total_entries rescue items.count} </strong>
         </div>
     </div>"
   end

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

@@ -42,7 +42,7 @@ module CamaleonCms::Admin::CustomFieldsHelper
     }
     items[:radio] = {
         key: 'radio',
-        label: 'Radio',
+        label: t('camaleon_cms.admin.custom_field.fields.radio', default: 'Radio'),
         options: {
             required: true,
             multiple: false,
@@ -57,7 +57,7 @@ module CamaleonCms::Admin::CustomFieldsHelper
 
     items[:checkbox] = {
         key: 'checkbox',
-        label: 'Checkbox',
+        label: t('camaleon_cms.admin.custom_field.fields.checkbox', default: 'Checkbox'),
         options: {
             required: true,
             multiple: false,
@@ -67,7 +67,7 @@ module CamaleonCms::Admin::CustomFieldsHelper
     }
     items[:checkboxes] = {
         key: 'checkboxes',
-        label: 'Checkboxes',
+        label: t('camaleon_cms.admin.custom_field.fields.checkboxes', default: 'Checkboxes'),
         options: {
             required: false,
             multiple: false,
@@ -80,7 +80,7 @@ module CamaleonCms::Admin::CustomFieldsHelper
     }
     items[:audio] = {
         key: 'audio',
-        label: 'Audio',
+        label: t('camaleon_cms.admin.custom_field.fields.audio', default: 'Audio'),
         options: {
             required: true,
             multiple: true,
@@ -147,7 +147,7 @@ module CamaleonCms::Admin::CustomFieldsHelper
     }
     items[:editor] = {
         key: 'editor',
-        label: 'Editor',
+        label: t('camaleon_cms.admin.custom_field.fields.editor', default: 'Editor'),
         options: {
             required: false,
             multiple: true,
@@ -229,7 +229,7 @@ module CamaleonCms::Admin::CustomFieldsHelper
     }
     items[:url] = {
         key: 'url',
-        label: 'URL',
+        label: t('camaleon_cms.admin.custom_field.fields.url', default: 'URL'),
         options: {
             required: true,
             multiple: true,
@@ -240,7 +240,7 @@ module CamaleonCms::Admin::CustomFieldsHelper
     }
     items[:video] = {
         key: 'video',
-        label: 'Video',
+        label: t('camaleon_cms.admin.custom_field.fields.video', default: 'Video'),
         options: {
             required: true,
             multiple: true,
@@ -292,7 +292,7 @@ module CamaleonCms::Admin::CustomFieldsHelper
             multiple: true
         }
     }
-    
+
     # evaluate the content of command value on listing
     # sample command: options_from_collection_for_select(current_site.the_posts("commerce").decorate, :id, :the_title)
     items[:select_eval] = {