camaleon_cms 2.4.3.5 → 2.4.3.6

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

@@ -9,7 +9,7 @@ module CamaleonCms::Admin::MenusHelper
       pt = pt.decorate
       items_i = []
       items_i << {icon: "list", title: "#{t('camaleon_cms.admin.post_type.all')}", url: cama_admin_post_type_posts_path(pt.id)} if can? :posts, pt
-      items_i << {icon: "plus", title: "#{t('camaleon_cms.admin.post_type.add_new')}  ", url: new_cama_admin_post_type_post_path(pt.id)} if can? :create_post, pt
+      items_i << {icon: "plus", title: "#{t('camaleon_cms.admin.post_type.add_new', type_title: pt.the_title)}", url: new_cama_admin_post_type_post_path(pt.id)} if can? :create_post, pt
       if pt.manage_categories?
         items_i << {icon: "folder-open", title: t('camaleon_cms.admin.post_type.categories'), url: cama_admin_post_type_categories_path(pt.id)} if can? :categories, pt
       end

data/app/helpers/camaleon_cms/camaleon_helper.rb

@@ -80,4 +80,9 @@ module CamaleonCms::CamaleonHelper
     args[:default] = I18n.t(key, args.dup.merge(locale: :en)) unless args[:default].present?
     I18n.t(key, args)
   end
+  
+  # function that converts string into plural format
+  def cama_pluralize_text(text)
+    text.try(:pluralize)
+  end
 end

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -228,7 +228,7 @@ module CamaleonCms::UploaderHelper
     uploaded_io = File.open(uploaded_io) if uploaded_io.is_a?(String)
     return {error: "#{ct("file_format_error")} (#{args[:formats]})"} unless cama_uploader.class.validate_file_format(_tmp_name || uploaded_io.path, args[:formats])
     return {error: "#{ct("file_size_exceeded", default: "File size exceeded")} (#{number_to_human_size(args[:maximum])})"} if args[:maximum].present? && args[:maximum] < (uploaded_io.size rescue File.size(uploaded_io))
-    name = args[:name] || uploaded_io.path.split("/").last; name = "#{File.basename(name, File.extname(name)).underscore}#{File.extname(name)}"
+    name = args[:name] || uploaded_io.try(:original_filename) || uploaded_io.path.split("/").last; name = "#{File.basename(name, File.extname(name)).underscore}#{File.extname(name)}"
     path ||= uploader_verify_name(File.join(tmp_path, name))
     File.open(path, "wb"){|f| f.write(uploaded_io.read) } unless saved
     path = cama_resize_upload(path, args[:dimension]) if args[:dimension].present?

data/app/models/camaleon_cms/post.rb

@@ -1,10 +1,13 @@
 class CamaleonCms::PostUniqValidator < ActiveModel::Validator
   def validate(record)
-    if record.status != 'draft'
+    unless record.draft?
       slug_array = record.slug.to_s.translations_array
       ptype = record.post_type
       if ptype.present? # only for posts that belongs to a post type model
