drop _view from action names

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index e679442c196cf02e8a7e7edda379b932cf09a437..5e55de13b9e09204af988e3c3e1af678765e576f 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -2,7 +2,7 @@ class BrowseController < ApplicationController
   before_filter :authorize_web  
   layout 'site'
 
-  def relation_view 
+  def relation 
     begin
       @relation = Relation.find(params[:id])
      
@@ -32,7 +32,7 @@ class BrowseController < ApplicationController
     end
   end
   
-  def way_view 
+  def way 
     begin
       @way = Way.find(params[:id])
      
@@ -62,7 +62,7 @@ class BrowseController < ApplicationController
     end
   end
 
-  def node_view 
+  def node 
     begin
       @node = Node.find(params[:id])
      
@@ -86,7 +86,7 @@ class BrowseController < ApplicationController
        @name = "#" + @node.id.to_s
       end
        
-      @title = 'Node | ' + (@name)
+      @title = 'Node History | ' + (@name)
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end

diff --git a/app/views/browse/_member.rhtml b/app/views/browse/_member.rhtml
index 0082bc4db3a6a7b4f8266b6e0f60e347c6b3285b..29a72b122f073110101203f818f8795d564cf852 100644 (file)
--- a/app/views/browse/_member.rhtml
+++ b/app/views/browse/_member.rhtml
@@ -1,5 +1,5 @@
 <tr>
-  <td><%= link_to member.member_id.to_s, :action => member.member_type+'_view', :id => member.member_id %></td>
+  <td><%= link_to member.member_id.to_s, :action => member.member_type, :id => member.member_id %></td>
   <td><%= h(member.member_type) %></td>
   <td><%= h(member.member_role) %></td>
 </tr> 

diff --git a/config/routes.rb b/config/routes.rb
index fa7cd02965fe26ba1cfb06ee0fb2d59005cf9451..84e6256e163617b10baaab3fc3bc446c8db3e32e 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,11 +55,11 @@ ActionController::Routing::Routes.draw do |map|
   map.connect "api/#{API_VERSION}/swf/trackpoints", :controller =>'swf', :action =>'trackpoints'
   
   # Data browsing
-  map.connect '/browse/way/:id', :controller => 'browse', :action => 'way_view', :id => /\d+/
+  map.connect '/browse/way/:id', :controller => 'browse', :action => 'way', :id => /\d+/
   map.connect '/browse/way/:id/history', :controller => 'browse', :action => 'way_history', :id => /\d+/
-  map.connect '/browse/node/:id', :controller => 'browse', :action => 'node_view', :id => /\d+/
+  map.connect '/browse/node/:id', :controller => 'browse', :action => 'node', :id => /\d+/
   map.connect '/browse/node/:id/history', :controller => 'browse', :action => 'node_history', :id => /\d+/
-  map.connect '/browse/relation/:id', :controller => 'browse', :action => 'relation_view', :id => /\d+/
+  map.connect '/browse/relation/:id', :controller => 'browse', :action => 'relation', :id => /\d+/
   map.connect '/browse/relation/:id/history', :controller => 'browse', :action => 'relation_history', :id => /\d+/
   
   # web site