caboose-cms 0.2.68 → 0.2.70

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjUxZjM2ZTc2YWJlNTEzYzE1ZDY4MDU5NWJjYjM3NGM2NmQxOWNmYw==
+    MWE2N2IxNDliN2ZmNjM3MDk5NzNkYjgxMWY0NGQ0NzhjZTFjMjkwMA==
   data.tar.gz: !binary |-
-    ZGZhZGEwMWU0YTRhM2U1YzI4MzY0M2E3ZWJiMjA5Mjg3MmZiNDVjNw==
+    YjI3MDM4NmU3MWI5YmEyMjM3N2MzZjdhMzFiOGEwNzBiNzNmM2I3Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjNhNDhmNTdkZTI1Y2U4NjE1ZDFjOTg3NjRjYWEwMmRlY2Q1NThmZTU0OGU1
-    ZmQyNjYxZThkYTllNjQ4NjA5ODg2MTE0NTgwM2NkODcwYTgzZGM2ZWE0MjJj
-    YzU1M2QxNTRhNjIwYjI0YzVjZWQzZjUxMWE2YWM3NzZkMTA5NmE=
+    NGJkMmY5NWQxZjFjNDdmMDUwNDYwZGU3MTU3MmQ4Y2FkNDZmOGE1Y2VkYWQ3
+    NjViZWE0NmRkZjEyMGNlZDJhODQzYWQ2NzdjNjY0YWY0YWNmZmUwMTEwODQ5
+    ODZjYTc3MTMyODQ2YzUzNTk5Mjk0NWQ0MWZkOThmMTFmYjUzMzk=
   data.tar.gz: !binary |-
-    MmMzZjgyYThiMzA0ZTYzNGE5YjIwMmMyYTY1Nzc3YjY3OGI5MWEwMjU4NzM2
-    MmYwMWY4ZTM2ZDg4ODhiYjY4MDA4NTkyMWE1ZTI4YTYzZDc1YmMxOTg5MGMw
-    ZmQzOWI4ZGNhY2UxNWQ5OWM0NzVlMmUxNzZlNmZjZTdhNmRlNzk=
+    OTkwYjM4NmU4ZTMyNDEzODkzNmU2YTEyOGZiMTczOGYyOTYxZDk5MmEzNjYy
+    OTk3YTY5NmNlNmJhNTM1MWU2NDMzODFmYWQ4MTVhNDE4YzRiZDhkMTAxODRl
+    NThlNzYwZmI1MzI3ZjhmMmIxNDQ5MjYwMmE0NmY4NzQ1NmQzYjI=

data/app/controllers/caboose/application_controller.rb

@@ -3,7 +3,6 @@ module Caboose
 
     protect_from_forgery  
     before_filter :before_before_action
-    helper :all
     
     def before_before_action
       

data/app/controllers/caboose/pages_controller.rb

@@ -2,6 +2,8 @@
 module Caboose
   class PagesController < ApplicationController
     
+    helper :application
+    
     def before_action
       @page = Page.page_with_uri('/admin')
     end    
@@ -209,30 +211,32 @@ module Caboose
       user = logged_in_user
       params.each do |name, value|
         case name
-        when 'parent_id'      
-          if (page.id == value)
+        when 'parent_id'
+          value = value.to_i
+          if page.id == value
             resp.error = "The page's parent cannot be itself."
-          elsif (Page.is_child(page.id, value))
+          elsif Page.is_child(page.id, value)
             resp.error = "You can't set the current page's parent to be one of its child pages."
-          elsif (value != page.parent_id)
+          elsif value != page.parent_id
             p = Page.find(value)
-            if (!user.is_allowed(p, 'edit'))
+            if !user.is_allowed(p, 'edit')
               resp.error = "You don't have access to put the current page there."
             end
           end	
-          if (resp.error.length > 0)
+          if resp.error
             save = false
           else
-            parent = Page.find(value)
-            Page.update_parent(page.id, value)
-            resp.attributes['parent_id'] = { 'text' => parent.title }
+            page.parent = Page.find(value)
+            page.save
+            Page.update_uri(page)
+            resp.attributes['parent_id'] = { 'text' => page.parent.title }
           end
 
         when 'custom_css', 'custom_js'
           value.strip!
           page[name.to_sym] = value
 
-        when 'title', 'menu_title', 'alias', 'hide', 'layout', 'redirect_url',
+        when 'title', 'menu_title', 'hide', 'layout', 'redirect_url',
           'seo_title', 'meta_description', 'fb_description', 'gp_description', 'canonical_url'
           page[name.to_sym] = value
 
@@ -273,7 +277,17 @@ module Caboose
           
         when 'slug' 
           page.slug = Page.slug(value.strip.length > 0 ? value : page.title)
+          page.save
+          Page.update_uri(page)                      
+          resp.attributes['slug'] = { 'value' => page.slug }
+          resp.attributes['uri'] = { 'value' => page.uri }
+          
+        when 'alias'
+          page.alias = Page.slug(value.strip)
+          page.save
+          Page.update_uri(page)
           resp.attributes['slug'] = { 'value' => page.slug }
+          resp.attributes['uri'] = { 'value' => page.uri }
 
         when 'custom_sort_children'
           if (value == 0)
@@ -364,6 +378,13 @@ module Caboose
       ]
       render json: options 		
     end
+    
+    # GET /admin/pages/:id/uri
+    def admin_page_uri
+      return unless user_is_allowed('pages', 'view')
+      p = Page.find(params[:id])
+      render :json => { 'uri' => p.uri }
+		end
 		
   end
 end

data/app/helpers/caboose/pages_helper.rb

@@ -1,6 +1,5 @@
 module Caboose
   module PagesHelper
-    
     def pages_list(page)
       str = "<ul>"
       str << pages_list_helper(page)      

data/app/models/caboose/page.rb

@@ -8,7 +8,8 @@ class Caboose::Page < ActiveRecord::Base
   attr_accessible :parent_id, 
     :title, 
     :menu_title, 
-    :content, 
+    :content,
+    :blocks,
     :slug, 
     :alias, 
     :uri, 
@@ -86,46 +87,23 @@ class Caboose::Page < ActiveRecord::Base
 		return self.page_with_uri_helper(parts, level+1, page_ids[0])				
 	end
 	
-	def self.update_child_uris(page_id)
-		page = self.find(page_id)
-		parent = self.find(page.parent_id)
-		parent_uri = parent.nil? ? '/' : parent.uri
-		self.update_child_uris_helper(ppage, parent_uri)
-	end
-
-	def self.update_child_uris_helper(page, parent_uri)
-		return if page.redirect_url.length > 0
-		
-		slug = page.slug
-		if (slug.trim.length == 0)
-			slug = self.get_slug(page.title)
-			self.update_detail_field(page.id, 'slug', slug)
-		end
-		
-		slug = page.slug.trim.length > 0 ? page.slug : self.get_slug(page.title)
-		
-		uri= "#{parent_uri}/#{slug}"
-		if (page.alias.length > 0)
-		  uri = "/#{page.alias}" 
-		elsif (self.is_top_level(page.parent_id))
-		  uri = "/#{page.slug}"
-		end
-		self.update_detail_field(page.id, 'uri', uri)
-		
-		page.children.each do |kid|
-		  self.update_child_uris_helper(kid, uri)
-		end
+	def self.update_uri(page)
+	  #return if page.redirect_url && page.redirect_url.length > 0
+	  
+	  page.slug = self.slug(page.title) if page.slug.nil? || page.slug.strip.length == 0
+	  page.uri = page.alias && page.alias.strip.length > 0 ? page.alias : (page.parent ? "#{page.parent.uri}/#{page.slug}" : "#{page.slug}")
+    page.uri[0] = '' if page.uri.starts_with?('/')
+    page.save
+	  
+	  page.children.each { |p2| self.update_uri(p2) }	    
 	end
 	
 	def self.update_child_perms(page_id)
 		page = self.find(page_id)
 			
-		viewers 	= Role.roles_with_page_permission(page_id, 'view')
-		editors 	= Role.roles_with_page_permission(page_id, 'edit')
-		approvers	= Role.roles_with_page_permission(page_id, 'approve')		
-		viewer_ids 		= viewers.collect {|r| r.id }
-		editor_ids 		= editors.collect {|r| r.id }
-		approver_id 	= approvers.collect {|r| r.id }
+		viewers_ids 	= Role.roles_with_page_permission(page_id, 'view').collect {|r| r.id }
+		editors_ids 	= Role.roles_with_page_permission(page_id, 'edit').collect {|r| r.id }
+		approvers_ids	= Role.roles_with_page_permission(page_id, 'approve').collect {|r| r.id }		
 		
 		self.update_child_perms_helper(page, viewer_ids, editor_ids, approver_ids)
 	end
@@ -321,8 +299,8 @@ class Caboose::Page < ActiveRecord::Base
 	end
 	
 	def self.is_child(parent_id, child_id)
-	  pid = self.where(:page_id => child_id).first.pluck(:parent_id)
-		return false if pid <= 0
+	  pid = self.where(:id => child_id).limit(1).pluck(:parent_id)[0]
+		return false if pid.nil? || pid <= 0
 		return true if pid == parent_id
 		return self.is_child(parent_id, pid)
 	end

data/app/models/caboose/page_block.rb

@@ -0,0 +1,8 @@
+
+class Caboose::PageBlock < ActiveRecord::Base
+  self.table_name = "page_blocks"
+  
+  belongs_to :page  
+  attr_accessible :id, :page_id, :type, :sort_order, :value    
+
+end

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

