camaleon_cms 1.1.0 → 2.0.1

data/app/controllers/{admin → camaleon_cms/admin}/settings/custom_fields_controller.rb

@@ -6,8 +6,9 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-class Admin::Settings::CustomFieldsController < Admin::SettingsController
-  include Admin::CustomFieldsHelper
+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']
 
   def index
@@ -17,15 +18,14 @@ class Admin::Settings::CustomFieldsController < Admin::SettingsController
 
   def get_items
     @key = params[:key]
-
-    render layout: false
+    render partial: "get_items", layout: false
   end
 
   def show
   end
 
   def edit
-    admin_breadcrumb_add("#{t('admin.button.edit')}")
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.edit")
     render 'form'
   end
 
@@ -35,7 +35,7 @@ class Admin::Settings::CustomFieldsController < Admin::SettingsController
     if @field_group.update(post_data)
       @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_updated')
+      flash[:notice] = t('camaleon_cms.admin.custom_field.message.custom_updated')
       redirect_to action: :edit, id: @field_group.id
     else
       render 'form'
@@ -43,7 +43,8 @@ class Admin::Settings::CustomFieldsController < Admin::SettingsController
   end
 
   def new
-    @field_group = current_site.custom_field_groups.new
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.new")
+    @field_group ||= current_site.custom_field_groups.new
     render 'form'
   end
 
@@ -55,17 +56,17 @@ 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('camaleon_cms.admin.custom_field.message.custom_created')
       redirect_to action: :edit, id: @field_group.id
     else
-      render 'form'
+      new
     end
   end
 
   # destroy a custom field group
   def destroy
     @field_group.destroy
-
+    flash[:notice] = t('camaleon_cms.admin.custom_field.message.deleted', default: "Custom Field Group Deleted.")
     redirect_to action: :index
   end
 
@@ -84,8 +85,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')
-      redirect_to admin_path
+      flash[:error] = t('camaleon_cms.admin.custom_field.message.custom_group_error')
+      redirect_to cama_admin_path
     end
   end
 end

data/app/controllers/{admin → camaleon_cms/admin}/settings/post_types_controller.rb

@@ -6,47 +6,48 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-class Admin::Settings::PostTypesController < Admin::SettingsController
+class CamaleonCms::Admin::Settings::PostTypesController < CamaleonCms::Admin::SettingsController
   before_action :set_post_type, only: ['show','edit','update','destroy']
+  add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.content_groups"), :cama_admin_settings_post_types_path
 
   def index
     @post_types = current_site.post_types
-
     @post_types = @post_types.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
+    render "index"
   end
 
   def show
   end
 
   def edit
-    admin_breadcrumb_add("#{t('admin.button.edit')}")
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.edit")
   end
 
   def update
+    data_term = params[:post_type]
+    data_term[:data_options] = params[:meta]
     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')
+      flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
       redirect_to action: :index
     else
-      render 'edit'
+      edit
     end
   end
 
   def create
     data_term = params[:post_type]
+    data_term[:data_options] = params[:meta]
     @post_type = current_site.post_types.new(data_term)
     if @post_type.save
-      @post_type.set_options_from_form(params[:meta]) if params[:meta].present?
-      flash[:notice] = t('admin.post_type.message.created')
+      flash[:notice] = t('camaleon_cms.admin.post_type.message.created')
       redirect_to action: :index
     else
-      render 'edit'
+      index
     end
   end
 
   def destroy
-    flash[:notice] = t('admin.post_type.message.deleted') if @post_type.destroy
-
+    flash[:notice] = t('camaleon_cms.admin.post_type.message.deleted') if @post_type.destroy
     redirect_to action: :index
   end
 
@@ -56,8 +57,8 @@ class Admin::Settings::PostTypesController < Admin::SettingsController
     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
+      flash[:error] = t('camaleon_cms.admin.post_type.message.error')
+      redirect_to cama_admin_path
     end
   end
 end

data/app/controllers/{admin → camaleon_cms/admin}/settings/sites_controller.rb

@@ -6,11 +6,12 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-class Admin::Settings::SitesController < Admin::SettingsController
+class CamaleonCms::Admin::Settings::SitesController < CamaleonCms::Admin::SettingsController
   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 = Site.all.order(:term_group)
+    @sites = CamaleonCms::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)
@@ -21,40 +22,41 @@ class Admin::Settings::SitesController < Admin::SettingsController
   end
 
   def edit
-    admin_breadcrumb_add("#{t('admin.button.edit')}")
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.edit")
     render 'form'
   end
 
   def update
     if @site.update(params[:site])
       save_metas(@site)
-      flash[:notice] = t('admin.sites.message.updated')
+      flash[:notice] = t('camaleon_cms.admin.sites.message.updated')
       redirect_to action: :index
     else
-      render 'form'
+      edit
     end
   end
 
   def new
-    @site = Site.new.decorate
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.new")
+    @site ||= CamaleonCms::Site.new.decorate
     render 'form'
   end
 
   def create
     site_data = params[:site]
-    @site = Site.new(site_data)
+    @site = CamaleonCms::Site.new(site_data)
     if @site.save
       save_metas(@site)
       site_after_install(@site, @site.get_theme_slug)
-      flash[:notice] = t('admin.sites.message.created')
+      flash[:notice] = t('camaleon_cms.admin.sites.message.created')
       redirect_to action: :index
     else
-      render 'form'
+      new
     end
   end
 
   def destroy
-    flash[:notice] = t('admin.sites.message.deleted') if @site.destroy
+    flash[:notice] = t('camaleon_cms.admin.sites.message.deleted') if @site.destroy
     redirect_to action: :index
   end
 
@@ -70,18 +72,18 @@ class Admin::Settings::SitesController < Admin::SettingsController
 
   def set_site
     begin
-      @site = Site.find_by_id(params[:id]).decorate
+      @site = CamaleonCms::Site.find_by_id(params[:id]).decorate
     rescue
-      flash[:error] = t('admin.sites.message.error')
-      redirect_to admin_path
+      flash[:error] = t('camaleon_cms.admin.sites.message.error')
+      redirect_to cama_admin_path
     end
   end
 
   # check if the system.config manage shared users
   def check_shared_status
     unless current_site.manage_sites?
-      flash[:error] = t('admin.sites.message.unauthorized')
-      redirect_to admin_path
+      flash[:error] = t('camaleon_cms.admin.sites.message.unauthorized')
+      redirect_to cama_admin_path
     end
   end
 end

data/app/controllers/{admin → camaleon_cms/admin}/settings_controller.rb

@@ -6,14 +6,16 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-class Admin::SettingsController < AdminController
+class CamaleonCms::Admin::SettingsController < CamaleonCms::AdminController
   before_action :validate_role
+  add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.settings")
 
   def index
-    redirect_to admin_dashboard_path
+    redirect_to cama_admin_dashboard_path
   end
 
   def site
+    add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.general_site")
     @site = current_site
   end
 
@@ -25,7 +27,7 @@ class Admin::SettingsController < AdminController
       @site.set_field_values(params[:field_options])
       theme = @site.get_theme.decorate
       theme.set_field_values(params[:theme_fields]) if params[:theme_fields].present?
-      flash[:notice] = t('admin.settings.message.site_updated')
+      flash[:notice] = t('camaleon_cms.admin.settings.message.site_updated')
       hook_run(theme.settings, "on_theme_settings", theme)
       redirect_to action: :site
     else
@@ -35,11 +37,12 @@ class Admin::SettingsController < AdminController
 
   # list available languages
   def languages
+    add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.languages")
   end
 
   # render the list of shortcodes
   def shortcodes
-
+    add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.shortcodes")
   end
 
   # save language customizations
@@ -49,7 +52,7 @@ class Admin::SettingsController < AdminController
     I18n.locale = current_site.get_admin_language
     PluginRoutes.reload
 
-    flash[:notice] =  t('admin.settings.message.language_updated', locale: current_site.get_admin_language)
+    flash[:notice] =  t('camaleon_cms.admin.settings.message.language_updated', locale: current_site.get_admin_language)
     redirect_to action: :languages
   end
 

