camaleon_cms 2.0.1 → 2.0.2

data/app/controllers/camaleon_cms/admin/appearances/widgets/assign_controller.rb

@@ -8,16 +8,16 @@
 =end
 class CamaleonCms::Admin::Appearances::Widgets::AssignController < CamaleonCms::AdminController
   before_action :check_permission_role
+  before_action :find_sidebar
+  before_action :find_assigned_sidebar, only: [:update, :destroy]
+
   def new
-    @sidebar = current_site.sidebars.find(params[:sidebar_id])
     @widget = current_site.widgets.find(params[:widget_id])
     @assigned = @sidebar.assigned.create!({title: "Default", widget_id: @widget.id})
     render partial: "form", locals: {assigned: @assigned, widget: @widget, sidebar: @sidebar}, layout: "camaleon_cms/admin/ajax"
   end
 
   def update
-    @sidebar = current_site.sidebars.find(params[:sidebar_id])
-    @assigned = @sidebar.assigned.find(params[:id])
     if @assigned.update(params[:assign])
       @assigned.set_field_values(params[:field_options])
       flash[:notice] = t('camaleon_cms.admin.widgets.assign.updated')
@@ -28,11 +28,20 @@ class CamaleonCms::Admin::Appearances::Widgets::AssignController < CamaleonCms::
   end
 
   def destroy
-    current_site.sidebars.find(params[:sidebar_id]).assigned.find(params[:id]).destroy
+    @assigned.destroy
     render inline: ''
   end
 
   private
+
+  def find_sidebar
+    @sidebar = current_site.sidebars.find(params[:sidebar_id])
+  end
+
+  def find_assigned_sidebar
+    @assigned = @sidebar.assigned.find(params[:id])
+  end
+
   def check_permission_role
     authorize! :manager, :widgets
   end

data/app/controllers/camaleon_cms/admin/appearances/widgets/main_controller.rb

@@ -8,6 +8,7 @@
 =end
 class CamaleonCms::Admin::Appearances::Widgets::MainController < CamaleonCms::AdminController
   before_action :check_permission_role
+  before_action :set_widgets, only: [:edit, :update, :destroy]
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.appearance")
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.widgets")
 
@@ -21,7 +22,6 @@ class CamaleonCms::Admin::Appearances::Widgets::MainController < CamaleonCms::Ad
   end
 
   def edit
-    @widget = current_site.widgets.find(params[:id])
     new
   end
 
@@ -37,7 +37,6 @@ class CamaleonCms::Admin::Appearances::Widgets::MainController < CamaleonCms::Ad
   end
 
   def update
-    @widget = current_site.widgets.find(params[:id])
     if @widget.update!(params[:widget_main])
       flash[:notice] = t('camaleon_cms.admin.widgets.message.updated')
     else
@@ -47,13 +46,18 @@ class CamaleonCms::Admin::Appearances::Widgets::MainController < CamaleonCms::Ad
   end
 
   def destroy
-    @widget = current_site.widgets.find(params[:id]).destroy!
+    @widget = @widget.destroy!
     flash[:notice] = t('camaleon_cms.admin.widgets.message.deleted')
     redirect_to action: :index
   end
 
   private
+
+  def set_widgets
+    @widget = current_site.widgets.find(params[:id])
+  end
+
   def check_permission_role
     authorize! :manager, :widgets
   end
-end
+end

data/app/controllers/camaleon_cms/admin/appearances/widgets/sidebar_controller.rb

@@ -8,6 +8,7 @@
 =end
 class CamaleonCms::Admin::Appearances::Widgets::SidebarController < CamaleonCms::AdminController
   before_action :check_permission_role
+  before_action :set_sidebar, only: [:edit, :update, :destroy]
 
   def new
     @sidebar ||= current_site.sidebars.new
@@ -25,12 +26,11 @@ class CamaleonCms::Admin::Appearances::Widgets::SidebarController < CamaleonCms:
   end
 
   def edit
-    @sidebar = current_site.sidebars.find(params[:id])
     new
   end
 
   def update
-    if current_site.sidebars.find(params[:id]).update(params[:widget_sidebar])
+    if @sidebar.update(params[:widget_sidebar])
       flash[:notice] = t('camaleon_cms.admin.widgets.sidebar.updated')
     else
       flash[:error] = t('camaleon_cms.admin.widgets.sidebar.error_updated')
@@ -46,12 +46,17 @@ class CamaleonCms::Admin::Appearances::Widgets::SidebarController < CamaleonCms:
   end
 
   def destroy
-    @sidebar = current_site.sidebars.find(params[:id]).destroy
+    @sidebar = @sidebar.destroy
     flash[:notice] = t('camaleon_cms.admin.widgets.sidebar.error_deleted')
     redirect_to cama_admin_appearances_widgets_main_index_path
   end
 
   private
+
+  def set_sidebar
+    @sidebar = current_site.sidebars.find(params[:id])
+  end
+
   def check_permission_role
     authorize! :manager, :widgets
   end

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

@@ -7,24 +7,21 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::Admin::Posts::DraftsController < CamaleonCms::Admin::PostsController
+  before_action :set_post_data_params, only: [:create, :update]
+
   def index
     render json: @post_type
   end
 
   def create
-    post_data = get_params_data
-    post_data[:data_tags] = params[:tags].to_s
-    post_data[:data_categories] = params[:categories] || []
     if params[:post_id].present?
       @post_draft = CamaleonCms::Post.drafts.where(post_parent: params[:post_id]).first
-      @post_draft.attributes = post_data if @post_draft.present?
+      @post_draft.attributes = @post_data if @post_draft.present?
     end
-    @post_draft = @post_type.posts.new(post_data) unless @post_draft.present?
+    @post_draft = @post_type.posts.new(@post_data) unless @post_draft.present?
     r = {post: @post_draft, post_type: ""}; hooks_run("create_post", r)
     if @post_draft.save(:validate => false)
-      @post_draft.set_meta_from_form(params[:meta])
-      @post_draft.set_field_values(params[:field_options])
-      @post_draft.set_option("keywords", post_data[:keywords])
+      @post_draft.set_params(params[:meta], params[:field_options], @post_data[:keywords])
       msg = {draft: {id: @post_draft.id}, _drafts_path: cama_admin_post_type_draft_path(@post_type.id, @post_draft)}
       r = {post: @post_draft, post_type: ""}; hooks_run("created_post", r)
     else
@@ -35,16 +32,11 @@ class CamaleonCms::Admin::Posts::DraftsController < CamaleonCms::Admin::PostsCon
   end
 
   def update
-    post_data = get_params_data
-    post_data[:data_tags] = params[:tags].to_s
-    post_data[:data_categories] = params[:categories] || []
     @post_draft = CamaleonCms::Post.drafts.find(params[:id])
-    @post_draft.attributes = post_data
+    @post_draft.attributes = @post_data
     r = {post: @post_draft, post_type: ""}; hooks_run("update_post", r)
     if @post_draft.save(validate: false)
-      @post_draft.set_meta_from_form(params[:meta])
-      @post_draft.set_field_values(params[:field_options])
-      @post_draft.set_option("keywords", post_data[:keywords])
+      @post_draft.set_params(params[:meta], params[:field_options], @post_data[:keywords])
       hooks_run("updated_post", {post: @post_draft, post_type: ""})
       msg = {draft: {id: @post_draft.id}}
     else
@@ -57,12 +49,13 @@ class CamaleonCms::Admin::Posts::DraftsController < CamaleonCms::Admin::PostsCon
   end
 
   private
-
-  def get_params_data
+  def set_post_data_params
     post_data = params[:post]
     post_data[:status] = 'draft'
     post_data[:post_parent] = params[:post_id]
     post_data[:user_id] = cama_current_user.id unless post_data[:user_id].present?
-    post_data
+    post_data[:data_tags] = params[:tags].to_s
+    post_data[:data_categories] = params[:categories] || []
+    @post_data = post_data
   end
 end

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

@@ -15,7 +15,7 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
 
   def index
     authorize! :posts, @post_type
-    posts_all = @post_type.posts
+    posts_all = @post_type.posts.eager_load(:parent, :post_type)
     if params[:taxonomy].present? && params[:taxonomy_id].present?
       if params[:taxonomy] == "category"
         cat_owner = current_site.full_categories.find(params[:taxonomy_id]).decorate
@@ -33,7 +33,7 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     end
 
     if params[:q].present?
-      posts_all = posts_all.where(params[:q].map{|text| "#{CamaleonCms::Post.table_name}.title LIKE '%#{text}%'" }.join(" OR "))
+      posts_all = posts_all.where(params[:q].split(" ").map{|text| "#{CamaleonCms::Post.table_name}.title LIKE '%#{text}%'" }.join(" OR "))
     end
 
     @posts = posts_all
@@ -69,13 +69,7 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
 
   def create
     authorize! :create_post, @post_type
-
-    post_data = params[:post]
-    post_data[:user_id] = cama_current_user.id
-    post_data[:status] == 'pending' if post_data[:status] == 'published' && cannot?(:publish_post, @post_type)
-    post_data[:data_tags] = params[:tags].to_s
-    post_data[:data_categories] = params[:categories] || []
-
+    post_data = get_post_data(true)
     CamaleonCms::Post.drafts.find(post_data[:draft_id]).destroy rescue nil
     @post = @post_type.posts.create(post_data)
     r = {post: @post, post_type: @post_type}; hooks_run("create_post", r)
@@ -104,14 +98,8 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
   def update
     @post = @post.parent if @post.draft? && @post.parent.present?
     authorize! :update, @post
-
     @post.drafts.destroy_all
-
-    post_data = params[:post]
-    post_data[:post_parent] = nil
-    post_data[:status] == 'pending' if post_data[:status] == 'published' && cannot?(:publish_post, @post_type)
-    post_data[:data_tags] = params[:tags].to_s
-    post_data[:data_categories] = params[:categories] || []
+    post_data = get_post_data
     r = {post: @post, post_type: @post_type}; hooks_run("update_post", r)
     @post = r[:post]
     if @post.update(post_data)
@@ -122,7 +110,6 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
       flash[:notice] = t('camaleon_cms.admin.post.message.updated', post_type: @post_type.decorate.the_title)
       redirect_to action: :edit, id: @post.id
     else
-      # render 'form'
       edit
     end
   end
@@ -202,6 +189,18 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     end
   end
 
+  # return common params data for posts
+  # is_create: indicate if this info is for create a new post
+  def get_post_data(is_create = false)
+    post_data = params[:post]
+    post_data[:post_parent] = nil
+    post_data[:user_id] = cama_current_user.id if is_create
+    post_data[:status] == 'pending' if post_data[:status] == 'published' && cannot?(:publish_post, @post_type)
+    post_data[:data_tags] = params[:tags].to_s
+    post_data[:data_categories] = params[:categories] || []
+    post_data
+  end
+
   # valid slug post
   def _exist_slug?(slug, post_id)
     current_site.posts.where("#{CamaleonCms::Post.table_name}.slug LIKE ? OR #{CamaleonCms::Post.table_name}.slug = ?",  "%-->#{slug}<!--%", slug).where("#{CamaleonCms::Post.table_name}.status != 'draft'").where(post_parent: nil).where.not(id: post_id).present?

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

@@ -33,7 +33,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
     return if r[:stop_process] # permit to redirect for data completion
     if captcha_validate && @user && @user.authenticate(data_user[:password])
       cama_captcha_reset_attack("login")
-      r={user: @user, redirect_to: nil }; hooks_run('after_login', r)
+      r={user: @user, redirect_to: nil}; hooks_run('after_login', r)
       login_user(@user, params[:remember_me].present?, r[:redirect_to])
     else
       cama_captcha_increment_attack("login")
@@ -111,27 +111,21 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
     if params[:user].present?
       params[:user][:role] = PluginRoutes.system_info["default_user_role"]
       user_data = params[:user]
-      @user = current_site.users.new(user_data)
-      r = {user: @user, params: params}; hooks_run('user_before_register', r)
-
-      if current_site.security_user_register_captcha_enabled? && !cama_captcha_verified?
+      result = cama_register_user(user_data, params[:meta])
+      if result[:result] == false && result[:type] == :captcha_error
         @first_name = params[:meta][:first_name]
         @last_name = params[:meta][:last_name]
 
         @user.errors[:captcha] = t('camaleon_cms.admin.users.message.error_captcha')
         render 'register'
+      elsif result[:result]
+        flash[:notice] = result[:message]
+        r = {user: @user, redirect_url: result[:redirect_url]}; hooks_run('user_registered', r)
+        redirect_to r[:redirect_url]
       else
-        if @user.save
-          @user.set_meta_from_form(params[:meta])
-          r = {user: @user, message: t('camaleon_cms.admin.users.message.created'), redirect_url: cama_admin_login_path}; hooks_run('user_after_register', r)
-          flash[:notice] = r[:message]
-          r={user: @user}; hooks_run('user_registered', r)
-          redirect_to r[:redirect_url]
-        else
-          @first_name = params[:meta][:first_name]
-          @last_name = params[:meta][:last_name]
-          render 'register'
-        end
+        @first_name = params[:meta][:first_name]
+        @last_name = params[:meta][:last_name]
+        render 'register'
       end
     else
       render 'register'

data/app/controllers/camaleon_cms/admin/settings/custom_fields_controller.rb

@@ -9,10 +9,13 @@
 class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin::SettingsController
   include CamaleonCms::Admin::CustomFieldsHelper
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.custom_fields"), :cama_admin_settings_custom_fields_path
-  before_action :set_custom_field_group, only: ['show','edit','update','destroy']
+  before_action :set_custom_field_group, only: [:show,:edit,:update,:destroy]
+  before_action :set_post_data, only: [:create, :update]
 
   def index
-    @field_groups = current_site.custom_field_groups.visible_group
+    @field_groups = current_site.custom_field_groups.visible_group.eager_load(:site)
+    @field_groups = @field_groups.where(object_class: params[:c]) if params[:c].present?
+    @field_groups = @field_groups.where(objectid: params[:id]) if params[:id].present?
     @field_groups = @field_groups.paginate(page: params[:page], per_page: current_site.admin_per_page)
   end
 
@@ -30,11 +33,9 @@ class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin:
   end
 
   def update
-    post_data = params[:custom_field_group]
-    post_data[:object_class], post_data[:objectid] = post_data[:assign_group].split(',')
-    if @field_group.update(post_data)
+    if @field_group.update(@post_data)
       @field_group.add_fields(params[:fields], params[:field_options])
-      @field_group.set_option('caption', post_data[:caption])
+      @field_group.set_option('caption', @post_data[:caption])
       flash[:notice] = t('camaleon_cms.admin.custom_field.message.custom_updated')
       redirect_to action: :edit, id: @field_group.id
     else
@@ -50,12 +51,10 @@ class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin:
 
   # create a new custom field group
   def create
-    post_data = params[:custom_field_group]
-    post_data[:object_class], post_data[:objectid] = post_data[:assign_group].split(',')
-    @field_group = current_site.custom_field_groups.new(post_data)
+    @field_group = current_site.custom_field_groups.new(@post_data)
     if @field_group.save
       @field_group.add_fields(params[:fields], params[:field_options])
-      @field_group.set_option('caption', post_data[:caption])
+      @field_group.set_option('caption', @post_data[:caption])
       flash[:notice] = t('camaleon_cms.admin.custom_field.message.custom_created')
       redirect_to action: :edit, id: @field_group.id
     else
@@ -81,6 +80,11 @@ class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin:
 
   private
 
+  def set_post_data
+    @post_data = params[:custom_field_group]
+    @post_data[:object_class], @post_data[:objectid] = @post_data[:assign_group].split(',')
+  end
+
   def set_custom_field_group
     begin
       @field_group = current_site.custom_field_groups.find(params[:id])

data/app/controllers/camaleon_cms/admin/settings/post_types_controller.rb

@@ -7,7 +7,8 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::Admin::Settings::PostTypesController < CamaleonCms::Admin::SettingsController
-  before_action :set_post_type, only: ['show','edit','update','destroy']
+  before_action :set_post_type, only: [:show,:edit,:update, :destroy]
+  before_action :set_data_term, only: [:create, :update]
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.content_groups"), :cama_admin_settings_post_types_path
 
   def index
@@ -24,9 +25,7 @@ class CamaleonCms::Admin::Settings::PostTypesController < CamaleonCms::Admin::Se
   end
 
   def update
-    data_term = params[:post_type]
-    data_term[:data_options] = params[:meta]
-    if @post_type.update(params[:post_type])
+    if @post_type.update(@data_term)
       flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
       redirect_to action: :index
     else
@@ -35,9 +34,7 @@ class CamaleonCms::Admin::Settings::PostTypesController < CamaleonCms::Admin::Se
   end
 
   def create
-    data_term = params[:post_type]
-    data_term[:data_options] = params[:meta]
-    @post_type = current_site.post_types.new(data_term)
+    @post_type = current_site.post_types.new(@data_term)
     if @post_type.save
       flash[:notice] = t('camaleon_cms.admin.post_type.message.created')
       redirect_to action: :index
@@ -53,6 +50,12 @@ class CamaleonCms::Admin::Settings::PostTypesController < CamaleonCms::Admin::Se
 
   private
 
+  def set_data_term
+    data_term = params[:post_type]
+    data_term[:data_options] = params[:meta]
+    @data_term = data_term
+  end
+
   def set_post_type
     begin
       @post_type = current_site.post_types.find_by_id(params[:id])

data/app/controllers/camaleon_cms/admin/settings/sites_controller.rb