@@ -2,7 +2,7 @@
 <%= render :partial => 'caboose/pages/admin_header' %>
 
 <div id='message'>
-<p class='note error'>Are you sure you want to delet the page?  This can't be undone.<br /><br />
+<p class='note error'>Are you sure you want to delete the page?  This can't be undone.<br /><br />
 <input type='button' value='Yes' onclick='delete_page(<%= @page.id %>, true);' />
 <input type='button' value='No'  onclick="window.location='/admin/pages/<%= @page.id %>/edit';" />
 </p>

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

@@ -1,6 +1,7 @@
 
 <%= render :partial => 'caboose/pages/admin_header' %>
 
+<p>URI: /<span id='uri'><%= @page.uri %></span></p>
 <p><div id='page_<%= @page.id %>_title'                 ></div></p>
 <p><div id='page_<%= @page.id %>_menu_title'            ></div></p>
 <p><div id='page_<%= @page.id %>_parent_id'             ></div></p>     
@@ -29,10 +30,10 @@ $(document).ready(function() {
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
       { name: 'title'                 , nice_name: 'Title'                , type: 'text'       , value: <%= raw Caboose.json(@page.title        ) %> , width: 400 },
-      { name: 'parent_id'             , nice_name: 'Parent'               , type: 'select'     , value: <%= @page.parent_id %>                       , width: 400, text: <%= raw (@page.parent_id == -1 ? "[No Parent]" : @page.parent.title).to_json %>, options_url: '/pages/sitemap-options' },
-      { name: 'menu_title'            , nice_name: 'Menu title'           , type: 'text'       , value: <%= raw Caboose.json(@page.menu_title   ) %> , width: 400 },     
-      { name: 'slug'                  , nice_name: 'Slug'                 , type: 'text'       , value: <%= raw Caboose.json(@page.slug         ) %> , width: 400 }, 
-      { name: 'alias'                 , nice_name: 'Alias'                , type: 'text'       , value: <%= raw Caboose.json(@page.alias        ) %> , width: 400 }, 
+      { name: 'menu_title'            , nice_name: 'Menu title'           , type: 'text'       , value: <%= raw Caboose.json(@page.menu_title   ) %> , width: 400 },
+      { name: 'parent_id'             , nice_name: 'Parent'               , type: 'select'     , value: <%= @page.parent_id %>                       , width: 400, after_update: function() { update_uri(<%= @page.id %>); }, text: <%= raw (@page.parent_id == -1 ? "[No Parent]" : @page.parent.title).to_json %>, options_url: '/admin/pages/sitemap-options' },           
+      { name: 'slug'                  , nice_name: 'Slug'                 , type: 'text'       , value: <%= raw Caboose.json(@page.slug         ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
+      { name: 'alias'                 , nice_name: 'Alias'                , type: 'text'       , value: <%= raw Caboose.json(@page.alias        ) %> , width: 400, after_update: function() { update_uri(<%= @page.id %>); } }, 
       { name: 'redirect_url'          , nice_name: 'Redirect URL'         , type: 'text'       , value: <%= raw Caboose.json(@page.redirect_url ) %> , width: 400 },
       { name: 'hide'                  , nice_name: 'Hide'                 , type: 'checkbox'   , value: <%= raw @page.hide %>                        , width: 400 },
       { name: 'layout'                , nice_name: 'Layout'               , type: 'text'       , value: <%= raw Caboose.json(@page.layout       ) %> , width: 400 },
@@ -42,5 +43,13 @@ $(document).ready(function() {
   });
 });
 
+function update_uri(page_id)
+{
+  $.ajax({
+    url: '/admin/pages/' + page_id + '/uri',
+    success: function(resp) { $('#uri').html(resp.uri); }
+  });
+}
+
 </script>
 <% end %>

data/config/routes.rb

@@ -51,6 +51,7 @@ Caboose::Engine.routes.draw do
   get     "admin/pages/robots-options"    => "pages#admin_robots_options"
   get     "admin/pages/format-options"    => "pages#admin_content_format_options"
   get     "admin/pages/new"               => "pages#admin_new"
+  get     "admin/pages/:id/uri"           => "pages#admin_page_uri"
   get     "admin/pages/:id/delete"        => "pages#admin_delete_form"  
   get     "admin/pages/:id/sitemap"       => "pages#admin_sitemap"
   get     "admin/pages/:id/edit"          => "pages#admin_edit_general"

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.2.68'
+  VERSION = '0.2.70'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.2.68
+  version: 0.2.70
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -197,6 +197,7 @@ files:
 - app/models/caboose/menu_block.rb
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
+- app/models/caboose/page_block.rb
 - app/models/caboose/page_permission.rb
 - app/models/caboose/pager.rb
 - app/models/caboose/permission.rb