caboose-cms 0.9.139 → 0.9.140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa2fe345ebd7b72fe8cc102bb36a8024b8adfc1c
-  data.tar.gz: 245f02764732266fab06044cdff4e8e37a4066ca
+  metadata.gz: 35b883696eaa9dedffea9a5b0dbe6649ad79fedd
+  data.tar.gz: 0d039188ce20bb8b2ea8f6150ce656843496a30a
 SHA512:
-  metadata.gz: 3e9527274edb975954ddbb4124c596bdcfb08484ad7f2008ad18ee9f766d9e78d14467396a6a6ea7e78e9d644b8c4144cd9f43348e00dea534b18f6f32bb3952
-  data.tar.gz: 48510782255453a40040dad5ebdeff9557d2e663b3b4f57f4ffccba10b3f36e35e84e1fffe8409142a97e91f0fda7b8d9e2e30d933ae0c76b32b77df4a43db2e
+  metadata.gz: 1d902c620953ead10f7a1037ad364b8e8141ad4f8aae68032422cfcdf9c7da0b49d188f4f40f88d1bcd8a9d619573229cf45d8f3a02bd7e989784d17d65b4f1c
+  data.tar.gz: fa781ac1f71a3a9c300f83065246f4b3f5458cc38756ad7386883f9ced2ff35dc201a157e274df80f41b93a33324662f1a067078f02c83c3e6eac9acae97d71b

data/app/controllers/caboose/pages_controller.rb

@@ -229,17 +229,6 @@ module Caboose
     # @route GET /pages/preview/:id
     def preview
       @page = Page.find(params[:id])
-<<<<<<< HEAD
-=======
-      # redirect_to "/login?return_url=/admin/pages/#{@page.id}/preview" and return if @logged_in_user.nil?
-      # 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'))))
-      condition = @page.site_id == @site.id
-      redirect_to "/admin/pages" and return unless condition
-      # if @page.block.nil?
-      #   redirect_to "/admin/pages/#{@page.id}/layout"
-      #   return
-      # end
->>>>>>> 97f4d33f3f6719b2f17156cf09d0883ee55a5c65
       @editing = true
       @preview = true
       if @page.nil? || @page.site_id != @site.id

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.139'
+  VERSION = '0.9.140'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.139
+  version: 0.9.140
 platform: ruby
 authors:
 - William Barry