camaleon_cms 2.4.3.11 → 2.4.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc8afe6e7c379d3328182cf9beb596c2dfa9d48
-  data.tar.gz: 079a90ef92547c8f8dbc3b3a9a65b9a6530ed151
+  metadata.gz: a88c2eae7a1687093b36edc1b7e114025c6f35c5
+  data.tar.gz: 2a4a338e0a9e7331d2c9ede64cb7a01a14ea2ce4
 SHA512:
-  metadata.gz: 802f6d4b4211b05561bd69bc4122ff489509ce7b66c652acf9f75c8a699d2d3e1376380c78a550a83c7b38b26e2327a28b4c037875adc3659b727d76b6d9391d
-  data.tar.gz: 15ae7e350976a0138e0dcddb1ff5afdc5797570b32a728d368780b43e252f4975f52ceffc5bb4af2b4b3c8084640e5f70cd9eba268d34fac19948398e4a4fbae
+  metadata.gz: e8058188fc6b86f8103fdb8391cddb1f3cade1c2ac0c178d91c71454bf0443de450891563303ea1363690f6a54e762debd50291113efc1e7cc01836c2698bf6b
+  data.tar.gz: 5cf62d58034bbe6d0e9e71677089648a154a91d3062ed9e6f88341e3c11af7b3ddc39200a21be5425a127a62041595762559072abf381a76cdfaea6fad2a2968

data/app/assets/javascripts/camaleon_cms/admin/_post.js

@@ -260,7 +260,7 @@ function cama_init_post(obj) {
             });
         }, on_close: function(modal){
             var panel_cats = $form.find("#post_right_bar .list-categories");
-            $.get($form.find("#post_add_new_category").data('reload-url'), {categories: panel_cats.find("input:checkbox:checked").map(function(i, el){ return $(this).val(); }).get()}, function(res){ panel_cats.html(res); });
+            $.get($form.find("#post_add_new_category").data('reload-url'), {categories: panel_cats.find("input[name='categories[]']:checked").map(function(i, el){ return $(this).val(); }).get()}, function(res){ panel_cats.html(res); });
         }});
         /*********** end *************/
     }

data/app/assets/javascripts/camaleon_cms/admin/_posttype.js.coffee

@@ -18,4 +18,10 @@ window['cama_init_posttype_form'] = ->
       items.prop("disabled", false)
     else
       items.prop("disabled", true)
-  ).trigger("change")
+  ).trigger("change")
+  
+  # toggle single and multiple categories checkbox
+  cat_checks = form.find('input:checkbox[name="meta[has_category]"], input:checkbox[name="meta[has_single_category]"]')
+  cat_checks.change(->
+    cat_checks.not(this).prop("checked", false) if $(this).is(':checked')
+  ).filter(':checked').trigger('change')

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

@@ -44,7 +44,7 @@ class CamaleonCms::Admin::CategoriesController < CamaleonCms::AdminController
 
   # return html category list used to reload categories list in post editor form
   def list
-    render inline: post_type_html_inputs(@post_type, "categories", "categories" , "checkbox" , params[:categories] || [], "categorychecklist", true )
+    render inline: post_type_html_inputs(@post_type, "categories", "categories" , @post_type.get_option('has_single_category', false) ? 'radio' : "checkbox" , params[:categories] || [], "categorychecklist", true )
   end
 
   def destroy

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

@@ -29,7 +29,9 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
       params[:q] = (params[:q] || '').downcase
       posts_all = posts_all.where("LOWER(#{CamaleonCms::Post.table_name}.title) LIKE ?", "%#{params[:q]}%")
     end
-
+    
+    posts_all = posts_all.where(user_id: current_user) if cannot?(:edit_other, @post_type) # filter only own contents 
+    
     @posts = posts_all
     params[:s] = 'published' unless params[:s].present?
     @lists_tab = params[:s]

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

@@ -148,6 +148,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
 
   def before_hook_session
     session[:cama_current_language] = params[:cama_set_language].to_sym if params[:cama_set_language].present?
+    session[:cama_current_language] = nil if current_site.get_languages.exclude?(session[:cama_current_language])
     I18n.locale = params[:locale] || session[:cama_current_language] || current_site.get_languages.first
     hooks_run("session_before_load")
   end

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

@@ -18,6 +18,7 @@ class CamaleonCms::Admin::Settings::PostTypesController < CamaleonCms::Admin::Se
 
   def update
     if @post_type.update(@data_term)
+      @post_type.set_field_values(params.require(:field_options).permit!) if params[:field_options].present?
       flash[:notice] = t('camaleon_cms.admin.post_type.message.updated')
       redirect_to action: :index
     else
@@ -28,6 +29,7 @@ class CamaleonCms::Admin::Settings::PostTypesController < CamaleonCms::Admin::Se
   def create
     @post_type = current_site.post_types.new(@data_term)
     if @post_type.save
+      @post_type.set_field_values(params.require(:field_options).permit!) if params[:field_options].present?
       flash[:notice] = t('camaleon_cms.admin.post_type.message.created')
       redirect_to action: :index
     else

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -215,6 +215,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
 
     @_site_options = current_site.options
     session[:cama_current_language] = params[:cama_set_language].to_sym if params[:cama_set_language].present?
+    session[:cama_current_language] = nil if current_site.get_languages.exclude?(session[:cama_current_language])
     I18n.locale = params[:locale] || session[:cama_current_language] || current_site.get_languages.first
     return page_not_found unless current_site.get_languages.include?(I18n.locale.to_sym) # verify if this locale is available for this site
 

data/app/decorators/camaleon_cms/custom_fields_concern.rb

@@ -27,29 +27,35 @@ module CamaleonCms::CustomFieldsConcern
   end
 
   # the same function as get_fields_grouped(..) but this returns translated and shortcodes evaluated
-  def the_fields_grouped(field_keys)
+  def the_fields_grouped(field_keys, is_json_format = false)
     res = []
     object.get_fields_grouped(field_keys).each do |_group|
       group = {}.with_indifferent_access
       _group.keys.each do |k|
-        group[k] = _group[k].map{|v| h.do_shortcode(v.to_s.translate(@_deco_locale), object) }
+        if is_json_format
+          group[k] = _group[k].map{|v| parse_html_json(v) }
+        else
+          group[k] = _group[k].map{|v| h.do_shortcode(v.to_s.translate(@_deco_locale), object) }
+        end
       end
       res << group
     end
     res
   end
 
+  # the same function as get_fields_grouped(..) but this returns translated and shortcodes evaluated
+  def the_field_grouped(field_key, is_json_format = false, is_multiple = false)
+    the_fields_grouped([field_key], is_json_format).map{|v| is_multiple ? v.values.first : v.values.try(:first).try(:first) }
+    # the_fields_grouped([field_key], is_json_format).map{|v| is_multiple ? v.values.first : v.values.first }
+  end
+
   # return custom field contents with key field_key (only for type attributes)
   # translated and short codes evaluated like the content
   # this is for multiple values
   def the_json_fields(field_key)
     r = []
     object.get_fields(field_key).each do |text|
-      _r = JSON.parse(text || '{}').with_indifferent_access
-      _r.keys.each do |k|
-        _r[k] = h.do_shortcode(_r[k].to_s.translate(@_deco_locale), object)
-      end
-      r << _r
+      r << parse_html_json(text)
     end
     r
   end
@@ -59,11 +65,16 @@ module CamaleonCms::CustomFieldsConcern
   # translated and short codes evaluated like the content
   # default_val: default value returned when this field was not registered
   def the_json_field(field_key, default_val = '')
-    r = JSON.parse(object.get_field(field_key, default_val) || '{}').with_indifferent_access
+    parse_html_json(object.get_field(field_key, default_val))
+  end
+  alias_method :the_attribute_field, :the_json_field
+  
+  private
+  def parse_html_json(json)
+    r = JSON.parse(json || '{}').with_indifferent_access
     r.keys.each do |k|
       r[k] = h.do_shortcode(r[k].to_s.translate(@_deco_locale), object)
     end
     r
   end
-  alias_method :the_attribute_field, :the_json_field
 end

data/app/helpers/camaleon_cms/short_code_helper.rb

@@ -194,7 +194,7 @@ module CamaleonCms::ShortCodeHelper
     if attrs["field"].present? # model custom fields
       field = model.get_field_object(attrs["field"])
       if attrs["render_field"].present?
-        return render :file => "custom_fields/#{field.options["field_key"]}", :locals => {object: model, field: field, field_key: attrs["field"], attibutes: attrs}
+        return render_to_string(template: "custom_fields/#{field.options["field_key"]}", layout: false, :locals => {object: model, field: field, field_key: attrs["field"], attibutes: attrs}) 
       else
         if attrs["index"]
           res = model.the_fields(attrs["field"])[attrs["index"].to_i-1] rescue ""

data/app/models/camaleon_cms/post_type.rb

@@ -24,7 +24,7 @@ class CamaleonCms::PostType < CamaleonCms::TermTaxonomy
 
   # check if current post type manage categories
   def manage_categories?
-    options[:has_category]
+    options[:has_category] || options[:has_single_category]
   end
 
   # hide or show this post type on admin -> contents -> menu

data/app/uploaders/camaleon_cms_local_uploader.rb

@@ -88,8 +88,8 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
   end
 
   def delete_folder(key)
-    file = File.join(@root_folder, key)
-    FileUtils.rm(file) if File.exist? file
+    folder = File.join(@root_folder, key)
+    FileUtils.rm_rf(folder) if Dir.exist? folder
     reload
   end
 

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

@@ -96,7 +96,7 @@
             </div>
             <div class="panel-body ">
                 <div class="form-group list-categories">
-                    <%= raw post_type_html_inputs(@post_type, "categories", "categories" , "checkbox" ,params[:categories] || (@post.new_record? ? [] : @post.categories.pluck("#{CamaleonCms::TermTaxonomy.table_name}.id")), "categorychecklist", true )%>
+                    <%= raw post_type_html_inputs(@post_type, "categories", "categories" , @post_type.get_option('has_single_category', false) ? 'radio' : "checkbox" ,params[:categories] || (@post.new_record? ? [] : @post.categories.pluck("#{CamaleonCms::TermTaxonomy.table_name}.id")), "categorychecklist", true )%>
                 </div>
             </div>
         </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/_render.html.erb

@@ -34,6 +34,7 @@
                                       render(field.get_option('render') || (cama_custom_field_elements[field.get_option('field_key').to_sym][:render] rescue nil) || "camaleon_cms/admin/settings/custom_fields/fields/#{field.options[:field_key]}", field: field, values: nil, is_disabled: is_disabled, default_use: default_use, field_name: field_name)
                                     rescue => e
                                       Rails.logger.error "Camaleon CMS - Render Custom Fields Error: Custom field template was not found => #{e.message}: #{$!.backtrace}".cama_log_style(:red)
+                                      e.message
                                     end %>
                             </div>
                         </div>

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

@@ -1,5 +1,6 @@
 <div class="group-input-fields-content" data-callback-render="">
   <select name="<%= field_name %>[<%= field.slug %>][values][]" class="form-control input-value <%= 'is_translate' if field.options[:translate].to_s.to_bool %> <%= "required" if field.options[:required].to_s.to_bool %>" >
+    <option value=""></option>
     <% current_site.the_post_types.decorate.each do |ptype|  %>
         <option value="<%= ptype.id %>"><%= ptype.the_title %></option>
     <% end %>

data/app/views/camaleon_cms/admin/settings/custom_fields/form.html.erb

@@ -34,6 +34,13 @@
                             <%= f.label t('camaleon_cms.admin.settings.where_display_group') %><br>
                             <select id="select_assign_group" name="custom_field_group[assign_group]" class="form-control required">
                                 <option value="">&nbsp;</option>
+
+                                <optgroup label="<%= t('camaleon_cms.admin.settings.in_post_type_settings_of', default: 'In Post Type settings of') %>">
+                                  <% current_site.post_types.each do |pt| pt = pt.decorate; value = "PostType,#{pt.id}" %>
+                                      <option value="<%= value %>"><%= pt.the_title %></option>
+                                  <% end  %>
+                                </optgroup>
+
                                 <optgroup label="<%= t('camaleon_cms.admin.settings.posts_in') %>">
                                     <% current_site.post_types.each do |pt| pt = pt.decorate; value = "PostType_Post,#{pt.id}" %>
                                         <option value="<%= value %>" data-help="<%= "#{t('camaleon_cms.admin.settings.tooltip.add_custom_field_posts')}"+ pt.the_title %>"><%= pt.the_title %></option>

data/app/views/camaleon_cms/admin/settings/post_types/_form.html.erb

@@ -64,8 +64,10 @@
 
                     <div class="form-group">
                         <input name="meta[has_category]" type="hidden" value="false"/>
-                        <label class="check0"><input name="meta[has_category]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_category', false) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_category') %></label>
+                        <label class="check0"><input name="meta[has_category]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_category', false) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_category', default: 'Manage Multiple Categories') %></label>
                         <%= raw cama_html_tooltip("#{t('camaleon_cms.admin.post_type.tooltip.permission_asing_categories')}", 'right') %>
+                        <input name="meta[has_single_category]" type="hidden" value="false"/>
+                        <label style="float: right;"><input name="meta[has_single_category]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_single_category', false) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_single_category', default: 'Manage Single Category') %></label>
                     </div>
                     <div class="form-group">
                         <input name="meta[has_tags]" type="hidden" value="false"/>
@@ -149,7 +151,7 @@
                     </div>
                 </div>
                 <% if groups.present? %>
-                    <div id="post_type_setting_custom">
+                    <div role="tabpanel" class="tab-pane" id="post_type_setting_custom">
                         <%= render partial: "camaleon_cms/admin/settings/custom_fields/render", locals: {record: @post_type, field_groups: groups} %>
                     </div>
                 <% end %>

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

@@ -16,6 +16,7 @@
         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.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>
+    <%= render file: Rails.root.join('..', '..', 'spec/support/custom_admin') if Rails.env.test? %>
     <%= javascript_include_tag "camaleon_cms/admin/admin-manifest" %>
 
     <%= javascript_include_tag "camaleon_cms/admin/jquery_validate/#{current_locale}.js" if current_locale != 'en' %>
@@ -27,7 +28,6 @@
         <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
         <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
-    <%= render file: Rails.root.join('..', '..', 'spec/support/custom_admin') if Rails.env.test? %>
 </head>
 <body class="hold-transition skin-blue sidebar-mini" data-intro="<%= current_site.get_option("save_intro") %>">
     <%= yield :before_content if content_for? :before_content %>

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

@@ -393,6 +393,7 @@ de:
         permission_login_facebook: 'Login via Facebook erlauben?'
         permission_login_google: 'Login via Google+ erlauben?'
         posts_in: 'Posts in'
+        in_post_type_settings_of: 'In den Post Type Einstellungen von'
         settings: 'Einstellungen'
         tooltip:
           add_custom_field_posts: 'Füge selbsterstelltes Feld hinzu in Posts von '

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

@@ -393,6 +393,7 @@ en:
         permission_login_facebook: 'Permission to Login with Facebook'
         permission_login_google: 'Permission to Login with Google+'
         posts_in: 'Posts in'
+        in_post_type_settings_of: 'In Post Type settings of'
         settings: 'Settings'
         tooltip:
           add_custom_field_posts: 'Add Custom Field in Posts of '
@@ -489,7 +490,7 @@ en:
         linkedin: 'Linkedin'
         login: 'Login'
         logo: 'Logo'
-        manage_category: 'Manage Category'
+        manage_category: 'Manage Multiple Categories'
         manage_content: 'Manage Content'
         manage_picture: 'Manage Picture'
         manage_seo: 'Manage Seo'

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

@@ -469,7 +469,8 @@ es:
         linkedin: 'Linkedin'
         login: 'Iniciar Sesión'
         logo: 'Logo'
-        manage_category: 'Gestionar categoría'
+        manage_category: 'Gestionar multiples categorías'
+        manage_single_category: 'Gestionar una sola categoría'
         manage_content: 'Gestionar el contenido'
         manage_picture: 'Gestionar Imagen'
         manage_seo: 'Gestionar Imagen'

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.3.11'
+  VERSION = '2.4.3.12'
 end

data/lib/generators/camaleon_cms/gem_plugin_generator.rb

@@ -11,7 +11,7 @@ module CamaleonCms
         plugin_dir = Rails.root.join("apps", "plugins", get_plugin_name).to_s
         plugin_dir_path = "apps/plugins/#{get_plugin_name}"
         if behavior == :revoke
-          FileUtils.rm_r(plugin_dir)
+          FileUtils.rm_r(plugin_dir) if Dir.exist?(plugin_dir)
           append_to_file Rails.root.join("Gemfile") do
             "\n\ngem '#{get_plugin_name}', path:  '#{plugin_dir_path}'"
           end
@@ -91,9 +91,11 @@ module CamaleonCms
     end
   end"
           end
-
-          append_to_file Rails.root.join("Gemfile") do
-            "\n\ngem '#{get_plugin_name}', path:  '#{plugin_dir_path}'"
+          
+          if PluginRoutes.isRails4?
+            append_to_file Rails.root.join("Gemfile") do
+              "\n\ngem '#{get_plugin_name}', path:  '#{plugin_dir_path}'"
+            end
           end
 
           # destroy non used files

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -12,166 +13,181 @@
 
 ActiveRecord::Schema.define(version: 20161215202255) do
 
-  create_table "comments", force: :cascade do |t|
-    t.string "author"
-    t.string "author_email"
-    t.string "author_url"
-    t.string "author_IP"
-    t.text "content"
-    t.string "approved", default: "pending"
-    t.string "agent"
-    t.string "typee"
-    t.integer "comment_parent"
-    t.integer "post_id"
-    t.integer "user_id"
+  create_table "ar_internal_metadata", primary_key: "key", force: :cascade do |t|
+    t.string   "value"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["approved"], name: "index_comments_on_approved"
-    t.index ["comment_parent"], name: "index_comments_on_comment_parent"
-    t.index ["post_id"], name: "index_comments_on_post_id"
-    t.index ["user_id"], name: "index_comments_on_user_id"
   end
 
+  create_table "comments", force: :cascade do |t|
+    t.string   "author"
+    t.string   "author_email"
+    t.string   "author_url"
+    t.string   "author_IP"
+    t.text     "content"
+    t.string   "approved",       default: "pending"
+    t.string   "agent"
+    t.string   "typee"
+    t.integer  "comment_parent"
+    t.integer  "post_id"
+    t.integer  "user_id"
+    t.datetime "created_at",                         null: false
+    t.datetime "updated_at",                         null: false
+  end
+
+  add_index "comments", ["approved"], name: "index_comments_on_approved"
+  add_index "comments", ["comment_parent"], name: "index_comments_on_comment_parent"
+  add_index "comments", ["post_id"], name: "index_comments_on_post_id"
+  add_index "comments", ["user_id"], name: "index_comments_on_user_id"
+
   create_table "custom_fields", force: :cascade do |t|
-    t.string "object_class"
-    t.string "name"
-    t.string "slug"
+    t.string  "object_class"
+    t.string  "name"
+    t.string  "slug"
     t.integer "objectid"
     t.integer "parent_id"
     t.integer "field_order"
