camaleon_cms 2.4.3.1 → 2.4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdad92687ff9876d42095bdf25e09dd71df9bc23
-  data.tar.gz: f8069ba9e8bc54c08b3ef796590651587dcdc1fd
+  metadata.gz: 309565425b7415af401d6ea4a5238345397f9766
+  data.tar.gz: b97b8586392c7c6694d99053b02deb200baababc
 SHA512:
-  metadata.gz: 2879637c8c2cb01bc633c94d9e1b03971f2a85f8dcee0bf2af2a08a56165f1724e076bdd42eba7403d2037155e38413f1d08ddc77ccbe2b424ae9b25ff49770c
-  data.tar.gz: 9918e186699856f064f5392b67db467ac649f39db7cafec4006bec2db7d03c4961e40a575a00c7ce849b53a58044da6dbcd156d23140014d9a891608122a0521
+  metadata.gz: 8e5b72a18704f4dba361c8a64fabefc1c6f3d065a33745f73dd35c2c75879d397fe0a2e15df9165475d93844e880ec17a65b8e5cc3c094a08efc75d705eefc92
+  data.tar.gz: 6133cee060a592483e03afe30d1769a8378d1fa4e724489bd014e8f2111a352ef8e425bcf0a214860bc5355f1db5b172cb9739bd8c2264800b1f8554e3ce84a5

data/README.md

@@ -39,7 +39,7 @@
 * Add the gem in your Gemfile
 
   ```
-  gem "camaleon_cms",  '>= 2.4.3.1' # Stable versions 2.3.6, 2.2.1, 2.1.1, 2.1.0
+  gem "camaleon_cms",  '>= 2.4.3.2' # Stable versions 2.3.6, 2.2.1, 2.1.1, 2.1.0
   # gem "camaleon_cms", github: 'owen2345/camaleon-cms' # current development version
   ```
 * Only Rails 5 support

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

@@ -184,7 +184,7 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
   def get_post_data(is_create = false)
     post_data = params.require(:post).permit!
     post_data[:user_id] = cama_current_user.id if is_create
-    post_data[:status] == 'pending' if post_data[:status] == 'published' && cannot?(:publish_post, @post_type)
+    post_data[:status] = 'pending' if post_data[:status] == 'published' && cannot?(:publish_post, @post_type)
     post_data[:data_tags] = params[:tags].to_s
     post_data[:data_categories] = params[:categories] || []
     post_data

data/app/decorators/camaleon_cms/application_decorator.rb

@@ -43,12 +43,12 @@ class CamaleonCms::ApplicationDecorator < Draper::Decorator
 
   # get the locale for current decorator
   def get_locale(locale = nil)
-    locale || @_deco_locale || (h.cama_get_i18n_frontend rescue false) || I18n.locale
+    locale || @_deco_locale || (h.cama_get_i18n_frontend rescue nil) || I18n.locale
   end
 
   # return the current locale prefixed to add in frontend routes
   def _calc_locale(_l)
-    _l = (_l || @_deco_locale || (h.cama_get_i18n_frontend rescue false) || I18n.locale).to_s
+    _l = (_l || @_deco_locale || (h.cama_get_i18n_frontend rescue nil) || I18n.locale).to_s
     "_#{_l}"
   end
 end

data/app/decorators/camaleon_cms/site_decorator.rb

@@ -177,7 +177,7 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
   def the_admin_url
     host = object.main_site? ? object.slug : (object.slug.include?(".") ? object.slug : "#{object.slug}.#{Cama::Site.main_site.slug}")
     port = (host.split(":")[1] rescue nil)
-    h.cama_url_to_fixed("cama_admin_dashboard_url", host: host, port: port, locale: false)
+    h.cama_url_to_fixed("cama_admin_dashboard_url", host: host, port: port, locale: nil)
   end
 
   # check if current user can manage sites

data/app/helpers/camaleon_cms/uploader_helper.rb

@@ -221,7 +221,7 @@ module CamaleonCms::UploaderHelper
       saved =  true
     elsif uploaded_io.is_a?(String) && (uploaded_io.start_with?("http://") || uploaded_io.start_with?("https://"))
       return {error: "#{ct("file_format_error")} (#{args[:formats]})"} unless cama_uploader.class.validate_file_format(uploaded_io, args[:formats])
-      uploaded_io = Rails.public_path.join(uploaded_io.sub(current_site.the_url(locale: false), '')).to_s if uploaded_io.include?(current_site.the_url(locale: false)) # local file
+      uploaded_io = Rails.public_path.join(uploaded_io.sub(current_site.the_url(locale: nil), '')).to_s if uploaded_io.include?(current_site.the_url(locale: nil)) # local file
       _tmp_name = uploaded_io.split("/").last.split('?').first; args[:name] = args[:name] || _tmp_name
       uploaded_io = open(uploaded_io)
     end

data/app/uploaders/camaleon_cms_local_uploader.rb

@@ -41,7 +41,7 @@ class CamaleonCmsLocalUploader < CamaleonCmsUploader
     res = {
         "name" => File.basename(file_path),
         "key" => parse_key(file_path),
-        "url" => is_dir ? '' : (is_private_uploader? ? url_path.sub("#{@root_folder}/", '') : File.join(@current_site.decorate.the_url(locale: false, skip_relative_url_root: true), url_path)),
+        "url" => is_dir ? '' : (is_private_uploader? ? url_path.sub("#{@root_folder}/", '') : File.join(@current_site.decorate.the_url(locale: nil, skip_relative_url_root: true), url_path)),
         "is_folder" => is_dir,
         "size" => is_dir ? 0 : File.size(file_path).round(2),
         "format" => is_dir ? 'folder' : self.class.get_file_format(file_path),

data/app/views/camaleon_cms/default_theme/partials/_cama_posts_entries.json.jbuilder

@@ -1,8 +1,8 @@
 json.current_page  posts.current_page
 json.per_page posts.per_page
 json.total_entries posts.total_entries
-json.previous_page url_for(params.merge(page: posts.previous_page)) if posts.previous_page.present?
-json.next_page url_for(params.merge(page: posts.next_page)) if posts.next_page.present?
+json.previous_page url_for(page: posts.previous_page, only_path: false) if posts.previous_page.present?
+json.next_page url_for(page: posts.next_page, only_path: false) if posts.next_page.present?
 json.entries posts.decorate do |post|
   json.partial! partial: 'partials/cama_post_entry', locals:{ post: post }
 end

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

@@ -16,7 +16,7 @@
         <div class="navbar-custom-menu">
             <ul class="nav navbar-nav">
                 <%= r = {html: ""}; hooks_run("admin_notifications", r); raw(r[:html]); %>
-                <li><a target="_blank" href="<%= current_site.the_url(locale: false) %>"><i class="fa fa-eye"></i> <%= t("camaleon_cms.common.visit") %></a></li>
+                <li><a target="_blank" href="<%= current_site.the_url(locale: nil) %>"><i class="fa fa-eye"></i> <%= t("camaleon_cms.common.visit") %></a></li>
                 <li class="dropdown user user-menu">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-intro2='<%= t("camaleon_cms.admin.intro.profile") %>' data-position='left'>
                         <img src="<%= cama_current_user.the_avatar %>" class="user-image" alt="User Image">

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = '2.4.3.1'
+  VERSION = '2.4.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 2.4.3.1
+  version: 2.4.3.2
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt