Add parentheses to avoid warnings.

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

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 4de490b2cf84a5c35d77bf27313c808a13aef5ce..91d8eb84fa4b5e42ea49d45cb118a6565d9e5e10 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -25,13 +25,6 @@ class BrowseController < ApplicationController
     @type = "relation"
     render :action => "not_found", :status => :not_found
   end
     @type = "relation"
     render :action => "not_found", :status => :not_found
   end

-
-  def relation_map
-    @relation = Relation.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    @type = "relation"
-    render :action => "not_found", :status => :not_found
-  end

   
   def way
     @way = Way.find(params[:id], :include => [:way_tags, {:changeset => :user}, {:nodes => [:node_tags, {:ways => :way_tags}]}, :containing_relation_members])
   
   def way
     @way = Way.find(params[:id], :include => [:way_tags, {:changeset => :user}, {:nodes => [:node_tags, {:ways => :way_tags}]}, :containing_relation_members])


@@ -52,13 +45,6 @@ class BrowseController < ApplicationController
     render :action => "not_found", :status => :not_found
   end
 
     render :action => "not_found", :status => :not_found
   end
 

-  def way_map
-    @way = Way.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    @type = "way"
-    render :action => "not_found", :status => :not_found
-  end
-

   def node
     @node = Node.find(params[:id])
     @next = Node.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @node.id }] )
   def node
     @node = Node.find(params[:id])
     @next = Node.find(:first, :order => "id ASC", :conditions => [ "visible = true AND id > :id", { :id => @node.id }] )


@@ -74,13 +60,6 @@ class BrowseController < ApplicationController
     @type = "way"
     render :action => "not_found", :status => :not_found
   end
     @type = "way"
     render :action => "not_found", :status => :not_found
   end

-
-  def node_map
-    @node = Node.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    @type = "node"
-    render :action => "not_found", :status => :not_found
-  end

   
   def changeset
     @changeset = Changeset.find(params[:id])
   
   def changeset
     @changeset = Changeset.find(params[:id])


@@ -90,14 +69,10 @@ class BrowseController < ApplicationController
       
     @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}"
     @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) 
       
     @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}"
     @next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] ) 

-    @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] ) 
-  rescue ActiveRecord::RecordNotFound
-    @type = "changeset"
-    render :action => "not_found", :status => :not_found
-  end
+    @prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] )

 
 

-  def changeset_map
-    @changeset = Changeset.find(params[:id])
+    @next_by_user = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] )
+    @prev_by_user = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id AND user_id = :user_id", {:id => @changeset.id, :user_id => @changeset.user_id }] )

   rescue ActiveRecord::RecordNotFound
     @type = "changeset"
     render :action => "not_found", :status => :not_found
   rescue ActiveRecord::RecordNotFound
     @type = "changeset"
     render :action => "not_found", :status => :not_found