[BUG] Deleting addressable content

* Fix issue where deleting addressable block from the sitemap throws error and breaks the UI.

Author: peakpg

app/controllers/cms/content_block_controller.rb

@@ -75,7 +75,11 @@ def update
 
  def destroy
  do_command("deleted") { @block.destroy }
- redirect_to_first params[:_redirect_to], blocks_path
+ respond_to do |format|
+ format.html {redirect_to_first params[:_redirect_to], blocks_path}
+ format.json {render :json => {:success => true }}
+ end
+
  end
 
  # Additional CMS Action

app/models/cms/link.rb

@@ -5,7 +5,7 @@ class Cms::Link < ActiveRecord::Base
 
  validates_presence_of :name
 
- is_addressable(dependent: :destroy)
+ is_addressable
  include Cms::Concerns::Addressable::DeprecatedPageAccessors
 
  #needed by menu_helper

app/models/cms/page.rb

@@ -67,7 +67,7 @@ def actual_path
  end
  }
 
- is_addressable(dependent: :destroy, no_dynamic_path: true)
+ is_addressable(no_dynamic_path: true)
  include Cms::Concerns::Addressable::DeprecatedPageAccessors
 
 

app/models/cms/section.rb

@@ -2,7 +2,7 @@ module Cms
  class Section < ActiveRecord::Base
  flush_cache_on_change
 
- is_addressable no_dynamic_path: true
+ is_addressable no_dynamic_path: true, destroy_if: :deletable?
  # Cannot use dependent => :destroy to do this. Ancestry's callbacks trigger before the before_destroy callback.
  # So sections would always get deleted since deletable? would return true
  after_destroy :destroy_node
@@ -131,11 +131,6 @@ def deletable?
  !root? && empty?
  end
 
- # Callback to clean up related nodes
- def destroy_node
- node.destroy
- end
-
  def editable_by_group?(group)
  group.editable_by_section(self)
  end

lib/cms/concerns/can_be_addressable.rb

@@ -8,11 +8,16 @@ module CanBeAddressable
  # @params [Hash] options
  # @option options [String] :path The base path where instances will be placed.
  # @option options [String] :no_dynamic_path Set as true if the Record has a :path attribute managed as a column in the db. (Default: false)
+ # @option options [Symbol] :destroy_if Name of a custom method used to determine when this object should be destrotyed. Rather than dependant: destroy to determine if the section node should be destroyed when this object is.
  def is_addressable(options={})
  has_one_options = {as: :node, inverse_of: :node, class_name: 'Cms::SectionNode'}
- if options[:dependent]
- has_one_options[:dependent] = options[:dependent]
+ unless options[:destroy_if]
+ has_one_options[:dependent] = :destroy
+ else
+ before_destroy options[:destroy_if]
+ after_destroy :destroy_node
  end
+
  has_one :section_node, has_one_options
 
  include Cms::Concerns::Addressable
@@ -144,6 +149,10 @@ def self.descendants
  ObjectSpace.each_object(::Class).select { |klass| klass < Cms::Concerns::Addressable }
  end
 
+ # Allows for manual destruction of node
+ def destroy_node
+ node.destroy
+ end
 
  # Returns the value that will appear in the <title> element of the page when this content is rendered.
  # Subclasses can override this.

test/unit/concerns/addressable_test.rb

@@ -94,6 +94,15 @@ class UsingDefaultTemplate < ActiveRecord::Base
  end
  end
 
+ describe ".destroy" do
+ it "should also delete the section node" do
+ add = IsAddressable.create(slug: "coke", parent_id: root_section)
+ before = Cms::SectionNode.count
+ add.destroy
+ (Cms::SectionNode.count - before).must_equal -1
+ end
+ end
+
  describe ".path" do
  it "should join #path and .slug" do
  addressable.expects(:slug).returns("one")

todo_ui_Revamp.md

@@ -2,8 +2,8 @@ Tasks:
 
 ## UI Merge
 
-* [BUG] Deleting addressable content from the sitemap throws error and breaks the UI.
-* Select something else after deleting.
+* Sections can be hidden (but sitemap doesn't show it)
+ * Select something else after deleting.
 * Handle non-editable sections (from security)
 * Audit sitemap.js.erb for remaining features.
 * Have something selected at the start (last selected or Root)