caboose-cms 0.3.35 → 0.3.36

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTFmOTRhYmFjNWE2YjA4N2Y3ZWM2MTlmMmZlNmI4MGU1ODE2OTJhNQ==
+    MjZjMDdhMDcwYTM3MTcxNzVjYWQ1MDZhNTZhOWJmMGNjNGRjYzcwZQ==
   data.tar.gz: !binary |-
-    YTdkZDFkZTgxYzk3ZWQzZGQzN2ZmNjcwM2UxMjg0OTcxZjgyNmNlMA==
+    NzMwZDdjOWVhZDM0ZWI1OTExOTdkZTc3YTIzNmI3NThiMGExY2VkMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Mzc4MjAyYmY3ZjljYzE3OGI3ZWM4NTVlNTkwODY5ZjQ4N2Q4MTI1YzhmODNj
-    NTk0Njg4MDE4NWE4YWY1YzZlZjk3YmUwOWEyYzJiNTVmMDg1MTI0OGJlZTdj
-    YWRiMjU3MmI3YWYwZTg3M2M4MDFiY2IyMDkxZmRjNDQ0Y2RkZmY=
+    MzRlZTI1YmRmZGY1MjdmYzgyZmNmZTRhNWUyYTI5NThiYzllN2QzMmQ3Njg2
+    ZTYyMmUwNmU5ZGExMTk3ODBlMjY2ZTUyMjlkMzBmZmE4YWNjZTZjOWIwMTg3
+    NjRlOTllYzdiMmQzM2Y0N2M2ZDZjODBmMDgyZThiZTUwMGNmYjA=
   data.tar.gz: !binary |-
-    MjU0OWE4MTc1MjNhMjgwYTNkMzg5NzIwZmM0MzMzZmQzOTk4NmZjMTA2NWUz
-    YTZmMGEwYTk4ZGI2NDk2MWY5NzllNGU4YTE4NDNmODRhODc0NDI4Mzk5Yzk3
-    YzdhMDJlYjExOGNiMzYxMjUzNzgwZTFhMTA5MzBlZmIyZjg4ZWU=
+    MGRhYjgzOTdiYzdiYmUyZWY0NzY1N2ZkYjg4YzMzYWRiYmUxYTNmNzhjZDMx
+    N2MzNzcwZmRiM2RlNWQ4MDc2MjJjMzM0MDU1NDA2OTVkMzM2MjU0ZWIyYzU4
+    YTc1ODUzNTIxNWUxYzM2NDZiMTFlMTg0OWFkNTMxMGVjN2EzYWY=

data/app/controllers/caboose/pages_controller.rb

@@ -20,17 +20,17 @@ module Caboose
       end
 
       user = logged_in_user
-      if (!user.is_allowed(page, 'view'))
-        if (user.id == User.logged_out_user_id)	
-           redirect_to "/login?return_url=" + URI.encode(request.fullpath)		  		
+      if !user.is_allowed(page, 'view')
+        if user.id == User.logged_out_user_id	
+          redirect_to "/login?return_url=" + URI.encode(request.fullpath)		  		
           return
         else
           page.title = 'Access Denied'
-          page.content = "<p class='note error'>You do not have access to view this page.</p>"
+          #page.content = "<p class='note error'>You do not have access to view this page.</p>"
         end
       end
 
-      if (session['use_redirect_urls'] && !page.redirect_url.nil? && page.redirect_url.strip.length > 0)
+      if session['use_redirect_urls'] && !page.redirect_url.nil? && page.redirect_url.strip.length > 0
         redirect_to page.redirect_url
         return
       end

data/app/models/caboose/page.rb

@@ -26,7 +26,7 @@ class Caboose::Page < ActiveRecord::Base
     :meta_robots, # Multi-select options: none, noindex, nofollow, nosnippet, noodp, noarchive
     :canonical_url,
     :facebook_description, # defaults to meta_description
-    :googleplus_description # defaults to meta_description
+    :googleplus_description # defaults to meta_description      
    
   CONTENT_FORMAT_HTML  = 1 
   CONTENT_FORMAT_TEXT  = 2

data/app/models/caboose/role.rb

@@ -46,7 +46,7 @@ class Caboose::Role < ActiveRecord::Base
     for perm in permissions
       return true if (perm.resource == "all" && perm.action == "all")
     end
-    
+        
     if (resource.is_a?(Caboose::Page))
       for perm in page_permissions
         return true if (perm.page_id == resource.id && perm.action == action)

data/app/models/caboose/user.rb

@@ -17,11 +17,10 @@ class Caboose::User < ActiveRecord::Base
     return self.where('username' => 'elo').limit(1).pluck(:id)[0]
   end
   
-  def is_allowed(resource, action)
-    for role in roles
-      if role.is_allowed(resource, action)
-        return true
-      end
+  def is_allowed(resource, action)    
+    return true if Caboose::Role.where(:name => 'Everyone Logged Out').first.is_allowed(resource, action)        
+    for role in roles      
+      return true if role.is_allowed(resource, action)
     end
     return false;
   end

data/app/views/caboose/pages/show.html.erb

@@ -14,16 +14,20 @@
 <% end %>
 
 <% content_for :page_title   do %><%= raw @page.title   %><% end %>
-<% content_for :page_content do %><% @page.blocks.each do |b|
-  bt = b.page_block_type
-  if bt.nil?
-    bt = PageBlockType.where(:name => 'heading').first 
-    b.page_block_type_id = bt.id
-    b.save
+<% content_for :page_content do %><% 
+  if @page.title != 'Access Denied'
+    @page.blocks.each do |b|  
+      bt = b.page_block_type
+      if bt.nil?
+        bt = PageBlockType.where(:name => 'heading').first 
+        b.page_block_type_id = bt.id
+        b.save
+      end
+      if bt.use_render_function && bt.render_function
+        %><%= raw b.render_from_function(params[:empty_text]) %><%        
+      else        
+        %><%= render :partial => "caboose/page_blocks/#{bt.name}", :locals => { :block => b, :empty_text => "" } %><%
+      end
+    end
   end
-  if bt.use_render_function && bt.render_function
-    %><%= raw b.render_from_function(params[:empty_text]) %><%        
-  else        
-    %><%= render :partial => "caboose/page_blocks/#{bt.name}", :locals => { :block => b, :empty_text => "" } %><%
-  end
-end %><% end %>
+%><% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.35'
+  VERSION = '0.3.36'
 end

metadata

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