Merge branch 'master' of ssh://git@svn.medienhaus.udk-berlin.de/usr/local/git/cccms

2 files changed, 7 insertions, 1 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 8b7fe62..b56dff5 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -88,7 +88,7 @@ class Node < ActiveRecord::Base
   
   # returns array with pages up to root excluding root
   def path_to_root
-    parent.nil? && [slug] || parent.path_to_root.push(slug)
+    parent.nil? ? [slug] : parent.path_to_root.push(slug)
   end
   
   def update_unique_name  
diff --git a/app/models/page.rb b/app/models/page.rb
index dfabecf..b2c0ff8 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -13,6 +13,12 @@ class Page < ActiveRecord::Base
     :conditions => ["nodes.draft_id = pages.id"]
   )
   
+  named_scope(
+    :heads,
+    :include => [:node, :user, :globalize_translations],
+    :conditions => ["nodes.head_id = pages.id"]
+  )
+  
   # Mixins and Plugins
   acts_as_taggable  
   acts_as_list :column => :revision, :scope => :node_id