move stuff around

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 3c7d3ff82a4c97d1283bf5ed353618eaf5424c8a..748200834f1298c97a1824870ea1574a9002e575 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -2,11 +2,6 @@ class SiteController < ApplicationController
   before_filter :authorize_web
   before_filter :require_user, :only => [:edit]
 
   before_filter :authorize_web
   before_filter :require_user, :only => [:edit]
 

-
-  def search
-    @tags = WayTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", params[:query][:query].to_s] )
-  end
-

   def goto_way
     way = Way.find(params[:id])
 
   def goto_way
     way = Way.find(params[:id])
 

diff --git a/app/controllers/way_segment_controller.rb b/app/controllers/way_segment_controller.rb
index fb3c09cbd2c13f34a5adc351a2eec1cf9918fc6e..e37303f3eb90bef8fe7ad4bca2b3e767702d2faf 100644 (file)
--- a/app/controllers/way_segment_controller.rb
+++ b/app/controllers/way_segment_controller.rb
@@ -1,2 +1,5 @@
 class WaySegmentController < ApplicationController
 class WaySegmentController < ApplicationController

+
+
+

 end
 end

diff --git a/app/controllers/way_tag_controller.rb b/app/controllers/way_tag_controller.rb
index 16763b3565fce40e112161c125997d984698971c..5c6ac6617149371eceb339334522cd07b5b6be7d 100644 (file)
--- a/app/controllers/way_tag_controller.rb
+++ b/app/controllers/way_tag_controller.rb
@@ -1,2 +1,8 @@
 class WayTagController < ApplicationController
 class WayTagController < ApplicationController

+
+  def search
+    @tags = WayTag.find(:all, :limit => 11, :conditions => ["match(v) against (?)", params[:query][:query].to_s] )
+  end
+
+

 end
 end

diff --git a/app/views/site/search.rhtml b/app/views/way_tag/search.rhtml
similarity index 100%
rename from app/views/site/search.rhtml
rename to app/views/way_tag/search.rhtml

diff --git a/config/routes.rb b/config/routes.rb
index b34948a6c770ad2417ad5b062829b5a403f04db6..ca19c966879978dc478a4207c4a41c3f23d6066f 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -30,7 +30,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/', :controller => 'site', :action => 'index'
   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'
   map.connect '/', :controller => 'site', :action => 'index'
   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'

-  map.connect '/search.html', :controller => 'site', :action => 'search'
+  map.connect '/search.html', :controller => 'way_tag', :action => 'search'

   map.connect '/login.html', :controller => 'user', :action => 'login'
   map.connect '/logout.html', :controller => 'user', :action => 'logout'
   map.connect '/create-account.html', :controller => 'user', :action => 'new'
   map.connect '/login.html', :controller => 'user', :action => 'login'
   map.connect '/logout.html', :controller => 'user', :action => 'logout'
   map.connect '/create-account.html', :controller => 'user', :action => 'new'