locomotivecms 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a3c0a1f8edd3378737a2c7c32a9269e627e50c1b12626e9b1938dd6a7d7b0a2
-  data.tar.gz: 76eebf87dfc75d34505c28f705bfd33a45c51503f67bd25722cf16ee5600e52f
+  metadata.gz: 672ca536536dc4908f0b030a252694762d02434416aec61a8e6d0e1986b5b832
+  data.tar.gz: 1efea0ba4eb61120459bb3f46c2ac7d31b8b8c0ef987331981f93ab19de79d28
 SHA512:
-  metadata.gz: 9bea61d9e705090e06914a19436f5106bb8e52bbf5e7aaaf1949acaad340b88b48343f5905cbf0c01b76cd550637724349639868441797fa20740ad8a5207863
-  data.tar.gz: 7ef8de42f877c3b2b0a6d6aa4c520258ed7c773fc2f2d61634fc39d7246df7e239e4b2c219c12797871771cb677c45cdcde0d2e1061100a21f7f8ce59a4e1911
+  metadata.gz: b5a7cae22c14e129b85db97c40d2f767c2f09cac7c23f74d0bbd9d5691ef083bd18f7d307d6ed006b343c14cd58f7f3ffbdc732eda3f714c6bdabf8a4d4f96e0
+  data.tar.gz: ebb9837c7b16a9d26527f7019112297507b9105124d409cf31757f8bb075c1060ef97cc3e3855988376c56a2193b0b321db1b6a072da1f10b1f06c8c665256a5

data/app/helpers/locomotive/content_entries_helper.rb

@@ -42,15 +42,21 @@ module Locomotive
     # @return [ Array ] The list of labels and urls (Hash)
     #
     def each_content_entry_group(content_type, &block)
-      field   = content_type.group_by_field
-      groups  = content_type.list_of_groups || []
+      field       = content_type.group_by_field
+      groups      = content_type.list_of_groups || []
 
       groups.each do |group|
+        where = if field.type == 'boolean'
+          %({"#{field.name}": #{group[:_id]}})
+        else
+          %({"#{field.name}_id": "#{group[:_id]}"})
+        end
+
         block.call({
           name: group[:name],
           url:  content_entries_path(current_site, content_type.slug, {
             group:  group[:name],
-            where:  %({"#{field.name}_id": "#{group[:_id]}"}),
+            where:  where,
             q:      params[:q]
           })
         })

data/app/models/locomotive/concerns/content_type/group_by.rb

@@ -16,6 +16,11 @@ module Locomotive
           field = self.group_by_field
 
           case field.type.to_sym
+          when :boolean
+            [
+              { name: "#{field.label} (#{I18n.t('yes', scope: 'locomotive.shared')})", _id: true },
+              { name: "#{field.label} (#{I18n.t('no', scope: 'locomotive.shared')})", _id: false }
+            ]
           when :select
             self.entries_class._select_options(field.name).map(&:with_indifferent_access)
           when :belongs_to
@@ -31,7 +36,7 @@ module Locomotive
         end
 
         def groupable?
-          !!self.group_by_field && %w(select belongs_to).include?(group_by_field.type)
+          !!self.group_by_field && %w(select belongs_to boolean).include?(group_by_field.type)
         end
 
         def group_by_field

data/config/locales/en.yml

@@ -38,6 +38,8 @@ en:
       unsaved_content_warning: "This page is asking you to confirm that you want to leave - data you have entered may not be saved."
 
     shared:
+      "yes": "Yes"
+      "no": "No"
       header:
         welcome: Welcome, %{name}
         sites: My sites

data/config/locales/fr.yml

@@ -36,6 +36,8 @@ fr:
       confirm: Êtes-vous sûr ?
       unsaved_content_warning: "Vous avez des modifications non sauvegardées dans cette page. Si vous la quittez, ces modifications seront perdues."
     shared:
+      "yes": "Oui"
+      "no": "Non"
       header:
         welcome: Bienvenue, %{name}
         sites: Mes sites

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive
-  VERSION = '4.0.2'
+  VERSION = '4.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement