1 files changed, 20 insertions, 6 deletions

diff --git a/app/models/page.rb b/app/models/page.rb
index d5d888f..fee20a8 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -5,6 +5,24 @@ class Page < ActiveRecord::Base
   
   acts_as_list :column => :revision, :scope => :node_id
   
+  # Alternativ Queries with one or two inner joins. Loading the Flags themselves
+  # would be another query. Could be faster on larger data sets.
+  #
+  # Single Join:
+  #
+  # Page.find(
+  #   :all, 
+  #   :joins => 'JOIN flags_pages on pages.id = flags_pages.page_id', 
+  #   :include => :flags, 
+  #   :conditions => ['flags_pages.flag_id IN (?)', [1,2]]
+  # )
+  # Two inner joins:
+  #
+  # Page.find(
+  #   :all, 
+  #   :joins => :flags_pages, 
+  #   :conditions => ['flags_pages.flag_id IN (?)', [1,2]]
+  # )
   named_scope :with_flags, lambda {|flag_names| 
     if (flags = Flag.find_all_by_name(flag_names)).empty?
       {}
@@ -12,12 +30,9 @@ class Page < ActiveRecord::Base
       {:include => :flags, :conditions => ['flags_pages.flag_id IN (?)', flags.map(&:id)] }
     end
   }
-  
-  
-  
+
   # <aggregate 
   #   flags="updates pressemitteilungen"
-  #   path="updates/2009"
   #   limit="20"
   #   order_by="published_at"
   #   order_direction="DESC"
@@ -26,7 +41,6 @@ class Page < ActiveRecord::Base
     
     defaults = {
       :flags            => "",
-      :path             => "",
       :limit            => 20,
       :order_by         => "id",
       :order_direction  => "ASC"
@@ -34,7 +48,7 @@ class Page < ActiveRecord::Base
     
     options = defaults.merge options
     
-    pages = Page.all(
+    pages = Page.with_flags(options[:flags].split(/\s/)).all(
       :limit => options[:limit],
       :order => "#{options[:order_by]} #{options[:order_direction]}"
     )