-        posts = ptype.site.posts.where("(#{slug_array.map {|s| "#{CamaleonCms::Post.table_name}.slug LIKE '%-->#{s}<!--%'"}.join(" OR ")} ) OR #{CamaleonCms::Post.table_name}.slug = ?",  record.slug).where("#{CamaleonCms::Post.table_name}.status != 'draft'").where.not(id: record.id)
+        posts = ptype.site.posts
+                    .where("(#{slug_array.map {|s| "#{CamaleonCms::Post.table_name}.slug LIKE '%-->#{s}<!--%'"}.join(" OR ")} ) OR #{CamaleonCms::Post.table_name}.slug = ?",  record.slug)
+                    .where("#{CamaleonCms::Post.table_name}.status != 'draft' AND #{CamaleonCms::Post.table_name}.status != 'draft_child'")
+                    .where.not(id: record.id)
         if posts.size > 0
           if slug_array.size > 1
             record.errors[:base] << "#{I18n.t('camaleon_cms.admin.post.message.requires_different_slug')}: #{posts.pluck(:slug).map{|slug| record.slug.to_s.translations.map{|lng, r_slug| "#{r_slug} (#{lng})" if slug.translations_array.include?(r_slug) }.join(",") }.join(",").split(",").uniq.clean_empty.join(", ")} "
@@ -37,7 +40,7 @@ class CamaleonCms::Post < CamaleonCms::PostDefault
   has_many :categories, class_name: "CamaleonCms::Category", through: :term_relationships, :source => :term_taxonomies
   has_many :post_tags, class_name: "CamaleonCms::PostTag", through: :term_relationships, :source => :term_taxonomies
   has_many :comments, class_name: "CamaleonCms::PostComment", foreign_key: :post_id, dependent: :destroy
-  has_many :drafts, ->{where(status: 'draft')}, class_name: "CamaleonCms::Post", foreign_key: :post_parent, dependent: :destroy
+  has_many :drafts, ->{where(status: 'draft_child')}, class_name: "CamaleonCms::Post", foreign_key: :post_parent, dependent: :destroy
   has_many :children, class_name: "CamaleonCms::Post", foreign_key: :post_parent, dependent: :destroy, primary_key: :id
 
   belongs_to :owner, class_name: PluginRoutes.static_system_info['user_model'].presence || 'CamaleonCms::User', foreign_key: :user_id
@@ -52,8 +55,8 @@ class CamaleonCms::Post < CamaleonCms::PostDefault
   scope :no_trash, -> {where.not(status: 'trash')}
   scope :published, -> {where(status: 'published')}
   scope :root_posts, -> {where(post_parent: [nil, ''])}
-  scope :drafts, -> {where(status: 'draft')}
-  scope :pendings, -> {where(status: 'pending')}
+  scope :drafts, -> {where(status: %w(draft draft_child))}
+  scope :pending, -> {where(status: 'pending')}
   scope :latest, -> {reorder(created_at: :desc)}
 
   validates_with CamaleonCms::PostUniqValidator
@@ -99,7 +102,11 @@ class CamaleonCms::Post < CamaleonCms::PostDefault
 
   # check if this is in draft status
   def draft?
-    status == 'draft'
+    status == 'draft' || status == 'draft_child'
+  end
+
+  def draft_child?
+    status == 'draft_child'
   end
 
   # check if this is in trash status

data/app/models/camaleon_cms/post_type.rb

@@ -184,6 +184,6 @@ class CamaleonCms::PostType < CamaleonCms::TermTaxonomy
 
   # check if slug was changed
   def check_refresh_routes
-    refresh_routes if self.slug_changed?
+    refresh_routes if cama_attr_changed?(:slug)
   end
 end

data/app/models/camaleon_cms/site.rb

@@ -219,7 +219,7 @@ class CamaleonCms::Site < CamaleonCms::TermTaxonomy
   # update all routes of the system
   # reload system routes for this site
   def update_routes
-    PluginRoutes.reload if self.slug_changed?
+    PluginRoutes.reload if cama_attr_changed?(:slug)
   end
 
   def reload_routes

data/app/models/camaleon_cms/user_role.rb

@@ -1,4 +1,6 @@
 class CamaleonCms::UserRole < CamaleonCms::TermTaxonomy
+  after_destroy :set_users_as_cilent
+
   default_scope { where(taxonomy: :user_roles) }
   has_many :metas, ->{ where(object_class: 'UserRole')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
   belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :parent_id
@@ -127,4 +129,10 @@ class CamaleonCms::UserRole < CamaleonCms::TermTaxonomy
           }
       ]
   }
+
+  private
+
+  def set_users_as_cilent
+    site.users.where(role: slug).update_all(role: 'client')
+  end
 end

data/app/models/concerns/camaleon_cms/custom_fields_read.rb

@@ -193,13 +193,15 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
   # }
   def set_field_values(datas = {})
     if datas.present?
-      self.field_values.delete_all
-      datas.each do |index, fields_data|
-        fields_data.each do |field_key, values|
-          if values[:values].present?
-            order_value = -1
-            ((values[:values].is_a?(Hash) || values[:values].is_a?(ActionController::Parameters)) ? values[:values].values : values[:values]).each do |value|
-              item = self.field_values.create!({custom_field_id: values[:id], custom_field_slug: field_key, value: fix_meta_value(value), term_order: order_value += 1, group_number: values[:group_number] || 0})
+      ActiveRecord::Base.transaction do 
+        self.field_values.delete_all
+        datas.each do |index, fields_data|
+          fields_data.each do |field_key, values|
+            if values[:values].present?
+              order_value = -1
+              ((values[:values].is_a?(Hash) || values[:values].is_a?(ActionController::Parameters)) ? values[:values].values : values[:values]).each do |value|
+                item = self.field_values.create!({custom_field_id: values[:id], custom_field_slug: field_key, value: fix_meta_value(value), term_order: order_value += 1, group_number: values[:group_number] || 0})
+              end
             end
           end
         end

