caboose-cms 0.9.89 → 0.9.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 420a543a2ca1c9d7c9c08ed6adb1d374ba2348a5
-  data.tar.gz: 8b1cad05af17a22e26079a63ca7b7839ee805721
+  metadata.gz: 8db1d5dd7b28bb3c07904747001fc0057bcbd240
+  data.tar.gz: 0441edec2da5b23eeb8791ae95412b5d67c3aed2
 SHA512:
-  metadata.gz: 4ea861e40fdf395fc74c0180b69ea281926d9e92bf5e132665d92108f8d8af19fbfc72aff2871ecc8be8561e7f8ccb56c7a80d2dfe3baa182a21cd213956d5f4
-  data.tar.gz: d8f04575ef719163e43ae6f4183899d73e80af3b9e359c19f9b007a46a4defb27c19e2e8f57125274bc43ae8d10f98ae3332d2249894e77ccb68b99ce4c61d91
+  metadata.gz: e6cab2ac89d12cceeb46d228c5390c4897769caea0eb5c550c7774047c373de126ac3c8521efea95966abfa89bc582bc2b7a59ec00f7e0e4c84bf23aaf426d62
+  data.tar.gz: 8a6895eb6dc5b837a80f52726d8cd9c8dad6fd82b4c0fe1ecf619138c68a7b88e53eaffc925e4f3ef57b908b9f9a32a6323f420346db9f2da153ebca52807b3d

data/app/controllers/caboose/blocks_controller.rb

@@ -21,7 +21,7 @@ module Caboose
     # @route GET /admin/pages/:page_id/blocks
     # @route GET /admin/posts/:post_id/blocks
     def admin_index
-      return if !user_is_allowed('pages', 'view')
+      return if !user_is_allowed("#{page_or_post}s", 'view')
       #h = params[:post_id] ? { :post_id => params[:post_id] } : { :page_id => params[:page_id] }
       #blocks = Block.where(h).reorder(:sort_order)
       #render :json => blocks
@@ -33,7 +33,7 @@ module Caboose
     # @route GET /admin/posts/:post_id/blocks/:id/new
     # @route GET /admin/posts/:post_id/blocks/new
     def admin_new
-      return unless user_is_allowed('pages', 'add')
+      return unless user_is_allowed("#{page_or_post}s", 'add')
 
       if params[:id]
         block_type_id = params[:block_type_id]
@@ -72,7 +72,7 @@ module Caboose
     # @route GET /admin/posts/:post_id/blocks/tree
     # @route GET /admin/posts/:post_id/blocks/:id/tree    
     def admin_tree
-      return unless user_is_allowed('pages', 'edit')      
+      return unless user_is_allowed("#{page_or_post}s", 'edit')      
       
       blocks = []
       if params[:id]
@@ -163,7 +163,7 @@ module Caboose
     # @route PUT /admin/pages/:page_id/blocks/:id/remove-media
     # @route PUT /admin/posts/:post_id/blocks/:id/remove-media
     def admin_remove_media
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = Caboose::StdClass.new   
       b = Block.find(params[:id])      
       b.media = nil
@@ -174,7 +174,7 @@ module Caboose
     # @route GET /admin/pages/:page_id/blocks/:id/render
     # @route GET /admin/posts/:post_id/blocks/:id/render
     def admin_render
-      return unless user_is_allowed('pages', 'edit')      
+      return unless user_is_allowed("#{page_or_post}s", 'edit')      
       b = Block.find(params[:id])      
       bt = b.block_type
       if bt.nil?
@@ -204,7 +204,7 @@ module Caboose
     # @route GET /admin/pages/:page_id/blocks/render
     # @route GET /admin/posts/:post_id/blocks/render
     def admin_render_all
