caboose-cms 0.9.137 → 0.9.138
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/caboose/pages_controller.rb +7 -6
- data/lib/caboose/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2210b753a82c6e41b19c51b38ba9a32b8de33ee3
|
|
4
|
+
data.tar.gz: 800186525ae9abae5f3d057dbba73b0ad7e701bb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0dfbc83db912192e67c4044168772a84c6fe8dafbceda8f543da3ddd39e3950084f5bad76a975d41237f0ba4591f6f0ce26cebcb8e77df95be86785e377ef996
|
|
7
|
+
data.tar.gz: 0b8fb8d10f4a4a39b16dcf711aa3a490a200ad5a328d104b0cbf617f495c669d96547749807dcff41ab1c25d3e5fe417b96f0213954308d5cf0fc9155b68034a
|
|
@@ -229,13 +229,14 @@ module Caboose
|
|
|
229
229
|
# @route GET /admin/pages/:id/preview
|
|
230
230
|
def admin_preview
|
|
231
231
|
@page = Page.find(params[:id])
|
|
232
|
-
redirect_to "/login?return_url=/admin/pages/#{@page.id}/preview" and return if @logged_in_user.nil?
|
|
233
|
-
condition = @logged_in_user && (@logged_in_user.is_super_admin? || (@logged_in_user.site_id == @page.site_id && ( @logged_in_user.is_allowed('all','all') || @logged_in_user.is_allowed('pages','edit') && Page.permissible_actions(@logged_in_user, @page.id).include?('edit'))))
|
|
232
|
+
# redirect_to "/login?return_url=/admin/pages/#{@page.id}/preview" and return if @logged_in_user.nil?
|
|
233
|
+
# condition = @logged_in_user && (@logged_in_user.is_super_admin? || (@logged_in_user.site_id == @page.site_id && ( @logged_in_user.is_allowed('all','all') || @logged_in_user.is_allowed('pages','edit') && Page.permissible_actions(@logged_in_user, @page.id).include?('edit'))))
|
|
234
|
+
condition = @page.site_id == @site.id
|
|
234
235
|
redirect_to "/admin/pages" and return unless condition
|
|
235
|
-
if @page.block.nil?
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
end
|
|
236
|
+
# if @page.block.nil?
|
|
237
|
+
# redirect_to "/admin/pages/#{@page.id}/layout"
|
|
238
|
+
# return
|
|
239
|
+
# end
|
|
239
240
|
@editing = true
|
|
240
241
|
@preview = true
|
|
241
242
|
end
|
data/lib/caboose/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: caboose-cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.138
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- William Barry
|
|
@@ -1252,7 +1252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
1252
1252
|
version: '0'
|
|
1253
1253
|
requirements: []
|
|
1254
1254
|
rubyforge_project:
|
|
1255
|
-
rubygems_version: 2.
|
|
1255
|
+
rubygems_version: 2.5.1
|
|
1256
1256
|
signing_key:
|
|
1257
1257
|
specification_version: 4
|
|
1258
1258
|
summary: CMS built on rails.
|