2 files changed, 14 insertions, 11 deletions

diff --git a/app/models/flag.rb b/app/models/flag.rb
new file mode 100644
index 0000000..6d67377
--- /dev/null
+++ b/app/models/flag.rb
@@ -0,0 +1,3 @@
+class Flag < ActiveRecord::Base
+  has_and_belongs_to_many :pages
+end
diff --git a/app/models/page.rb b/app/models/page.rb
index 3d02e9f..d5d888f 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -1,9 +1,19 @@
 class Page < ActiveRecord::Base
   
   belongs_to :node
+  has_and_belongs_to_many :flags
   
   acts_as_list :column => :revision, :scope => :node_id
   
+  named_scope :with_flags, lambda {|flag_names| 
+    if (flags = Flag.find_all_by_name(flag_names)).empty?
+      {}
+    else
+      {:include => :flags, :conditions => ['flags_pages.flag_id IN (?)', flags.map(&:id)] }
+    end
+  }
+  
+  
   
   # <aggregate 
   #   flags="updates pressemitteilungen"
@@ -29,14 +39,4 @@ class Page < ActiveRecord::Base
       :order => "#{options[:order_by]} #{options[:order_direction]}"
     )
   end
-end
-
-
-named_scope :flagged_as, lambda { |flags| 
-  conditions = {}
-  flags.each do |flag|
-    conditions[flag] = true
-  end
-  
-  { :conditions => conditions }
-}
\ No newline at end of file
+end
\ No newline at end of file