-      return unless user_is_allowed('pages', 'edit')            
+      return unless user_is_allowed("#{page_or_post}s", 'edit')            
       blocks = Block.where("#{page_or_post}_id = ? and parent_id is null", @p.id).reorder(:sort_order).collect do |b|        
         {
           :id => b.id,
@@ -234,7 +234,7 @@ module Caboose
     # @route GET /admin/pages/:page_id/blocks/render-second-level
     # @route GET /admin/posts/:post_id/blocks/render-second-level
     def admin_render_second_level
-      return unless user_is_allowed('pages', 'edit')      
+      return unless user_is_allowed("#{page_or_post}s", 'edit')      
       view = ActionView::Base.new(ActionController::Base.view_paths)      
       blocks = @p.block.children.collect do |b|
         {           
@@ -266,7 +266,7 @@ module Caboose
     # @route GET /admin/pages/:page_id/blocks/:id/edit
     # @route GET /admin/posts/:post_id/blocks/:id/edit
     def admin_edit
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       @page = Page.find(params[:page_id]) if params[:page_id]
       @post = Post.find(params[:post_id]) if params[:post_id]
       @block = Block.find(params[:id])
@@ -296,7 +296,7 @@ module Caboose
     # @route GET /admin/pages/:page_id/blocks/:id/advanced
     # @route GET /admin/posts/:post_id/blocks/:id/advanced
     def admin_edit_advanced
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       @page = Page.find(params[:page_id]) if params[:page_id]
       @post = Post.find(params[:post_id]) if params[:post_id]
       @block = Block.find(params[:id])
@@ -307,7 +307,7 @@ module Caboose
     # @route GET /admin/pages/:page_id/blocks/:id
     # @route GET /admin/posts/:post_id/blocks/:id
     def admin_show
-      return unless user_is_allowed('pages', 'edit')      
+      return unless user_is_allowed("#{page_or_post}s", 'edit')      
       block = Block.find(params[:id])
       render :json => block      
     end
@@ -317,7 +317,7 @@ module Caboose
     # @route POST /admin/posts/:post_id/blocks
     # @route POST /admin/posts/:post_id/blocks/:id
     def admin_create
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
 
       resp = Caboose::StdClass.new
 
@@ -416,7 +416,7 @@ module Caboose
     # @route PUT /admin/pages/:page_id/blocks/:id
     # @route PUT /admin/posts/:post_id/blocks/:id
     def admin_update
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       
       resp = StdClass.new({'attributes' => {}})
       b = Block.find(params[:id])
@@ -477,7 +477,7 @@ module Caboose
     # @route POST /admin/pages/:page_id/blocks/:id/image
     # @route POST /admin/posts/:post_id/blocks/:id/image
     def admin_update_image
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       
       resp = StdClass.new({'attributes' => {}})
       b = Block.find(params[:id])
@@ -499,7 +499,7 @@ module Caboose
     # @route POST /admin/pages/:page_id/blocks/:id/file
     # @route POST /admin/posts/:post_id/blocks/:id/file
     def admin_update_file
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       
       resp = StdClass.new({'attributes' => {}})
       b = Block.find(params[:id])
@@ -521,7 +521,7 @@ module Caboose
     # @route DELETE /admin/pages/:page_id/blocks/:id
     # @route DELETE /admin/posts/:post_id/blocks/:id
     def admin_delete
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       
       resp = StdClass.new
       b = Block.find(params[:id])
@@ -552,7 +552,7 @@ module Caboose
     # @route PUT /admin/pages/:page_id/blocks/:id/duplicate
     # @route PUT /admin/posts/:post_id/blocks/:id/duplicate
     def admin_duplicate
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = StdClass.new
       b = Block.find(params[:id])
       resp.new_id = b.duplicate_block(@site.id, params[:page_id], params[:post_id], b.block_type_id, b.parent_id)
@@ -563,7 +563,7 @@ module Caboose
     # @route GET /admin/pages/:page_id/blocks/:id/api-info
     # @route GET /admin/posts/:post_id/blocks/:id/api-info
     def admin_block_info
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = StdClass.new
       b = Block.find(params[:id])
       bt = b.block_type if b
@@ -577,7 +577,7 @@ module Caboose
     # @route GET /admin/pages/:page_id/blocks/:id/parent-block
     # @route GET /admin/posts/:post_id/blocks/:id/parent-block
     def admin_parent_block
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = StdClass.new
       b = Block.find(params[:id])
       resp.parent_id = b.parent_id if b && b.parent && b.parent.name.blank?
@@ -588,7 +588,7 @@ module Caboose
     # @route POST /admin/pages/:page_id/blocks/:id/move
     # @route POST /admin/posts/:post_id/blocks/:id/move
     def admin_move
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       resp = StdClass.new
       b = Block.find(params[:id])
       if params[:before_id] && !params[:before_id].blank?
@@ -621,7 +621,7 @@ module Caboose
     # @route PUT /admin/pages/:page_id/blocks/:id/move-up
     # @route PUT /admin/posts/:post_id/blocks/:id/move-up
     def admin_move_up
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       
       resp = StdClass.new
       b = Block.find(params[:id])
@@ -637,7 +637,7 @@ module Caboose
     # @route PUT /admin/pages/:page_id/blocks/:id/move-down
     # @route PUT /admin/posts/:post_id/blocks/:id/move-down
     def admin_move_down
-      return unless user_is_allowed('pages', 'edit')
+      return unless user_is_allowed("#{page_or_post}s", 'edit')
       
       resp = StdClass.new
       b = Block.find(params[:id])

data/app/views/caboose/posts/admin_edit_categories.html.erb

@@ -16,6 +16,15 @@
 
 <%= render :partial => 'caboose/posts/admin_footer' %>
 
+<% content_for :caboose_css do %>
+<style>
+  #content2 p input[type="checkbox"] {
+    top: 10px;
+    margin-right: 5px;
+  }
+</style>
+<% end %>
+
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <script type='text/javascript'>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.89'
+  VERSION = '0.9.90'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.89
+  version: 0.9.90
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2017-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg