trusty-cms 7.0.24 → 7.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3380e3eea06aeafbcf42ad8bcfbeb6d7aab6b62289265fbc81b74430c4a9c0c0
-  data.tar.gz: c6cac4b877f787958f03862fe734754a08d6f15173579c32c4ec82f6dae90a12
+  metadata.gz: 185eb1c3a53672bca444539bfcbb360549c22e9158be57c5463b404f0f705f57
+  data.tar.gz: c45948714f364615ac757a3ae19784bd61e1e059e0617aedc012060b2606c054
 SHA512:
-  metadata.gz: 353a1a00a9298e3eeec76e1cc0c5785c0be100cc72ac1cba77ed04a23ddefa3e288a606fd2201c54a9fc12dcc8e00ed5216013c773a167e0bf478e10ed283d61
-  data.tar.gz: cbf06b90eb40e47bca28107fc9a3b67dd2c5ab9a8117add664271962730fb04d6eda6631c0408d30e980672c0ac0cb34cff26035d41cfe338e677b29869447a3
+  metadata.gz: 2bba25302dd2febb18847d30e00daeeb45421e919cb191e64894ce09d0d328a426ac041e1a13f581ede3ff6aa936f90407190d9c3653858c56139a3342a49019
+  data.tar.gz: 1d6e40435e549b2046440cff8aa1178057388b10e98a70b16fdfd42d3da4041b15f7ccb7059eafa66f7d47b09ff831040f9a73602718b1ebbdbe62cc04d3a598

data/Gemfile.lock

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

data/app/controllers/admin/pages_controller.rb

@@ -2,7 +2,6 @@ class Admin::PagesController < Admin::ResourceController
   before_action :initialize_meta_rows_and_buttons, only: %i[new edit create update]
   before_action :count_deleted_pages, only: [:destroy]
   before_action :set_page, only: %i[edit restore]
-  before_action :generate_view_page_url, only: [:edit]
   rescue_from ActiveRecord::RecordInvalid, with: :validation_error
   include Admin::NodeHelper
   include Admin::PagesHelper
@@ -75,10 +74,6 @@ class Admin::PagesController < Admin::ResourceController
     @page = Page.find(params[:id])
   end
 
-  def generate_view_page_url
-    @view_page_url = generate_page_url(request.url, @page)
-  end
-
   def set_site_and_homepage
     @site ||= Page.current_site
     @homepage = @site&.homepage || Page.homepage

data/app/controllers/admin/resource_controller.rb

@@ -202,19 +202,9 @@ class Admin::ResourceController < ApplicationController
   end
 
   def redirect_url
-    return edit_admin_page_url(model) if params[:continue]
     return "#{edit_admin_page_url(model)}?view_page=true" if params[:save_and_view]
 
-    admin_pages_url(site_id: model.site.id)
-  end
-
-  def index_page_for_model
-    parts = { action: 'index' }
-    if paginated? && model && i = model_class.all.index(model)
-      p = (i / pagination_parameters[:per_page].to_i) + 1
-      parts[:p] = p if p && p > 1
-    end
-    parts
+    params[:continue] ? { action: 'edit', id: model.id } : { action: 'index' }
   end
 
   def edit_model_path

data/app/models/page.rb

@@ -119,11 +119,9 @@ class Page < ActiveRecord::Base
   end
 
   def path
-    if parent?
-      parent.child_path(self)
-    else
-      clean_path(slug)
-    end
+    return '' if slug.blank?
+
+    parent? ? parent.child_path(self) : clean_path(slug)
   end
 
   alias_method :url, :path

data/app/views/admin/pages/_fields.html.haml

@@ -76,7 +76,7 @@
       = save_model_and_view_page_button(@page)
       = t('or')
       = link_to t('cancel'), admin_pages_url(site_id: @site_id), class: 'alt'
-    #view-page-url-data{ data: { url: @view_page_url } }
+    #view-page-url-data{ data: { url: @page_url } }
   - form_bottom.edit_timestamp do
     = updated_stamp @page
 

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.24'.freeze
+  VERSION = '7.0.25'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.24
+  version: 7.0.25
 platform: ruby
 authors:
 - TrustyCms CMS dev team