camaleon_cms 0.2.1 → 1.0

data/app/controllers/admin/plugins_controller.rb

@@ -46,8 +46,8 @@ class Admin::PluginsController < AdminController
   end
 
   private
+
   def validate_role
     authorize! :manager, :plugins
   end
-
-end
+end

data/app/controllers/admin/post_tags_controller.rb

@@ -7,20 +7,16 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class Admin::PostTagsController < AdminController
-
   before_action :set_post_type
   before_action :set_post_tag, only: ['show','edit','update','destroy']
 
   def index
-
     @post_tags = @post_type.post_tags
 
     @post_tags = @post_tags.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
-
   end
 
   def show
-
   end
 
   def edit
@@ -28,7 +24,6 @@ class Admin::PostTagsController < AdminController
   end
 
   def update
-
     if @post_tag.update(params[:post_tag])
       @post_tag.set_options_from_form(params[:meta]) if params[:meta].present?
       flash[:notice] = t('admin.post_type.message.updated')
@@ -38,7 +33,6 @@ class Admin::PostTagsController < AdminController
     end
   end
 
-
   def create
     data_term = params[:post_tag]
     @post_tag = @post_type.post_tags.new(data_term)
@@ -57,27 +51,24 @@ class Admin::PostTagsController < AdminController
     redirect_to action: :index
   end
 
-
   def list
     @post_tags = @post_type.post_tags.pluck("name")
     render json: @post_tags
   end
-  private
 
+  private
 
   def set_post_type
-      @post_type = current_site.post_types.find_by_id(params[:post_type_id])
-      authorize! :post_tags, @post_type
+    @post_type = current_site.post_types.find_by_id(params[:post_type_id])
+    authorize! :post_tags, @post_type
   end
 
   def set_post_tag
-      begin
-        @post_tag = @post_type.post_tags.find_by_id(params[:id])
-      rescue
-        flash[:error] = t('admin.post_type.message.error')
-        redirect_to admin_path
-      end
-
+    begin
+      @post_tag = @post_type.post_tags.find_by_id(params[:id])
+    rescue
+      flash[:error] = t('admin.post_type.message.error')
+      redirect_to admin_path
+    end
   end
-
 end

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

@@ -7,9 +7,6 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class Admin::Posts::DraftsController < Admin::PostsController
-
-  #skip_before_filter :admin_init_settings
-
   def index
     render json: @post_type
   end
@@ -37,7 +34,6 @@ class Admin::Posts::DraftsController < Admin::PostsController
     render json: msg
   end
 
-
   def update
     post_data = get_params_data
     post_data[:data_tags] = params[:tags].to_s
@@ -57,20 +53,16 @@ class Admin::Posts::DraftsController < Admin::PostsController
     render json: msg
   end
 
-
   def destroy
-
   end
 
   private
+
   def get_params_data
     post_data = params[:post]
     post_data[:status] = 'draft'
-    post_data[:comment_count] = 0
     post_data[:post_parent] = params[:post_id]
     post_data[:user_id] = current_user.id unless post_data[:user_id].present?
     post_data
   end
-
-
 end

data/app/controllers/admin/posts_controller.rb

@@ -7,12 +7,10 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class Admin::PostsController < AdminController
-
   before_action :set_post_type, :except => [:ajax]
   before_action :set_post, only: ['show','edit','update','destroy']
   skip_before_filter :admin_logged_actions, only: [:trash, :restore, :destroy, :ajax]
   skip_before_filter :verify_authenticity_token, only: [:ajax]
-  #http_basic_authenticate_with name: "dhh", password: "secret", except: [:index, :show]
 
   def index
     authorize! :posts, @post_type
@@ -44,7 +42,6 @@ class Admin::PostsController < AdminController
   end
 
   def show
-
   end
 
   def new
@@ -131,13 +128,14 @@ class Admin::PostsController < AdminController
     authorize! :update, @post
     @post.update_column('status', @post.options[:status_default] || 'pending')
     @post.update_extra_data
-    flash[:notice] =  t('admin.post.message.restore', post_type: @post_type.decorate.the_title)
+    flash[:notice] = t('admin.post.message.restore', post_type: @post_type.decorate.the_title)
     redirect_to action: :index, s: params[:s]
   end
 
   def destroy
     authorize! :destroy, @post
-    r={post: @post, post_type: @post_type, flag: true}; hooks_run("destroy_post", r)
+    r = {post: @post, post_type: @post_type, flag: true}
+    hooks_run("destroy_post", r)
     if r[:flag]
       @post.destroy
       hooks_run("destroy_post", {post: @post, post_type: @post_type})
@@ -163,12 +161,11 @@ class Admin::PostsController < AdminController
         end
         json = {slug: slug, index: i}
     end
-
-
     render json: json
   end
 
   private
+
   def set_post_type
       @post_type = current_site.post_types.find_by_id(params[:post_type_id] )
       unless @post_type.present?
@@ -177,19 +174,19 @@ class Admin::PostsController < AdminController
       end
     @post_type = @post_type.decorate
   end
+
   def set_post
-      begin
-        @post = @post_type.posts.find(params[:id])
-        @post_decorate = @post.decorate
-      rescue
-        flash[:error] =  t('admin.post.message.error', post_type: @post_type.decorate.the_title)
-        redirect_to admin_path
-      end
+    begin
+      @post = @post_type.posts.find(params[:id])
+      @post_decorate = @post.decorate
+    rescue
+      flash[:error] =  t('admin.post.message.error', post_type: @post_type.decorate.the_title)
+      redirect_to admin_path
+    end
   end
 
   # valid slug post
   def _exist_slug?(slug, post_id)
     current_site.posts.where("posts.slug LIKE ? OR posts.slug = ?",  "%-->#{slug}<!--%", slug).where("posts.status != 'draft'").where(post_parent: nil).where.not(id: post_id).present?
   end
-
 end

data/app/controllers/admin/sessions_controller.rb

@@ -30,7 +30,7 @@ class Admin::SessionsController < CamaleonController
     r = {user: @user, params: params, password: data_user[:password], captcha_validate: captcha_validate}; hooks_run("user_before_login", r)
     if captcha_validate && @user &&  @user.authenticate(data_user[:password])
       captcha_reset_attack("login")
-      login_user(@user)
+      login_user(@user, params[:remember_me].present?)
     else
       captcha_increment_attack("login")
       if captcha_validate
@@ -78,6 +78,7 @@ class Admin::SessionsController < CamaleonController
       end
     end
 
+    # TODO: Move this out of the controller
     # send email reset password
     if params[:user].present?
       data_user = params[:user]
@@ -90,7 +91,7 @@ class Admin::SessionsController < CamaleonController
         html = "<p>#{t('admin.login.message.hello')}, <b>#{@user.fullname}</b></p>
             <p>#{t('admin.login.message.reset_url')}:</p>
             <p><a href='#{reset_url}'><b>#{reset_url}</b></a></p> "
-        sendmail(@user.email,t('admin.login.message.subject_email'),html)
+        sendmail(@user.email,t('admin.login.message.subject_email'), html)
 
         flash[:notice] = t('admin.login.message.send_mail_succes')
         redirect_to admin_login_path
@@ -100,7 +101,6 @@ class Admin::SessionsController < CamaleonController
         @user = current_site.users.new(data_user)
       end
     end
-
   end
 
   def register
@@ -128,17 +128,16 @@ class Admin::SessionsController < CamaleonController
     else
       render "register"
     end
-
-    return
   end
 
   private
+
   def before_hook_session
     I18n.locale = params[:locale] || current_site.get_languages.first
     hooks_run("session_before_load")
-    end
+  end
+
   def after_hook_session
     hooks_run("session_after_load")
   end
-
 end

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

@@ -8,23 +8,20 @@
 =end
 class Admin::Settings::CustomFieldsController < Admin::SettingsController
   include Admin::CustomFieldsHelper
-  #before_action :set_post_type
   before_action :set_custom_field_group, only: ['show','edit','update','destroy']
 
   def index
     @field_groups = current_site.custom_field_groups.visible_group
-    @field_groups = @field_groups.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
+    @field_groups = @field_groups.paginate(page: params[:page], per_page: current_site.admin_per_page)
   end
 
   def get_items
-
     @key = params[:key]
 
     render layout: false
   end
 
   def show
-
   end
 
   def edit
@@ -58,7 +55,7 @@ class Admin::Settings::CustomFieldsController < Admin::SettingsController
     if @field_group.save
       @field_group.add_fields(params[:fields], params[:field_options])
       @field_group.set_option('caption', post_data[:caption])
-      flash[:notice] =  t('admin.custom_field.message.custom_created')
+      flash[:notice] = t('admin.custom_field.message.custom_created')
       redirect_to action: :edit, id: @field_group.id
     else
       render 'form'
