Resolve conflict

[rails.git] / app / controllers / old_node_controller.rb

diff --git a/app/controllers/old_node_controller.rb b/app/controllers/old_node_controller.rb
index 7055c031cbf000b099b6955bcb778cc6e7312ece..16f33013ee1c01e251f34a19d177118c338f9e97 100644 (file)
--- a/app/controllers/old_node_controller.rb
+++ b/app/controllers/old_node_controller.rb
@@ -6,8 +6,7 @@ class OldNodeController < OldController
     @old_element = OldNode.find([params[:id], params[:version]])
   end
 
     @old_element = OldNode.find([params[:id], params[:version]])
   end
 

-  def lookup_old_elements_via_current
-    node = Node.find(params[:id])
-    @elements = node.old_nodes
+  def lookup_old_element_versions
+    @elements = OldNode.where(:node_id => params[:id]).order(:version)

   end
 end
   end
 end