data/app/models/concerns/camaleon_cms/user_methods.rb

@@ -9,11 +9,13 @@ module CamaleonCms::UserMethods extend ActiveSupport::Concern
     # callbacks
     before_validation :cama_before_validation
     before_destroy :reassign_posts
+    after_destroy :reassign_comments
     before_create { generate_token(:auth_token) }
 
     # relations
     has_many :metas, ->{ where(object_class: 'User')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
     has_many :all_posts, class_name: "CamaleonCms::Post"
+    has_many :all_comments, class_name: "CamaleonCms::PostComment"
 
     #scopes
     scope :admin_scope, -> { where(:role => 'admin') }
@@ -119,4 +121,12 @@ module CamaleonCms::UserMethods extend ActiveSupport::Concern
       end
     end
   end
-end
+
+  def reassign_comments
+    all_comments.includes(post: {post_type: :site}).each do |comment|
+      site = comment.post.post_type.site
+      user = site.get_anonymous_user
+      comment.update_column(:user_id, user.id)
+    end
+  end
+end

data/app/uploaders/camaleon_cms_local_uploader.rb

@@ -82,12 +82,14 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
   end
 
   def delete_folder(key)
-    FileUtils.rm_rf(File.join(@root_folder, key))
+    file = File.join(@root_folder, key)
+    FileUtils.rm(file) if File.exist? file
     reload
   end
 
   def delete_file(key)
-    FileUtils.rm(File.join(@root_folder, key))
+    file = File.join(@root_folder, key)
+    FileUtils.rm(file) if File.exist? file
     reload
   end
 

data/app/uploaders/camaleon_cms_uploader.rb

@@ -124,7 +124,7 @@ class CamaleonCmsUploader
   def self.validate_file_format(key, valid_formats = "*")
     return true if valid_formats == "*" || !valid_formats.present?
     valid_formats = valid_formats.gsub(' ', '').downcase.split(',') + get_file_format_extensions(valid_formats).split(',')
-    valid_formats.include?(File.extname(key).sub(".", "").split('?').first.downcase)
+    valid_formats.include?(File.extname(key).sub(".", "").split('?').first.try(:downcase))
   end
 
 

data/app/views/camaleon_cms/admin/categories/index.html.erb

@@ -12,7 +12,7 @@
       <div class="panel panel-default">
         <div class="panel-heading ui-draggable-handle">
             <h4>
-                <span class="fa fa-folder"></span> <%= "#{@post_type.decorate.the_title.pluralize} / " if @post_type.present? %> <%= t('camaleon_cms.admin.post_type.category').to_s.titleize.pluralize %>
+                <span class="fa fa-folder"></span> <%= "#{@post_type.decorate.the_title} / " if @post_type.present? %> <%= t('camaleon_cms.admin.post_type.categories', default: 'Categories') %>
             </h4>
         </div>
         <div class="panel-body">
@@ -39,7 +39,7 @@
                       <%= r = {html: "", post_type: @post_type, category: item}; hooks_run("category_list_body", r); raw(r[:html]); %>
                       <td>
                           <%= link_to raw('<i class="fa fa-eye"></i>'), item.the_url, target: '_blank', class: "btn btn-info btn-xs", title: "#{t('camaleon_cms.common.visit')}" %>
-                          <%= link_to raw('<i class="fa fa-list"></i>'), cama_admin_post_type_taxonomy_posts_path(@post_type.id, "category", item.id), class: "btn btn-default btn-xs cama_ajax_request", title: "#{@post_type.decorate.the_title.pluralize} - #{item.the_title.to_s.titleize}" if @post_type.present? && (can? :posts, @post_type) %>
+                          <%= link_to raw('<i class="fa fa-list"></i>'), cama_admin_post_type_taxonomy_posts_path(@post_type.id, "category", item.id), class: "btn btn-default btn-xs cama_ajax_request", title: "#{cama_pluralize_text(@post_type.decorate.the_title)} - #{item.the_title.to_s.titleize}" if @post_type.present? && (can? :posts, @post_type) %>
                           <%= link_to raw('<i class="fa fa-pencil"></i>'), {action: :edit, id: item.id }, class: "btn btn-default btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.edit')}" %>
                           <%= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: item.id },method: :delete, data: { confirm: t('camaleon_cms.admin.message.delete') }, class: "btn btn-danger btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.delete')}" unless item.get_option('not_deleted', false) %>
                       </td>

data/app/views/camaleon_cms/admin/post_tags/index.html.erb

@@ -3,7 +3,7 @@
     <div class="col-md-4">
       <div class="panel panel-default">
         <div class="panel-heading ui-draggable-handle">
-            <h4><span class="fa fa-folder"></span> <%= "#{@post_type.decorate.the_title.pluralize} / " if @post_type.present? %> <%= t('camaleon_cms.admin.post_type.tags').to_s.titleize.pluralize %></h4>
+            <h4><span class="fa fa-folder"></span> <%= "#{cama_pluralize_text(@post_type.decorate.the_title)} / " if @post_type.present? %> <%= cama_pluralize_text(t('camaleon_cms.admin.post_type.tags').to_s.titleize) %></h4>
         </div>
         <%= render partial: 'form' %>
       </div>
@@ -37,7 +37,7 @@
                         <td><%= tag.count %></td>
                         <td>
                             <%= link_to raw('<i class="fa fa-eye"></i>'), tag.the_url, target: '_blank', class: "btn btn-info btn-xs", title: "#{t('camaleon_cms.common.visit')}" %>
-                            <%= link_to raw('<i class="fa fa-list"></i>'), cama_admin_post_type_taxonomy_posts_path(@post_type.id, "post_tag", tag.id), class: "btn btn-default btn-xs cama_ajax_request", title: "#{@post_type.decorate.the_title.pluralize}-#{tag.slug.to_s.titleize}" if @post_type.present? %>
+                            <%= link_to raw('<i class="fa fa-list"></i>'), cama_admin_post_type_taxonomy_posts_path(@post_type.id, "post_tag", tag.id), class: "btn btn-default btn-xs cama_ajax_request", title: "#{cama_pluralize_text(@post_type.decorate.the_title)}-#{tag.slug.to_s.titleize}" if @post_type.present? %>
                             <%= link_to raw('<i class="fa fa-pencil"></i>'), {action: :edit, id: tag.id }, class: "btn btn-default btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.edit')}" %>
                             <%= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: tag.id }, method: :delete, data: { confirm: t('camaleon_cms.admin.message.delete') }, class: "btn btn-danger btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.delete')}" unless tag.get_option('not_deleted', false) %>
                         </td>

data/app/views/camaleon_cms/admin/posts/_sidebar.html.erb

@@ -43,7 +43,7 @@
                         <option class="" value="published" <%= (@post[:status] == "published") ? "selected": "" %> ><%= t('camaleon_cms.admin.post_type.published')%></option>
                     <% end  %>
                     <option value="pending" <%= (@post[:status] == "pending") ? "selected": "" %>><%= t('camaleon_cms.admin.table.pending')%></option>
-                    <option value="draft" <%= (@post[:status] == "draft") ? "selected": "" %>><%= t('camaleon_cms.admin.table.draft')%></option>
+                    <option value="draft" <%= (@post[:status] == "draft" || @post[:status] == "draft_child") ? "selected": "" %>><%= t('camaleon_cms.admin.table.draft')%></option>
                 </select>
             </div>
             <!-- templates -->

data/app/views/camaleon_cms/admin/posts/index.html.erb

@@ -2,7 +2,8 @@
     <div class="panel-heading">
         <div class="row">
             <div class="col-md-12">
-                <h4 class="pull-left"><%= t('camaleon_cms.admin.page_title.list_of') %> <%= @post_type.the_title.pluralize %>
+                <h4 class="pull-left">
+                    <%= t('camaleon_cms.admin.page_title.list_of', post_type: @post_type.the_title) %>
                     <b>(slug = <%= @post_type.the_slug %>)</b> <%= link_to("<i class='fa fa-eye'></i> #{t("camaleon_cms.common.visit")}".html_safe, @post_type.the_url, class: 'btn btn-xs', target: '_blank') %>
                 </h4>
                 <%= link_to raw("<i class='fa fa-plus'></i> #{t('camaleon_cms.admin.post_type.add')} #{@post_type.the_title}"), {action: :new}, class: "btn btn-primary pull-right cama_ajax_request" if can? :create_post, @post_type %>
@@ -107,4 +108,4 @@
         <%= content_tag("div", raw(t('camaleon_cms.admin.message.data_found_list')), class: "alert alert-warning") if @posts.empty? %>
         <%= raw cama_do_pagination(@posts) %>
     </div>
-</div>
+</div>

data/app/views/camaleon_cms/admin/sessions/forgot.html.erb

@@ -3,7 +3,7 @@
   <%= render "camaleon_cms/flash_messages" %>
   <% if @form_reset.present? %>
       <h3 class="login-title"><%= t('camaleon_cms.admin.login.reset_password') %></h3>
-      <%= form_for(@user, as: "user", :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal"  }, :url => cama_admin_forgot_path({h: params[:h]}) ) do |f| %>
+      <%= form_for(@user, as: "user", :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal cama_form_validate"  }, :url => cama_admin_forgot_path({h: params[:h]}) ) do |f| %>
           <div class="form-group">
             <div class="col-md-12">
               <%= f.password_field :password, :class => "form-control", :placeholder => t('camaleon_cms.admin.table.password', default: 'Password') %>
@@ -22,7 +22,7 @@
       <% end %>
   <% else  %>
       <h3 class="login-title"><%= raw t('camaleon_cms.admin.login.reset_password_html')%> </h3>
-      <%= form_for(@user, as: "user", :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal"  }, :url => cama_admin_forgot_path ) do |f| %>
+      <%= form_for(@user, as: "user", :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal cama_form_validate"  }, :url => cama_admin_forgot_path ) do |f| %>
           <div class="form-group">
             <div class="col-md-12">
               <%= f.email_field :email, :class => "form-control", :placeholder => t("camaleon_cms.admin.login.email", default: 'Email') %>

data/app/views/camaleon_cms/admin/sessions/login.html.erb

@@ -1,17 +1,15 @@
-<script>var kk = "<%= cama_get_session_id %>";</script>
-<%= javascript_include_tag "camaleon_cms/admin/login_manifest" %>
 <div class="login-body">
     <h3 class="login-box-msg"><%= raw t('camaleon_cms.admin.login.welcome_login_html', default: 'Please Login') %>  </h3>
     <%= render "camaleon_cms/flash_messages" %>
-    <%= form_for(@user, as: "user", :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal"  }, :url => cama_admin_login_path ) do |f| %>
+    <%= form_for(@user, as: "user", :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal cama_form_validate"  }, :url => cama_admin_login_path ) do |f| %>
         <div class="form-group">
             <div class="col-md-12">
-                <%= f.text_field :username, :class => "form-control", :placeholder => t("camaleon_cms.admin.login.username", default: 'Username') %>
+                <%= f.text_field :username, :class => "form-control required", autofocus: true, :placeholder => t("camaleon_cms.admin.login.username", default: 'Username') %>
             </div>
         </div>
         <div class="form-group">
             <div class="col-md-12">
-                <%= f.password_field :password, :class => "form-control", :placeholder => t("camaleon_cms.admin.login.password", default: 'Password') %>
+                <%= f.password_field :password, :class => "form-control required", :placeholder => t("camaleon_cms.admin.login.password", default: 'Password') %>
             </div>
         </div>
         <div class="form-group">

data/app/views/camaleon_cms/admin/sessions/register.html.erb

@@ -3,7 +3,7 @@
     <%= render "camaleon_cms/flash_messages" %>
 
     <h3 class="login-title"><%= raw t('camaleon_cms.admin.login.msg_registration_html') %></h3>
-    <%= form_for(@user, as: "user", :url => cama_admin_register_path, :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal"  } ) do |f| %>
+    <%= form_for(@user, as: "user", :url => cama_admin_register_path, :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal cama_form_validate"  } ) do |f| %>
         <%= render partial: 'layouts/camaleon_cms/admin/form_error', locals: {data: @user} %>
         <h4><%= t('camaleon_cms.admin.login.personal_info') %></h4>
         <div class="form-group">

data/app/views/camaleon_cms/admin/settings/_configuration_settings.html.erb

@@ -10,7 +10,7 @@
     </div>
 
     <div class="form-group">
-        <%= f.label t('.status', default: 'Site Status') %><br>
+        <%= f.label t('camaleon_cms.admin.table.status', default: 'Site Status') %><br>
         <%= f.select :status, current_site.the_status_options, {}, :class => "form-control" %>
     </div>
     <div class="hidden site_options_for_status status_maintenance">
@@ -68,4 +68,4 @@
             form.find('.site_options_for_status').hide().removeClass('hidden').filter('.status_'+$(this).val()).slideDown();
         }).trigger('change');
     })
-</script>
+</script>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_posts.html.erb

@@ -3,7 +3,7 @@
     <option value=""></option>
     <% if field.options[:post_types].present? %>
     <% (field.options[:post_types].include?("all") ? current_site.post_types : current_site.post_types.where(id: field.options[:post_types])).each do |pt| %>
-        <optgroup label="<%= pt.name %>">
+        <optgroup label="<%= pt.decorate.the_title %>">
         <% pt.posts.public_posts.each do |post| post = post.decorate %>
             <option value="<%= post.id %>"><%= post.the_title %></option>
         <% end %>

data/app/views/camaleon_cms/admin/user_roles/index.html.erb

@@ -30,8 +30,14 @@
                   <td><%= f.the_content %></td>
                   <td>
                     <%= link_to raw('<i class="fa fa-pencil"></i>'), {action: :edit, id: f.id }, class: "btn btn-default btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.edit')}" %>
-                    <%= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: f.id },
-                                method: :delete, data: { confirm: t('camaleon_cms.admin.message.delete_item') }, class: "btn btn-danger btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.delete')}" %>
+                    <% if f.editable? %>
+                        <%= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: f.id },
+                                method: :delete, data: { confirm: t('camaleon_cms.admin.message.delete_item') }, class: "btn btn-danger btn-xs cama_ajax_request", title: t('camaleon_cms.admin.button.delete') %>
+                    <% else %>
+                        <%= link_to 'javascript:;', disabled: true, class: 'btn btn-danger btn-xs cama_ajax_request', title: t('camaleon_cms.admin.users.message.role_can_not_be_deleted', default: 'This role can not be deleted') do %>
+                            <i class="fa fa-times"></i>
+                        <% end %>
+                    <% end %>
                   </td>
                 </tr>
             <% end %>

data/app/views/camaleon_cms/admin/users/form.html.erb

@@ -54,7 +54,7 @@
                         <div class="">
                             <%= f.label "#{t('camaleon_cms.admin.table.role')}", class: "control-label" %>
                             <div class="">
-                                <%= f.select :role,current_site.user_roles.reorder(:name).decorate.map{|role| [role.the_title, role.slug]}, {}, {:class => "form-control required"}%>
+                                <%= f.select :role,current_site.user_roles.reorder(:name).decorate.map{|role| [role.the_title, role.slug]}, {}, {:class => "form-control required", disabled: !current_user.role_grantor?(@user)}%>
                             </div>
                         </div>
                         <hr>
@@ -158,4 +158,4 @@
 <script type="application/javascript">
     jQuery(function ($) { init_profile_form(); });
 </script>
-<!-- EOF MODALS -->
+<!-- EOF MODALS -->

data/app/views/camaleon_cms/admin/users/index.html.erb

@@ -36,8 +36,15 @@
                   <td><%= l(f.last_login_at, format: :long) if f.last_login_at.present? %></td>
                   <td>
                     <%= link_to raw('<i class="fa fa-pencil"></i>'), {action: :edit, id: f.id }, class: "btn btn-default btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.edit')}" %>
-                    <%= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: f.id },
+                    <% if current_user.id == f.id %>
+                        <%= link_to 'javascript:;', class: 'btn btn-danger btn-xs cama_ajax_request', disabled: true,
+                                title: t('camaleon_cms.admin.users.message.user_can_not_delete_own_account', default: 'User can not delete own account') do %>
+                            <i class="fa fa-times"></i>
+                        <% end %>
+                    <% else %>
+                        <%= link_to raw('<i class="fa fa-times"></i>'), { action: :destroy, id: f.id },
                                 method: :delete, data: { confirm: t('camaleon_cms.admin.message.delete_item') }, class: "btn btn-danger btn-xs cama_ajax_request", title: "#{t('camaleon_cms.admin.button.delete')}" %>
+                    <% end %>
                     <%= link_to raw('<i class="fa fa-retweet"></i>'), {action: :impersonate, id: f.id }, class: "btn btn-default btn-xs cama_ajax_request", title: "#{cama_t('camaleon_cms.admin.users.impersonate')}" if can? :impersonate, f %>
                   </td>
                 </tr>

data/app/views/layouts/camaleon_cms/admin.html.erb

@@ -14,7 +14,7 @@
         var CURRENT_LOCALE = '<%= current_locale %>';
         var ADMIN_TRANSLATIONS = <%= raw current_site.get_languages.to_json %>;
         var tinymce_global_settings = {language_url: "<%= asset_path("camaleon_cms/admin/tinymce/langs/#{current_locale}.js") %>", custom_css: [], custom_toolbar: [], post_render: [], init: [], setups: [], settings: []};
-        var I18n_data = <%= I18n.backend.send(:translations)[current_locale.to_sym][:camaleon_cms][:admin][:js].to_json.html_safe rescue "{}" %>
+        var I18n_data = <%= I18n.backend.respond_to?(:translations) ? I18n.backend.send(:translations)[current_locale.to_sym][:camaleon_cms][:admin][:js].to_json.html_safe : !!(I18n.backend.backends[1] && I18n.backend.backends[1].backends[1]) ? I18n.backend.backends[1].backends[1].send(:translations)[current_locale.to_sym][:camaleon_cms][:admin][:js].to_json.html_safe : "{}" rescue "{}" %>
     </script>
     <%= javascript_include_tag "camaleon_cms/admin/admin-manifest" %>
 
@@ -52,4 +52,4 @@
     <%= raw cama_content_after_draw %>
     <%= yield :after_content if content_for? :after_content %>
 </body>
-</html>
+</html>

data/config/initializers/active_record_extension.rb

@@ -83,4 +83,13 @@ ActiveRecord::Base.class_eval do
   def cama_build_cache_key(key)
     _key = "cama_cache_#{self.class.name}_#{self.id}_#{key}"
   end
+  
+  # check if an attribute was changed
+  def cama_attr_changed?(attr_name)
+    if PluginRoutes.isRails5?
+      self.saved_change_to_attribute?(attr_name.to_sym)
+    else
+      self.send("#{attr_name}_changed?")
+    end
+  end
 end

data/config/initializers/assets.rb

@@ -15,7 +15,7 @@ Rails.application.config.assets.precompile << Proc.new { |path|
   if File.dirname(path).start_with?('plugins/') || File.dirname(path).start_with?('themes/')
     name = File.basename(path)
     content_type = MIME::Types.type_for(name).first.content_type rescue ""
-    if (path =~ /\.(css|js|svg|ttf|woff|eot|swf|pdf)\z/ || content_type.scan(/(javascript|image\/|audio|video|font)/).any?) && !name.start_with?("_") && !path.include?('/views/')
+    if (path =~ /\.(css|js|svg|ttf|woff|eot|swf|pdf|png|jpg)\z/ || content_type.scan(/(javascript|image\/|audio|video|font)/).any?) && !name.start_with?("_") && !path.include?('/views/')
       res = true
     end
   end

data/config/locales/camaleon_cms/admin/en.yml

@@ -240,7 +240,7 @@ en:
         edit: 'Edit'
         add: 'Add'
         list: 'List'
-        list_of: 'List of'
+        list_of: 'List of %{post_type}'
         new_site: 'New Site'
         edit_site: 'Edit Site'
         update: 'Update'

data/config/locales/camaleon_cms/admin/es.yml

@@ -219,7 +219,7 @@ es:
         edit: 'Editar'
         add: 'Añadir'
         list: 'Lista'
-        list_of: 'Lista de'
+        list_of: 'Lista de %{post_type}'
         new_site: 'Nuevo sitio'
         edit_site: 'Editar Sitio'
         update: 'Actualizar'
@@ -649,4 +649,4 @@ es:
         status_options:
           active: 'Activo'
           inactive: 'In activo'
-          maintenance: 'En Mantenimiento'
+          maintenance: 'En Mantenimiento'