caboose-cms 0.9.64 → 0.9.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c05e137cd6e27972d585cb2a92b3da5d0a953d4c
-  data.tar.gz: 1f84a4eb9232ef323d070bf225e4b8c571451364
+  metadata.gz: 43c2ed33475916c5efe2be842f8e5a137df67193
+  data.tar.gz: 8a007a1ba9b5c3ad862556e5b8f73f51a1c56a6c
 SHA512:
-  metadata.gz: 00effcc5fc52ef32a1d7990a807276ab3162e4a4ba5e85b61a3fde70e0d9df7d40758048a58c7762f581be201e268caf36c17b05f9cdbfc568f17eceb3407071
-  data.tar.gz: c2fe489c22d2efd3f369491c3d8bfa275918d1cbe72504ada8f97d80ff582abaada41fa5b9c4bbc805a2ba3859de65573571a9e2d934d08e8867b21356008635
+  metadata.gz: 3567182432fb5692a20afacb95bf389de0aa72e111c658b1e8e46e57b46d80a2abfce355429e2daa2ffa34e4f3309e53914d7db034b274fd9a998792b51dc915
+  data.tar.gz: 1d27765dfd78b35fd1155f63e87716c2b3df93d42de2841bc6dbc014df0af7056659f2f80b6cbad35132eb3dad2b1d05048806bc54c1034a6ab77e9aab4ddbee

data/app/controllers/caboose/blocks_controller.rb

@@ -306,7 +306,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', 'add')
+      return unless user_is_allowed('pages', 'edit')
 
       resp = Caboose::StdClass.new
 
@@ -508,7 +508,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', 'delete')
+      return unless user_is_allowed('pages', 'edit')
       
       resp = StdClass.new
       b = Block.find(params[:id])
@@ -607,7 +607,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', 'delete')
+      return unless user_is_allowed('pages', 'edit')
       
       resp = StdClass.new
       b = Block.find(params[:id])
@@ -623,7 +623,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', 'delete')
+      return unless user_is_allowed('pages', 'edit')
       
       resp = StdClass.new
       b = Block.find(params[:id])

data/app/controllers/caboose/pages_controller.rb

@@ -140,6 +140,7 @@ module Caboose
     # @route GET /admin/pages
     def admin_index
       return if !user_is_allowed('pages', 'view')            
+      @user = @logged_in_user
       @domain = Domain.where(:domain => request.host_with_port).first
       @home_page = @domain ? Page.index_page(@domain.site_id) : nil
       if @domain && @home_page.nil?
@@ -183,9 +184,11 @@ module Caboose
                
     # @route GET /admin/pages/:id/content
     def admin_edit_content
-      return unless user_is_allowed('pages', 'edit')      
       @page = Page.find(params[:id])
-      if @page.block.nil?      
+      redirect_to "/login?return_url=/admin/pages/#{@page.id}/content" and return if @logged_in_user.nil?
+      condition = @logged_in_user && ( @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"
         return
       end
@@ -203,8 +206,31 @@ module Caboose
     def admin_update_layout
       return unless user_is_allowed('pages', 'edit')      
       bt = BlockType.find(params[:block_type_id])
-      Block.where(:page_id => params[:id]).destroy_all
-      Block.create(:page_id => params[:id], :block_type_id => params[:block_type_id], :name => bt.name)
+      old_block = Block.where(:page_id => params[:id], :parent_id => nil).first
+      old_block_ids = Block.where(:page_id => params[:id]).pluq(:id)
+      new_block = Block.create(:page_id => params[:id], :block_type_id => params[:block_type_id], :name => bt.name)
+      new_block.create_children
+      saved_blocks = []
+      if new_block && old_block && new_block.child('content') && old_block.child('content')
+        old_content = old_block.child('content')
+        new_content = new_block.child('content')
+        old_content.children.each do |child|
+          child.parent_id = new_content.id
+          child.save
+          saved_blocks << child.id
+          child.children.each do |c1|
+            saved_blocks << c1.id
+            c1.children.each do |c2|
+              saved_blocks << c2.id
+              c2.children.each do |c3|
+                saved_blocks << c3.id
+              end
+            end
+          end
+        end
+      end
+      where1 = saved_blocks.count > 0 ? "id NOT IN (#{saved_blocks.to_s.gsub('[','').gsub(']','')})" : ''
+      Block.where(:id => old_block_ids).where(where1).destroy_all
       resp = Caboose::StdClass.new({
         'redirect' => "/admin/pages/#{params[:id]}/content"
       })

data/app/helpers/caboose/pages_helper.rb

@@ -8,7 +8,12 @@ module Caboose
     end
     
     def pages_list_helper(page)
-      str = "<li><a href='/admin/pages/#{page.id}/content'>#{page.title}</a>"
+      can_edit = (@logged_in_user && (@logged_in_user.is_allowed('all', 'all') || Page.permissible_actions(@logged_in_user, page.id).include?('edit'))) ? true : false
+      if can_edit
+        str = "<li><a href='/admin/pages/#{page.id}/content'>#{page.title}</a>"
+      else
+        str = "<li><span class='disabled'>#{page.title}</span>"
+      end
       if page.children && page.children.count > 0
         str << "<ul>"
         page.children.each do |p|

data/app/models/caboose/page.rb

@@ -195,12 +195,15 @@ class Caboose::Page < ActiveRecord::Base
     end
     actions = []
     user.roles.each do |role|
-      actions + Caboose::PagePermission.where({
+      acts = Caboose::PagePermission.where({
           :role_id => role.id, 
           :page_id => page_id
-        }).pluck(:action)
+        }).pluq(:action)
+      acts.each do |ac|
+        actions << ac
+      end
     end
-    return actions.uniq
+    return actions
   end
   
   def self.page_ids_with_permission(user, action)

data/app/views/caboose/admin/index.html.erb

@@ -8,6 +8,7 @@ width = 200
 %>
 
 <h1>Admin</h1>
+<div id="admin-list">
 <ul>
   <!--
   <li id='nav_item_logout'><a href='/logout'><span class='icon'></span><span class='text'>Logout</span></a>
@@ -34,6 +35,7 @@ width = 200
     <% i + 1 %>
   <% end %>
 </ul>
+</div>
 
 <%= content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/station" %>
@@ -46,8 +48,25 @@ $(document).ready(function() {
 });
 </script>
 <% end %>
-<%= content_for :caboose_css do %>
-<style type='text/css'>
-
+<% content_for :caboose_css do %>
+<style>
+  #admin-list ul li {
+    line-height: 26px;
+  }
+  #admin-list ul li a {
+    color: #2424b1;
+    text-decoration: none;
+  }
+  #admin-list ul li a:visited {
+    color: #824daf;
+  }
+  #admin-list ul li a:hover {
+    color: #24b14b;
+    text-decoration: underline;
+  }
+  #admin-list ul li span.disabled {
+    text-decoration: line-through;
+    color: #888888;
+  }
 </style>
 <% end %>

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

@@ -40,8 +40,9 @@ tabs = {
   'Content'         => "/admin/pages/#{@page.id}/content",     
   'Custom CSS'      => "/admin/pages/#{@page.id}/css", 
   'Custom JS'       => "/admin/pages/#{@page.id}/js", 
-  'SEO'             => "/admin/pages/#{@page.id}/seo", 
-  'Sitemap'         => "/admin/pages/#{@page.id}/sitemap",
+  'SEO'             => "/admin/pages/#{@page.id}/seo",
+  'Layout'          => "/admin/pages/#{@page.id}/layout", 
+ # 'Sitemap'         => "/admin/pages/#{@page.id}/sitemap",
   'Duplicate Page'  => "/admin/pages/#{@page.id}/duplicate",
   'Delete Page'     => "/admin/pages/#{@page.id}/delete" 
 }

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

@@ -3,7 +3,7 @@
 
 <form action='/admin/pages/<%= @page.id %>' method='put' id='layout_form'>
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
-<h4 style="color:red;">WARNING: Changing the page layout will delete all existing content from the page.</h4>
+<!-- <h4 style="color:red;">WARNING: Changing the page layout will delete all existing content from the page.</h4> -->
 <p><select name='block_type_id'>
   <option value=''>-- Select a layout --</option>
   <% cat_ids = Caboose::BlockTypeCategory.layouts.collect{ |cat| cat.id } %>

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

@@ -1,8 +1,35 @@
 <h1>Pages</h1>
 
 <% if @domain %>
+	<% if @user.is_allowed('pages','add') %>
   <p><a href='/admin/pages/new' class="caboose-btn-white">New Page</a></p>
+  <% end %>
+  <div id="page-list">
   <%= raw pages_list(@home_page) %>
+  </div>
 <% else %>
   <p>It doesn't look like this site is configured for the current domain.  Please <a href='/admin/sites'>configure your sites</a>.</p>
 <% end %>  
+
+<% content_for :caboose_css do %>
+<style>
+	#page-list ul li {
+		line-height: 26px;
+	}
+	#page-list ul li a {
+		color: #2424b1;
+		text-decoration: none;
+	}
+	#page-list ul li a:visited {
+		color: #824daf;
+	}
+	#page-list ul li a:hover {
+		color: #24b14b;
+		text-decoration: underline;
+	}
+	#page-list ul li span.disabled {
+		text-decoration: line-through;
+    color: #888888;
+	}
+</style>
+<% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.64'
+  VERSION = '0.9.65'
 end

metadata

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