trusty-cms 7.0.16 → 7.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a15c9c448d86d17d88425749417d4b9aa12f9c405814ffc4f9525f9de9256fb6
-  data.tar.gz: dc246259a17322e8cabcbaaf807a2c26062de7d675e4d703a5642b25cf3dace4
+  metadata.gz: 8cc60aa6e631fbcf02dc6922e5c602f7a81ca23cb5d182ab4b1c36ac7ecc5904
+  data.tar.gz: 7602032c94a89eca24f931fce09591c4543fadbf4abd6848c9b1bf42794f2317
 SHA512:
-  metadata.gz: 658090c49962053bf25862a04003d234b08baa448e7382d5d47da6854b679c50aff2cb2195004148d86bd7d30c904dfbb31560228189db42d6b3a366a5bb9a0a
-  data.tar.gz: 16f83675fb4c96f4b3cd74bd4a6671dde64190ac4547f46883cd4c0b149dde6e19f9bffb53fd274e23e8e4c8f2248c737ecc213992ba856302c8eb5f87255e92
+  metadata.gz: dcda6ac43f10b8e8d6d2fc39fc2c4be68f2db21906b92dc28661aab95efb609c8551e666d28d7812ee1628dc488ebcf87928e6b08bc3b659a5367f7981731177
+  data.tar.gz: aafdf97ad1bb12da665f1fd936de6d3bdb6a79a830c74ab1fe24ff256cbfd6f67e99e1569e255442c79ab04cb8632254a390c729177e50187948f7d1ebc7a5da

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.16)
+    trusty-cms (7.0.18)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

data/app/helpers/admin/pages_helper.rb

@@ -19,8 +19,10 @@ module Admin::PagesHelper
   end
 
   def parent_page_options(current_site, page)
-    parent_pages = Page.parent_pages(current_site.homepage_id)
-    selected_page_id = page.id.presence_in(parent_pages.pluck(:id)) || page.parent_id.presence_in(parent_pages.pluck(:id))
+    parent_pages = []
+    parent_pages.concat(Page.parent_pages(current_site.homepage_id))
+    parent_pages << page.parent if page.parent
+    selected_page_id = page.parent_id
     options_for_select(parent_pages.map { |p| [p.title, p.id] }, selected_page_id)
   end
 end

data/app/views/admin/layouts/_site_chooser.html.haml

@@ -5,5 +5,6 @@
         = "Current Site: #{current_site.name}"
         %ul.expansion
           - current_user.sites.each do |site|
-            %li
-              = link_to( site.name, "#{request.path}?site_id=#{site.id}", :class => site == current_site ? 'fg site-link' : 'site-link')
+            - unless site.name == 'default_site'
+              %li
+                = link_to( site.name, "#{request.path}?site_id=#{site.id}", :class => site == current_site ? 'fg site-link' : 'site-link')

data/config/initializers/devise.rb

@@ -251,7 +251,7 @@ Devise.setup do |config|
 
   # Set this configuration to false if you want /users/sign_out to sign out
   # only the current scope. By default, Devise signs out all scopes.
-  config.sign_out_all_scopes = false
+  config.sign_out_all_scopes = true
 
   # ==> Navigation configuration
   # Lists the formats that should be treated as navigational. Formats like

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.16'.freeze
+  VERSION = '7.0.18'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.16
+  version: 7.0.18
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-07 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator