caboose-cms 0.9.47 → 0.9.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced7d6180dbf09389865221d0adb11df19c5210a
-  data.tar.gz: cd394f3842aa057091d39f3256d97f8ce11a6500
+  metadata.gz: b9f2f4a3e0d93050a7a8443751840163cf17bb05
+  data.tar.gz: dfa07ad5d13bcb15be7f731e58fa43d83e14db96
 SHA512:
-  metadata.gz: 4dd89ab972a1da5e0123a938f84d8561dfdac153d800d52ad0e1d3bf1ea2be7a05eed06c83c0dbeb0d54f3c29bdef67ed937ecc75581ad4d3f16944d1cac2f61
-  data.tar.gz: 66664249934510812b2a1847f32742f5f0544144c65f3d6ca88844fec9a5fefcbaaea9e79cf92585cc320a4623d2034f0dde005ad125c484d91310e459fc9c2c
+  metadata.gz: d7e3741502210d2f18e322b2ca63091b95afeb4886746d76ce98607ffd2fa2ab78a467b638ca9e6503d187629e9595556a42c16ca361f96ddec57f12be8149e7
+  data.tar.gz: 6f4971abb3521efd93bc9307f921c5044fcc4534b68d96446a7a25447d5cf5ba34ef97a5061d52d2ff91d2ef068bca8aeee0cf0033ed907576f0f554e30c1176

data/app/controllers/caboose/posts_controller.rb

@@ -1,6 +1,5 @@
 module Caboose
   class PostsController < ApplicationController
-    layout 'caboose/admin'
     
     helper :application
      
@@ -18,12 +17,12 @@ module Caboose
       
       if params[:id]
         @post = Post.where(:id => params[:id]).first
-        render :layout => "caboose/application"
+     #   render :layout => "caboose/application"
       else      
         # Find the page with an exact URI match        
         uri = "#{params[:year]}/#{params[:month]}/#{params[:day]}/#{params[:slug]}"
         @post = Post.where(:site_id => @site.id, :uri => request.fullpath).first
-        render :layout => "caboose/application"
+      #  render :layout => "caboose/application"
       end      
       render :file => "caboose/extras/error404" and return if @post.nil?                 
 
@@ -38,7 +37,8 @@ module Caboose
     # @route_priority 100
     # @route GET /admin/posts
     def admin_index
-      return if !user_is_allowed('posts', 'view')            
+      return if !user_is_allowed('posts', 'view')
+      render :layout => 'caboose/admin'           
     end
 
     # @route GET /admin/posts/json

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.47'
+  VERSION = '0.9.48'
 end

metadata

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