@@ -7,9 +7,10 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::Admin::Settings::SitesController < CamaleonCms::Admin::SettingsController
-  before_action :set_site, only: ['show','edit','update','destroy']
+  before_action :set_site, only: [:show, :edit, :update, :destroy]
   before_action :check_shared_status
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.sites"), :cama_admin_settings_sites_path
+
   def index
     @sites = CamaleonCms::Site.all.order(:term_group)
     @sites = @sites.paginate(:page => params[:page], :per_page => current_site.admin_per_page)

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -11,8 +11,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   prepend_before_action :init_frontent
   prepend_before_action :cama_site_check_existence
   include CamaleonCms::Frontend::ApplicationHelper
-
-  layout "index"
+  layout Proc.new { |controller| params[:cama_ajax_request].present? ? "cama_ajax" : 'index' }
 
   before_action :before_hooks
   after_action :after_hooks
@@ -43,7 +42,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     cama_init_seo(@category)
     @children = @category.children.no_empty.decorate
     @posts = @category.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
-    r_file = lookup_context.template_exists?(@category.the_slug, "categories") ? "categories/#{@category.the_slug}" : "category"
+    r_file = lookup_context.template_exists?("categories/#{@category.the_slug}") ? "categories/#{@category.the_slug}" : "category"
     layout_ = lookup_context.template_exists?("layouts/categories/#{@category.the_slug}") ? "categories/#{@category.the_slug}" : (self.send :_layout)
     r = {category: @category, layout: layout_, render: r_file}; hooks_run("on_render_category", r)
     render r[:render], layout: r[:layout]
@@ -61,7 +60,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     @posts = @post_type.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
     @categories = @post_type.categories.no_empty.eager_load(:metas).decorate
     @post_tags = @post_type.post_tags.eager_load(:metas)
-    r_file = lookup_context.template_exists?(@post_type.the_slug, "post_types") ? "post_types/#{@post_type.the_slug}" : "post_type"
+    r_file = lookup_context.template_exists?("post_types/#{@post_type.the_slug}") ? "post_types/#{@post_type.the_slug}" : "post_type"
     layout_ = lookup_context.template_exists?("layouts/post_types/#{@post_type.the_slug}") ? "post_types/#{@post_type.the_slug}" : (self.send :_layout)
     r = {post_type: @post_type, layout: layout_, render: r_file};  hooks_run("on_render_post_type", r)
     render r[:render], layout: r[:layout]
@@ -78,7 +77,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     @cama_visited_tag = @post_tag
     cama_init_seo(@post_tag)
     @posts = @post_tag.the_posts.paginate(:page => params[:page], :per_page => current_site.front_per_page).eager_load(:metas)
-    r_file = lookup_context.template_exists?(@post_tag.the_slug, "post_tags") ? "post_tags/#{@post_tag.the_slug}" : "post_tag"
+    r_file = lookup_context.template_exists?("post_tags/#{@post_tag.the_slug}") ? "post_tags/#{@post_tag.the_slug}" : "post_tag"
     layout_ = lookup_context.template_exists?("layouts/post_tags/#{@post_tag.the_slug}") ? "post_tags/#{@post_tag.the_slug}" : (self.send :_layout)
     r = {post_tag: @post_tag, layout: layout_, render: r_file}; hooks_run("on_render_post_tag", r)
     render r[:render], layout: r[:layout]
@@ -90,7 +89,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     @cama_visited_search = params[:q]
     layout_ = lookup_context.template_exists?("layouts/search") ? "search" : (self.send :_layout)
     r = {layout: layout_, render: "search", posts: nil}; hooks_run("on_render_search", r)
-    @posts = r[:posts].present? ? r[:posts] : current_site.the_posts.where("title LIKE ? OR content_filtered LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%")
+    @posts = r[:posts] != nil ? r[:posts] : current_site.the_posts.where("title LIKE ? OR content_filtered LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%")
     @posts_size = @posts.size
     @posts = @posts.paginate(:page => params[:page], :per_page => current_site.front_per_page)
     render r[:render], layout: r[:layout]
@@ -165,10 +164,10 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       @categories = @post.the_categories
       @post.increment_visits!
       home_page = @_site_options[:home_page] rescue nil
-      if @post.get_template(@post_type).present? && lookup_context.template_exists?(@post.get_template(@post_type))
-        r_file = @post.get_template(@post_type)
-      elsif lookup_context.template_exists?("page_#{@post.id}")
+      if lookup_context.template_exists?("page_#{@post.id}")
         r_file = "page_#{@post.id}"
+      elsif @post.get_template(@post_type).present? && lookup_context.template_exists?(@post.get_template(@post_type))
+        r_file = @post.get_template(@post_type)
       elsif home_page.present? && @post.id.to_s == home_page
         r_file = "index"
       elsif lookup_context.template_exists?("#{@post_type.slug}")