caboose-cms 0.9.114 → 0.9.115

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae72cde296525849afad58aaab5bbd68ceee848b
-  data.tar.gz: 52509f12ba044955cd0153b167b6292879133a6f
+  metadata.gz: c881ecff72b90de1f04649f55304be6eedfe0eae
+  data.tar.gz: a79e20da78208dbcecc615da798fb73bff964760
 SHA512:
-  metadata.gz: dd10147fd33167312d596827dc3ac730f308ff6e2275970553fda5962f01d3bdb72073549522f95d79a1de6f403025da6935c8578a5dd2dcb6ab5f2a96790110
-  data.tar.gz: 808eb857f1e05a649e85b9fe9565f7380677ea4f0363e93d67b2ed77fd635400e3bb6eed27fa992899120bc4f266bde5b22c0cb146f6fa82d0be07cac9a82a02
+  metadata.gz: 1be162c82d2f71eec2df372e02de03204520bc920952608c03445f8f2c03f550f0b11a07a876e5c71d5cfe6dac2d476dc7e88fe9ce425d83b99c1ba54d464e16
+  data.tar.gz: 2e5c6970cac98644bdaeddb720fc99231069439bb13c70d8356dd538b8ab4a8d76d2a2a1afe3fe5e057d1ab997de6671e49802dd11fed55152a57b886217244d

data/app/controllers/caboose/pages_controller.rb

@@ -173,7 +173,7 @@ module Caboose
     def admin_edit_permissions
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'
@@ -194,7 +194,7 @@ module Caboose
     def admin_edit_content
       @page = Page.find(params[:id])
       redirect_to "/login?return_url=/admin/pages/#{@page.id}/content" and return if @logged_in_user.nil?
-      condition = @logged_in_user && @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 = @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'))))
       redirect_to "/admin/pages" and return unless condition
       if @page.block.nil?
         redirect_to "/admin/pages/#{@page.id}/layout"
@@ -207,7 +207,7 @@ module Caboose
     def admin_edit_layout
       return unless user_is_allowed('pages', 'edit')      
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'
@@ -219,7 +219,7 @@ module Caboose
       return unless user_is_allowed('pages', 'edit')  
       resp = StdClass.new({'attributes' => {}})    
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         @page.hide = false
@@ -234,7 +234,7 @@ module Caboose
       return unless user_is_allowed('pages', 'edit')  
       resp = StdClass.new({'attributes' => {}})    
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         @page.hide = true
@@ -309,7 +309,7 @@ module Caboose
     def admin_edit_css
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'
@@ -320,7 +320,7 @@ module Caboose
     def admin_edit_js
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'
@@ -331,7 +331,7 @@ module Caboose
     def admin_edit_seo
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'
@@ -342,7 +342,7 @@ module Caboose
     def admin_edit_child_sort_order
       return unless user_is_allowed('pages', 'edit')
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'
@@ -368,7 +368,7 @@ module Caboose
     def admin_duplicate_form
       return unless user_is_allowed('pages', 'add')
       @page = Page.find(params[:id])      
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'
@@ -403,7 +403,7 @@ module Caboose
     def admin_delete_form
       return unless user_is_allowed('pages', 'delete')
       @page = Page.find(params[:id])      
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'
@@ -421,7 +421,7 @@ module Caboose
     def admin_sitemap
       return unless user_is_allowed('pages', 'delete')
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'
@@ -433,7 +433,7 @@ module Caboose
       return if !user_is_allowed('pages', 'edit')
       #return if !Page.is_allowed(logged_in_user, params[:id], 'edit')            
       @page = Page.find(params[:id])
-      if @page.site_id != @logged_in_user.site_id
+      if @page.site_id != @logged_in_user.site_id && !@logged_in_user.is_super_admin?
         redirect_to '/admin/pages'
       else
         render :layout => 'caboose/admin'

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.114'
+  VERSION = '0.9.115'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.114
+  version: 0.9.115
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg