trusty-cms 7.0.18 → 7.0.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/app/controllers/admin/pages_controller.rb +15 -3
- data/app/views/admin/pages/_fields.html.haml +1 -1
- data/app/views/admin/pages/_node.html.haml +1 -1
- data/app/views/admin/pages/_search_result_node.html.haml +1 -1
- data/lib/trusty_cms/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d37b90774a4c87ae80254d2a3729921f05098db89c5f64acdcfc11e81f2b5c71
|
|
4
|
+
data.tar.gz: 7f824c9d8f95202c6a094caf6e2ab2ee90c57a2ad6df665d1f2225d7e5a73fe3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1c18e2566d7bdf42b36746d6e4cfa5030a4c6eb5892cfdd2aa3d4d05a51de4758258347c009f18f5624cd12b70038d0b67541b48fee2d92f0ca321a1605c40ff
|
|
7
|
+
data.tar.gz: 760b7480db6eaca5f5583c5937096ea19439e12f379dec6ea80808d76f2375107a43079dcd7852dd2ae94bcdf4d9e2ec3fcb05cfa768a6e0e070db865dced0b4
|
data/Gemfile.lock
CHANGED
|
@@ -46,9 +46,8 @@ class Admin::PagesController < Admin::ResourceController
|
|
|
46
46
|
end
|
|
47
47
|
|
|
48
48
|
def edit
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
@term.result(distinct: true)
|
|
49
|
+
verify_site_id
|
|
50
|
+
load_assets
|
|
52
51
|
@versions = format_versions(@page.versions)
|
|
53
52
|
response_for :edit
|
|
54
53
|
end
|
|
@@ -83,6 +82,19 @@ class Admin::PagesController < Admin::ResourceController
|
|
|
83
82
|
@site_id = @site&.id
|
|
84
83
|
end
|
|
85
84
|
|
|
85
|
+
def verify_site_id
|
|
86
|
+
@site_id = params[:site_id]&.to_i
|
|
87
|
+
unless @site_id && @page&.site_id == @site_id
|
|
88
|
+
redirect_to admin_pages_url
|
|
89
|
+
end
|
|
90
|
+
end
|
|
91
|
+
|
|
92
|
+
def load_assets
|
|
93
|
+
assets = Asset.order(created_at: :desc)
|
|
94
|
+
@term = assets.ransack(params[:search].presence || {})
|
|
95
|
+
@term.result(distinct: true)
|
|
96
|
+
end
|
|
97
|
+
|
|
86
98
|
def initialize_search
|
|
87
99
|
Page.ransack(params[:search] || '')
|
|
88
100
|
end
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
= save_model_and_continue_editing_button(@page)
|
|
75
75
|
= submit_tag(t('preview', :default => 'Preview'), :class => 'button', :id => 'show-preview')
|
|
76
76
|
= t('or')
|
|
77
|
-
= link_to t('cancel'), admin_pages_url, class: 'alt'
|
|
77
|
+
= link_to t('cancel'), admin_pages_url(site_id: @site_id), class: 'alt'
|
|
78
78
|
#preview_panel.fullcover.grey_out{:style => 'display: none;'}
|
|
79
79
|
%iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src => ActionController::Base.relative_url_root.to_s + '/loading-iframe.html', :frameborder => 0, :scrolling => 'auto'}
|
|
80
80
|
.preview_tools
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
= node_title
|
|
8
8
|
- else
|
|
9
9
|
%i.far.fa-file
|
|
10
|
-
= (link_to("#{node_title}".html_safe, edit_admin_page_path(page), :title => page.path)).html_safe
|
|
10
|
+
= (link_to("#{node_title}".html_safe, edit_admin_page_path(page, site_id: page.site_id), :title => page.path)).html_safe
|
|
11
11
|
= page_type
|
|
12
12
|
= spinner
|
|
13
13
|
- node.status_column do
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
= node_title
|
|
8
8
|
- else
|
|
9
9
|
%i.far.fa-file
|
|
10
|
-
= (link_to("#{node_title}".html_safe, edit_admin_page_path(page), :title => page.path)).html_safe
|
|
10
|
+
= (link_to("#{node_title}".html_safe, edit_admin_page_path(page, site_id: page.site_id), :title => page.path)).html_safe
|
|
11
11
|
= page_type
|
|
12
12
|
= spinner
|
|
13
13
|
- node.path_column do
|
data/lib/trusty_cms/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: trusty-cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 7.0.
|
|
4
|
+
version: 7.0.19
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- TrustyCms CMS dev team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-02-
|
|
11
|
+
date: 2025-02-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activestorage-validator
|