@@ -77,7 +74,7 @@ class Admin::Settings::CustomFieldsController < Admin::SettingsController
     params[:values].to_a.each_with_index do |value, index|
       current_site.custom_field_groups.find(value).update_column('field_order', index)
     end
-    json = {size: params[:values].size}
+    json = { size: params[:values].size }
     render json: json
   end
 
@@ -87,10 +84,8 @@ class Admin::Settings::CustomFieldsController < Admin::SettingsController
     begin
       @field_group = current_site.custom_field_groups.find(params[:id])
     rescue
-      flash[:error] =  t('admin.custom_field.message.custom_group_error')
+      flash[:error] = t('admin.custom_field.message.custom_group_error')
       redirect_to admin_path
     end
-
   end
-
 end

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

@@ -7,28 +7,22 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class Admin::Settings::PostTypesController < Admin::SettingsController
-
   before_action :set_post_type, only: ['show','edit','update','destroy']
 
   def index
-
     @post_types = current_site.post_types
 
     @post_types = @post_types.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
-
   end
 
   def show
-
   end
 
   def edit
     admin_breadcrumb_add("#{t('admin.button.edit')}")
   end
 
-
   def update
-
     if @post_type.update(params[:post_type])
       @post_type.set_options_from_form(params[:meta]) if params[:meta].present?
       flash[:notice] = t('admin.post_type.message.updated')
@@ -38,7 +32,6 @@ class Admin::Settings::PostTypesController < Admin::SettingsController
     end
   end
 
-
   def create
     data_term = params[:post_type]
     @post_type = current_site.post_types.new(data_term)
@@ -59,15 +52,12 @@ class Admin::Settings::PostTypesController < Admin::SettingsController
 
   private
 
-
   def set_post_type
-      begin
-        @post_type = current_site.post_types.find_by_id(params[:id])
-      rescue
-        flash[:error] = t('admin.post_type.message.error')
-        redirect_to admin_path
-      end
-
+    begin
+      @post_type = current_site.post_types.find_by_id(params[:id])
+    rescue
+      flash[:error] = t('admin.post_type.message.error')
+      redirect_to admin_path
+    end
   end
-
 end

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

@@ -10,15 +10,14 @@ class Admin::Settings::SitesController < Admin::SettingsController
   before_action :set_site, only: ['show','edit','update','destroy']
   before_action :check_shared_status
   def index
-     @sites = Site.all.order(:term_group)
-     @sites = @sites.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
-     r={sites: @sites, render: "index"}; hooks_run("list_site", r)
+    @sites = Site.all.order(:term_group)
+    @sites = @sites.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
+    r = { sites: @sites, render: "index" }
+    hooks_run("list_site", r)
     render r[:render]
   end
 
-
   def show
-
   end
 
   def edit
@@ -60,6 +59,7 @@ class Admin::Settings::SitesController < Admin::SettingsController
   end
 
   private
+
   def save_metas(site)
     if params[:metas].present?
       params[:metas].each do |meta, val|
@@ -84,6 +84,4 @@ class Admin::Settings::SitesController < Admin::SettingsController
       redirect_to admin_path
     end
   end
-
-
 end

data/app/controllers/admin/settings_controller.rb

@@ -8,7 +8,6 @@
 =end
 class Admin::SettingsController < AdminController
   before_action :validate_role
-  #http_basic_authenticate_with name: "dhh", password: "secret", except: [:index, :show]
 
   def index
     redirect_to admin_dashboard_path
@@ -16,7 +15,6 @@ class Admin::SettingsController < AdminController
 
   def site
     @site = current_site
-
   end
 
   def site_saved
@@ -37,7 +35,6 @@ class Admin::SettingsController < AdminController
 
   # list available languages
   def languages
-
   end
 
   # save language customizations
@@ -56,5 +53,4 @@ class Admin::SettingsController < AdminController
   def validate_role
     authorize! :manager, :settings
   end
-
 end

data/app/controllers/admin/user_roles_controller.rb

@@ -60,17 +60,17 @@ class Admin::UserRolesController < AdminController
   end
 
   private
+
   def validate_role
     authorize! :manager, :users
   end
-  def set_user_roles
-      begin
-        @user_role = current_site.user_roles.find(params[:id])
-      rescue
-        flash[:error] = t('admin.users.message.rol_error')
-        redirect_to action: :index
-      end
 
+  def set_user_roles
+    begin
+      @user_role = current_site.user_roles.find(params[:id])
+    rescue
+      flash[:error] = t('admin.users.message.rol_error')
+      redirect_to action: :index
+    end
   end
-
 end