data/app/controllers/{admin → camaleon_cms/admin}/user_roles_controller.rb

@@ -6,8 +6,10 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-class Admin::UserRolesController < AdminController
+class CamaleonCms::Admin::UserRolesController < CamaleonCms::AdminController
   before_action :validate_role
+  add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.users"), :cama_admin_users_url
+  add_breadcrumb I18n.t("camaleon_cms.admin.users.user_roles"), :cama_admin_user_roles_path
   before_action :set_user_roles, only: ['show','edit','update','destroy']
 
   def index
@@ -19,26 +21,26 @@ class Admin::UserRolesController < AdminController
   end
 
   def new
-    @user_role = current_site.user_roles.new
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.new")
+    @user_role ||= current_site.user_roles.new
     render 'form'
   end
 
   def create
     user_role_data = params[:user_role]
-
     @user_role = current_site.user_roles.new(user_role_data)
     if @user_role.save
       @user_role.set_meta("_post_type_#{current_site.id.to_s}", defined?(params[:rol_values][:post_type]) ? params[:rol_values][:post_type] : {})
       @user_role.set_meta("_manager_#{current_site.id.to_s}", defined?(params[:rol_values][:post_type]) ? params[:rol_values][:manager] : {})
-      flash[:notice] = t('admin.users.message.rol_created')
+      flash[:notice] = t('camaleon_cms.admin.users.message.rol_created')
       redirect_to action: :edit, id: @user_role.id
     else
-      render 'form'
+      new
     end
   end
 
   def edit
-    admin_breadcrumb_add("#{t('admin.button.edit')}")
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.edit")
     render 'form'
   end
 
@@ -46,21 +48,20 @@ class Admin::UserRolesController < AdminController
     if @user_role.editable? && @user_role.update(params[:user_role])
       @user_role.set_meta("_post_type_#{current_site.id.to_s}", defined?(params[:rol_values][:post_type]) ? params[:rol_values][:post_type] : {})
       @user_role.set_meta("_manager_#{current_site.id.to_s}", defined?(params[:rol_values][:post_type]) ? params[:rol_values][:manager] : {})
-      flash[:notice] = t('admin.users.message.rol_updated')
+      flash[:notice] = t('camaleon_cms.admin.users.message.rol_updated')
       redirect_to action: :edit, id: @user_role.id
     else
-      render 'form'
+      edit
     end
   end
 
   def destroy
     @user_role.destroy
-    flash[:notice] = t('admin.users.message.rol_deleted')
+    flash[:notice] = t('camaleon_cms.admin.users.message.rol_deleted')
     redirect_to action: :index
   end
 
   private
-
   def validate_role
     authorize! :manager, :users
   end
@@ -69,7 +70,7 @@ class Admin::UserRolesController < AdminController
     begin
       @user_role = current_site.user_roles.find(params[:id])
     rescue
-      flash[:error] = t('admin.users.message.rol_error')
+      flash[:error] = t('camaleon_cms.admin.users.message.rol_error')
       redirect_to action: :index
     end
   end

data/app/controllers/{admin → camaleon_cms/admin}/users_controller.rb

@@ -6,117 +6,111 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-class Admin::UsersController < AdminController
+class CamaleonCms::Admin::UsersController < CamaleonCms::AdminController
   before_action :validate_role, except: [:profile, :profile_edit]
+  add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.users"), :cama_admin_users_url
   before_action :set_user, only: ['show', 'edit', 'update', 'destroy']
 
   def index
+    add_breadcrumb I18n.t("camaleon_cms.admin.users.list_users")
     @users = current_site.users.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
   end
 
   def profile
-    @user = current_user
+    add_breadcrumb I18n.t("camaleon_cms.admin.users.profile")
+    @user = params[:user_id].present? ? current_site.the_user(params[:user_id].to_i).object : cama_current_user.object
+    return edit
   end
 
   def profile_edit
