app/controllers/caboose/pages_controller.rb in caboose-cms-0.9.138 vs app/controllers/caboose/pages_controller.rb in caboose-cms-0.9.139

@@ -224,22 +224,29 @@
       Caboose::Block.where(:page_id => @page.id, :status => nil).update_all(:status => 'published') if @page && !@page.id.nil?
       @editing = true
       @preview = false
     end
 
-    # @route GET /admin/pages/:id/preview
-    def admin_preview
+    # @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
+        redirect_to "/"
+        return
+      end
     end
     
     # @route GET /admin/pages/:id/layout
     def admin_edit_layout
       return unless user_is_allowed('pages', 'edit')