added head id to node model which points to the

head of the nodes pages collection. modified
tests, importer etc

renamed flags to tags

2 files changed, 5 insertions, 4 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 0aa28b9..a1d8af0 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -1,7 +1,8 @@
 class Node < ActiveRecord::Base
   acts_as_nested_set
   
-  has_many :pages, :order => "revision ASC"
+  has_many    :pages, :order => "revision ASC"
+  belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id
   
   # Class methods
   
@@ -21,7 +22,7 @@ class Node < ActiveRecord::Base
     if node
       case revision
       when -1        
-        return node.pages.last 
+        return node.head
       else
         return node.pages.find_by_revision revision
       end
diff --git a/app/models/page.rb b/app/models/page.rb
index d33e11b..4fcee8c 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -14,7 +14,7 @@ class Page < ActiveRecord::Base
   def self.aggregate options
     
     defaults = {
-      :flags            => "",
+      :tags             => "",
       :limit            => 20,
       :order_by         => "id",
       :order_direction  => "ASC"
@@ -23,7 +23,7 @@ class Page < ActiveRecord::Base
     options = defaults.merge options
     
     pages = Page.find_tagged_with(
-      options[:flags].gsub(/\s/, ", "),
+      options[:tags].gsub(/\s/, ", "),
       :match_all => true,
       :order => "#{options[:order_by]} #{options[:order_direction]}")
   end