caboose-cms 0.9.139 → 0.9.140
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/app/controllers/caboose/pages_controller.rb +0 -11
- data/lib/caboose/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 35b883696eaa9dedffea9a5b0dbe6649ad79fedd
|
|
4
|
+
data.tar.gz: 0d039188ce20bb8b2ea8f6150ce656843496a30a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1d902c620953ead10f7a1037ad364b8e8141ad4f8aae68032422cfcdf9c7da0b49d188f4f40f88d1bcd8a9d619573229cf45d8f3a02bd7e989784d17d65b4f1c
|
|
7
|
+
data.tar.gz: fa781ac1f71a3a9c300f83065246f4b3f5458cc38756ad7386883f9ced2ff35dc201a157e274df80f41b93a33324662f1a067078f02c83c3e6eac9acae97d71b
|
|
@@ -229,17 +229,6 @@ module Caboose
|
|
|
229
229
|
# @route GET /pages/preview/:id
|
|
230
230
|
def preview
|
|
231
231
|
@page = Page.find(params[:id])
|
|
232
|
-
<<<<<<< HEAD
|
|
233
|
-
=======
|
|
234
|
-
# redirect_to "/login?return_url=/admin/pages/#{@page.id}/preview" and return if @logged_in_user.nil?
|
|
235
|
-
# 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'))))
|
|
236
|
-
condition = @page.site_id == @site.id
|
|
237
|
-
redirect_to "/admin/pages" and return unless condition
|
|
238
|
-
# if @page.block.nil?
|
|
239
|
-
# redirect_to "/admin/pages/#{@page.id}/layout"
|
|
240
|
-
# return
|
|
241
|
-
# end
|
|
242
|
-
>>>>>>> 97f4d33f3f6719b2f17156cf09d0883ee55a5c65
|
|
243
232
|
@editing = true
|
|
244
233
|
@preview = true
|
|
245
234
|
if @page.nil? || @page.site_id != @site.id
|
data/lib/caboose/version.rb
CHANGED