-    t.integer "count", default: 0
-    t.boolean "is_repeat", default: false
-    t.text "description"
-    t.string "status"
-    t.index ["object_class"], name: "index_custom_fields_on_object_class"
-    t.index ["objectid"], name: "index_custom_fields_on_objectid"
-    t.index ["parent_id"], name: "index_custom_fields_on_parent_id"
-    t.index ["slug"], name: "index_custom_fields_on_slug"
+    t.integer "count",        default: 0
+    t.boolean "is_repeat",    default: false
+    t.text    "description"
+    t.string  "status"
   end
 
+  add_index "custom_fields", ["object_class"], name: "index_custom_fields_on_object_class"
+  add_index "custom_fields", ["objectid"], name: "index_custom_fields_on_objectid"
+  add_index "custom_fields", ["parent_id"], name: "index_custom_fields_on_parent_id"
+  add_index "custom_fields", ["slug"], name: "index_custom_fields_on_slug"
+
   create_table "custom_fields_relationships", force: :cascade do |t|
     t.integer "objectid"
     t.integer "custom_field_id"
     t.integer "term_order"
-    t.string "object_class"
-    t.text "value", limit: 1073741823
-    t.string "custom_field_slug"
-    t.integer "group_number", default: 0
-    t.index ["custom_field_id"], name: "index_custom_fields_relationships_on_custom_field_id"
-    t.index ["custom_field_slug"], name: "index_custom_fields_relationships_on_custom_field_slug"
-    t.index ["object_class"], name: "index_custom_fields_relationships_on_object_class"
-    t.index ["objectid"], name: "index_custom_fields_relationships_on_objectid"
+    t.string  "object_class"
+    t.text    "value",             limit: 1073741823
+    t.string  "custom_field_slug"
+    t.integer "group_number",                         default: 0
   end
 
+  add_index "custom_fields_relationships", ["custom_field_id"], name: "index_custom_fields_relationships_on_custom_field_id"
+  add_index "custom_fields_relationships", ["custom_field_slug"], name: "index_custom_fields_relationships_on_custom_field_slug"
+  add_index "custom_fields_relationships", ["object_class"], name: "index_custom_fields_relationships_on_object_class"
+  add_index "custom_fields_relationships", ["objectid"], name: "index_custom_fields_relationships_on_objectid"
+
   create_table "metas", force: :cascade do |t|
-    t.string "key"
-    t.text "value", limit: 1073741823
+    t.string  "key"
+    t.text    "value",        limit: 1073741823
     t.integer "objectid"
-    t.string "object_class"
-    t.index ["key"], name: "index_metas_on_key"
-    t.index ["object_class"], name: "index_metas_on_object_class"
-    t.index ["objectid"], name: "index_metas_on_objectid"
+    t.string  "object_class"
   end
 
+  add_index "metas", ["key"], name: "index_metas_on_key"
+  add_index "metas", ["object_class"], name: "index_metas_on_object_class"
+  add_index "metas", ["objectid"], name: "index_metas_on_objectid"
+
   create_table "plugins_attacks", force: :cascade do |t|
-    t.string "path"
-    t.string "browser_key"
-    t.integer "site_id"
+    t.string   "path"
+    t.string   "browser_key"
+    t.integer  "site_id"
     t.datetime "created_at"
-    t.index ["browser_key"], name: "index_plugins_attacks_on_browser_key"
-    t.index ["path"], name: "index_plugins_attacks_on_path"
-    t.index ["site_id"], name: "index_plugins_attacks_on_site_id"
   end
 
+  add_index "plugins_attacks", ["browser_key"], name: "index_plugins_attacks_on_browser_key"
+  add_index "plugins_attacks", ["path"], name: "index_plugins_attacks_on_path"
+  add_index "plugins_attacks", ["site_id"], name: "index_plugins_attacks_on_site_id"
+
   create_table "plugins_contact_forms", force: :cascade do |t|
-    t.integer "site_id"
-    t.integer "count"
-    t.integer "parent_id"
-    t.string "name"
-    t.string "slug"
-    t.text "description"
-    t.text "value"
-    t.text "settings"
+    t.integer  "site_id"
+    t.integer  "count"
+    t.integer  "parent_id"
+    t.string   "name"
+    t.string   "slug"
+    t.text     "description"
+    t.text     "value"
+    t.text     "settings"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "posts", force: :cascade do |t|
-    t.string "title"
-    t.string "slug"
-    t.text "content", limit: 1073741823
-    t.text "content_filtered", limit: 1073741823
-    t.string "status", default: "published"
+    t.string   "title"
+    t.string   "slug"
+    t.text     "content",          limit: 1073741823
+    t.text     "content_filtered", limit: 1073741823
+    t.string   "status",                              default: "published"
     t.datetime "published_at"
-    t.integer "post_parent"
-    t.string "visibility", default: "public"
-    t.text "visibility_value"
-    t.string "post_class", default: "Post"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "user_id"
-    t.integer "post_order", default: 0
-    t.integer "taxonomy_id"
-    t.boolean "is_feature", default: false
-    t.index ["post_class"], name: "index_posts_on_post_class"
-    t.index ["post_parent"], name: "index_posts_on_post_parent"
-    t.index ["slug"], name: "index_posts_on_slug"
-    t.index ["status"], name: "index_posts_on_status"
-    t.index ["user_id"], name: "index_posts_on_user_id"
+    t.integer  "post_parent"
+    t.string   "visibility",                          default: "public"
+    t.text     "visibility_value"
+    t.string   "post_class",                          default: "Post"
+    t.datetime "created_at",                                                null: false
+    t.datetime "updated_at",                                                null: false
+    t.integer  "user_id"
+    t.integer  "post_order",                          default: 0
+    t.integer  "taxonomy_id"
+    t.boolean  "is_feature",                          default: false
   end
 
+  add_index "posts", ["post_class"], name: "index_posts_on_post_class"
+  add_index "posts", ["post_parent"], name: "index_posts_on_post_parent"
+  add_index "posts", ["slug"], name: "index_posts_on_slug"
+  add_index "posts", ["status"], name: "index_posts_on_status"
+  add_index "posts", ["user_id"], name: "index_posts_on_user_id"
+
   create_table "term_relationships", force: :cascade do |t|
     t.integer "objectid"
     t.integer "term_order"
     t.integer "term_taxonomy_id"
-    t.index ["objectid"], name: "index_term_relationships_on_objectid"
-    t.index ["term_order"], name: "index_term_relationships_on_term_order"
-    t.index ["term_taxonomy_id"], name: "index_term_relationships_on_term_taxonomy_id"
   end
 
+  add_index "term_relationships", ["objectid"], name: "index_term_relationships_on_objectid"
+  add_index "term_relationships", ["term_order"], name: "index_term_relationships_on_term_order"
+  add_index "term_relationships", ["term_taxonomy_id"], name: "index_term_relationships_on_term_taxonomy_id"
+
   create_table "term_taxonomy", force: :cascade do |t|
-    t.string "taxonomy"
-    t.text "description", limit: 1073741823
-    t.integer "parent_id"
-    t.integer "count"
-    t.string "name"
-    t.string "slug"
-    t.integer "term_group"
-    t.integer "term_order"
-    t.string "status"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "user_id"
-    t.index ["parent_id"], name: "index_term_taxonomy_on_parent_id"
-    t.index ["slug"], name: "index_term_taxonomy_on_slug"
-    t.index ["taxonomy"], name: "index_term_taxonomy_on_taxonomy"
-    t.index ["term_order"], name: "index_term_taxonomy_on_term_order"
-    t.index ["user_id"], name: "index_term_taxonomy_on_user_id"
+    t.string   "taxonomy"
+    t.text     "description", limit: 1073741823
+    t.integer  "parent_id"
+    t.integer  "count"
+    t.string   "name"
+    t.string   "slug"
+    t.integer  "term_group"
+    t.integer  "term_order"
+    t.string   "status"
+    t.datetime "created_at",                     null: false
+    t.datetime "updated_at",                     null: false
+    t.integer  "user_id"
   end
 
+  add_index "term_taxonomy", ["parent_id"], name: "index_term_taxonomy_on_parent_id"
+  add_index "term_taxonomy", ["slug"], name: "index_term_taxonomy_on_slug"
+  add_index "term_taxonomy", ["taxonomy"], name: "index_term_taxonomy_on_taxonomy"
+  add_index "term_taxonomy", ["term_order"], name: "index_term_taxonomy_on_term_order"
+  add_index "term_taxonomy", ["user_id"], name: "index_term_taxonomy_on_user_id"
+
   create_table "users", force: :cascade do |t|
-    t.string "username"
-    t.string "role", default: "client"
-    t.string "email"
-    t.string "slug"
-    t.string "password_digest"
-    t.string "auth_token"
-    t.string "password_reset_token"
-    t.integer "parent_id"
+    t.string   "username"
+    t.string   "role",                   default: "client"
+    t.string   "email"
+    t.string   "slug"
+    t.string   "password_digest"
+    t.string   "auth_token"
+    t.string   "password_reset_token"
+    t.integer  "parent_id"
     t.datetime "password_reset_sent_at"
     t.datetime "last_login_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "site_id", default: -1
-    t.string "confirm_email_token"
+    t.datetime "created_at",                                null: false
+    t.datetime "updated_at",                                null: false
+    t.integer  "site_id",                default: -1
+    t.string   "confirm_email_token"
     t.datetime "confirm_email_sent_at"
-    t.boolean "is_valid_email", default: true
-    t.string "first_name"
-    t.string "last_name"
-    t.index ["email"], name: "index_users_on_email"
-    t.index ["role"], name: "index_users_on_role"
-    t.index ["site_id"], name: "index_users_on_site_id"
-    t.index ["username"], name: "index_users_on_username"
+    t.boolean  "is_valid_email",         default: true
+    t.string   "first_name"
+    t.string   "last_name"
   end
 
+  add_index "users", ["email"], name: "index_users_on_email"
+  add_index "users", ["role"], name: "index_users_on_role"
+  add_index "users", ["site_id"], name: "index_users_on_site_id"
+  add_index "users", ["username"], name: "index_users_on_username"
+
 end

data/spec/features/content_groups_spec.rb

@@ -11,7 +11,7 @@ describe "the Content Groups", js: true do
       fill_in 'post_type_name', :with => 'Test cat'
       fill_in 'post_type_slug', :with => 'test-content'
       fill_in 'post_type_description', :with => 'test-content descri'
-      check("Manage Category")
+      check("Manage Multiple Categories")
       click_button 'Submit'
     end
     expect(page).to have_css('.alert-success')
@@ -24,7 +24,7 @@ describe "the Content Groups", js: true do
       all("table .btn-default").last.click
     end
     within("#post_type_form") do
-      expect(page).to have_checked_field("Manage Category")
+      expect(page).to have_checked_field("Manage Multiple Categories")
       fill_in 'post_type_name', :with => 'Test cat updated'
       fill_in 'post_type_slug', :with => 'test-content'
       click_button 'Submit'

data/spec/features/widgets_spec.rb

@@ -1,5 +1,5 @@
 require "rails_helper"
-describe "the Themes", js: true do
+describe "the Widgets", js: true do
   login_success
 
   it "Widgets list" do

data/spec/support/custom_admin.html.erb

@@ -1 +1,2 @@
-<!--<style>.fa::before{ content: "i" !important; } </style>-->
+<!--<style>.fa::before{ content: "i" !important; } </style>-->
+<script>window['URL'] = '';</script> <!--FIX for undefined URL on tinymce-->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.3.11
+  version: 2.4.3.12
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -1046,7 +1046,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/features/categories_spec.rb
 - spec/features/comments_spec.rb
 - spec/features/contact_form_spec.rb
@@ -1136,7 +1135,6 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
 - spec/features/categories_spec.rb