Make browse not found pages consistent

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

diff --git a/app/controllers/old_relations_controller.rb b/app/controllers/old_relations_controller.rb
index 40c450376a8e435cc8981c44cd9892ce15160653..ec256d6af680caaf10b39f4b20c453d1885b16da 100644 (file)
--- a/app/controllers/old_relations_controller.rb
+++ b/app/controllers/old_relations_controller.rb
@@ -1,11 +1,15 @@
-class OldRelationsController < OldController
-  private
-
-  def lookup_old_element
-    @old_element = OldRelation.find([params[:id], params[:version]])
+class OldRelationsController < OldElementsController
+  def index
+    @type = "relation"
+    @feature = Relation.preload(:relation_tags, :old_relations => [:old_tags, { :changeset => [:changeset_tags, :user], :old_members => :member }]).find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render "browse/not_found", :status => :not_found

   end
 
   end
 

-  def lookup_old_element_versions
-    @elements = OldRelation.where(:relation_id => params[:id]).order(:version)
+  def show
+    @type = "relation"
+    @feature = OldRelation.preload(:old_tags, :changeset => [:changeset_tags, :user], :old_members => :member).find([params[:id], params[:version]])
+  rescue ActiveRecord::RecordNotFound
+    render "browse/not_found", :status => :not_found

   end
 end
   end
 end