-    @user = current_user
-    if params[:meta]
-      @user.set_meta_from_form(params[:meta])
-      render json: {message: 'update'}
-    end
-
-    if params[:user]
-      render json: @user.update(params[:user].permit(:username, :email)) ? {message: 'update'} : {errors: @user.errors.full_messages.join(', ')}
-    end
-
-    if params[:password]
-      if @user.authenticate(params[:password][:password_old])
-        render json: @user.update(params[:password]) ? {message: 'update'} : {errors: @user.errors.full_messages.join(', ')}
-      else
-        render json: {errors: t('admin.users.message.incorrect_old_password')}
-      end
-    end
+    add_breadcrumb I18n.t("camaleon_cms.admin.users.profile")
+    @user = cama_current_user.object
+    return edit
   end
 
   def show
+    add_breadcrumb I18n.t("camaleon_cms.admin.users.profile")
     render 'profile'
   end
 
-  def edit
-    admin_breadcrumb_add("#{t('admin.button.edit')}")
-    r = {user: @user, render: 'form' }
-    hooks_run('user_edit', r)
-    render r[:render]
-  end
-
   def update
     if @user.update(params[:user])
       @user.set_meta_from_form(params[:meta]) if params[:meta].present?
       @user.set_field_values(params[:field_options])
-      r = {user: @user, message: t('admin.users.message.updated'), params: params}; hooks_run('user_after_edited', r)
+      r = {user: @user, message: t('camaleon_cms.admin.users.message.updated'), params: params}; hooks_run('user_after_edited', r)
       flash[:notice] = r[:message]
-      redirect_to action: :index
+      if cama_current_user.id == @user.id
+        redirect_to action: :profile_edit
+      else
+        redirect_to action: :index
+      end
     else
       render 'form'
     end
   end
 
+  # update som ajax requests from profile or user form
   def updated_ajax
     @user = current_site.users.find(params[:user_id])
-    if params[:meta]
-      @user.set_meta_from_form(params[:meta])
-      render json: {message: 'update'}
-    end
-
-    if params[:user]
-      render json: @user.update(params[:user].permit(:username, :email)) ? {message: 'update'} : {errors: @user.errors.full_messages.join(', ')}
-    end
-
+    # update password
     if params[:password]
       if @user.authenticate(params[:password][:password_old])
-        render json: @user.update(params[:password]) ? {message: 'update'} : {errors: @user.errors.full_messages.join(', ')}
+        render inline: @user.update(params[:password]) ? "" : @user.errors.full_messages.join(', ')
       else
-        render json: {errors: t('admin.users.message.incorrect_old_password')}
+        render inline: t('camaleon_cms.admin.users.message.incorrect_old_password')
       end
     end
   end
 
+  def edit
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.edit")
+    r = {user: @user, render: 'form' }
+    hooks_run('user_edit', r)
+    render r[:render]
+  end
+
   def new
-    @user = current_site.users.new
-    render 'form'
+    @user ||= current_site.users.new
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.new")
+    r = {user: @user, render: 'form' }
+    hooks_run('user_new', r)
+    render r[:render]
   end
 
   def create
     user_data = params[:user]
-
     @user = current_site.users.new(user_data)
     if @user.save
       @user.set_meta_from_form(params[:meta]) if params[:meta].present?
       @user.set_field_values(params[:field_options])
-      flash[:notice] = t('admin.users.message.created')
+      r={user: @user}; hooks_run('user_created', r)
+      flash[:notice] = t('camaleon_cms.admin.users.message.created')
       redirect_to action: :index
     else
-      render 'form'
+      new
     end
   end
 
   def destroy
-    flash[:notice] = t('admin.users.message.deleted') if @user.destroy
+    if @user.destroy
+      flash[:notice] = t('camaleon_cms.admin.users.message.deleted')
+      r={user: @user}; hooks_run('user_destroyed', r)
+    end
     redirect_to action: :index
   end
 
   private
 
   def validate_role
-    authorize! :manager, :users
+    (params[:id].present? && cama_current_user.id == params[:id]) || authorize!(:manager, :users)
   end
 
   def set_user
     begin
       @user = current_site.users.find(params[:id])
     rescue
-      flash[:error] = t('admin.users.message.error')
-      redirect_to admin_path
+      flash[:error] = t('camaleon_cms.admin.users.message.error')
+      redirect_to cama_admin_path
     end
   end
 end