[LH346] - Modifications to connectable -> page relationship

Author: k1mmeh

app/models/page.rb

@@ -41,6 +41,21 @@ class Page < ActiveRecord::Base
  :conditions => ['connectors.connectable_id = ? and connectors.connectable_type = ?', obj.id, obj.class.base_class.name] } 
  end 
  } 
+
+ # currently_connected_to tightens the scope of connected_to by restricting to the 
+ # results to matches on current versions of pages only. This renders obj versions
+ # useless, as the older objects will very likely have older versions of pages and
+ # thus return no results.
+ named_scope :currently_connected_to, lambda { |obj|
+ ver = obj.class.versioned? ? obj.version : nil
+ if ver
+ { :include => :connectors, 
+ :conditions => ['connectors.connectable_id = ? and connectors.connectable_type = ? and connectors.connectable_version = ? and connectors.page_version = pages.version', obj.id, obj.class.base_class.name, ver] }
+ else
+ { :include => :connectors, 
+ :conditions => ['connectors.connectable_id = ? and connectors.connectable_type = ? and connectors.page_version = pages.version', obj.id, obj.class.base_class.name] } 
+ end
+ }
 
  has_one :section_node, :as => :node, :dependent => :destroy
 

lib/cms/behaviors/connecting.rb

@@ -39,11 +39,11 @@ def display_name_plural
  module InstanceMethods
 
  def connected_pages
- Page.connected_to(self)
+ Page.currently_connected_to(self)
  end
 
  def connected_page_count
- Page.connected_to(self).count
+ Page.currently_connected_to(self).count
  end
 
  def content_block_type

test/functional/cms/html_blocks_controller_test.rb

@@ -150,7 +150,8 @@ def test_usages
  @page = Factory(:page, :section => root_section, :name => "Included")
  @page2 = Factory(:page, :section => root_section, :path => "/other_path", :name => "Excluded")
  @block = Factory(:html_block, :connect_to_page_id => @page.id, :connect_to_container => "main")
- 
+ @page.publish! # usages are only relevant when page is published
+
  get :usages, :id => @block.id
 
  assert_response :success
@@ -160,4 +161,4 @@ def test_usages
  assert_select "h3", "Content Types"
  end
 
-end
+end

test/functional/cms/portlets_controller_test.rb

@@ -50,6 +50,7 @@ def test_usages
  @page = Factory(:page, :section => root_section, :name => "Test Page", :path => "test")
  @page.create_connector(@block, "main")
  @page.reload
+ @page.publish! # usages are only relevant when page is published
 
  get :usages, :id => @block.id
 
@@ -64,4 +65,4 @@ def test_form_helpers_which_use_instructions
  assert_select "div.instructions", "Leave blank to send the user to the page they were trying to access"
 
  end
-end
+end