[myexperiment-hackers] [2222] trunk/app/controllers: added redirects

[noreply]

Revision

2222

Author

dgc

Date

2009-06-10 11:21:55 -0400 (Wed, 10 Jun 2009)

Log Message

added redirects

Modified Paths

• trunk/app/controllers/blobs_controller.rb
• trunk/app/controllers/networks_controller.rb
• trunk/app/controllers/packs_controller.rb
• trunk/app/controllers/users_controller.rb

Diff

Modified: trunk/app/controllers/blobs_controller.rb (2221 => 2222)

--- trunk/app/controllers/blobs_controller.rb	2009-06-10 15:19:47 UTC (rev 2221)
+++ trunk/app/controllers/blobs_controller.rb	2009-06-10 15:21:55 UTC (rev 2222)
@@ -25,15 +25,7 @@
   
   # GET /files;search
   def search
-    @query = params[:query] || ''
-    @query.strip!
-    
-    @blobs = (Conf.solr_enable && address@hidden) ? Blob.find_by_solr(@query, :limit => 100).results : []
-    @blobs_found_total_count = (Conf.solr_enable && address@hidden) ? Blob.count_by_solr(@query) : 0
-    
-    respond_to do |format|
-      format.html # search.rhtml
-    end
+    redirect_to(search_path + "?type=files&query=" + params[:query])
   end
   
   # GET /files/1;download

Modified: trunk/app/controllers/networks_controller.rb (2221 => 2222)

--- trunk/app/controllers/networks_controller.rb	2009-06-10 15:19:47 UTC (rev 2221)
+++ trunk/app/controllers/networks_controller.rb	2009-06-10 15:21:55 UTC (rev 2222)
@@ -18,15 +18,7 @@
   
   # GET /networks;search
   def search
-    @query = params[:query] || ''
-    @query.strip!
-    
-    @networks = (Conf.solr_enable && address@hidden) ? Network.find_by_solr(@query, :limit => 100).results : []
-    @networks_found_total_count = (Conf.solr_enable && address@hidden) ? Network.count_by_solr(@query) : 0
-    
-    respond_to do |format|
-      format.html # search.rhtml
-    end
+    redirect_to(search_path + "?type=groups&query=" + params[:query])
   end
   
   # GET /networks/1;invite

Modified: trunk/app/controllers/packs_controller.rb (2221 => 2222)

--- trunk/app/controllers/packs_controller.rb	2009-06-10 15:19:47 UTC (rev 2221)
+++ trunk/app/controllers/packs_controller.rb	2009-06-10 15:21:55 UTC (rev 2222)
@@ -23,15 +23,7 @@
   cache_sweeper :comment_sweeper, : [ :comment, :comment_delete ]
 
   def search
-    @query = params[:query] || ''
-    @query.strip!
-    
-    @packs = (Conf.solr_enable && address@hidden) ? Pack.find_by_solr(@query, :limit => 100).results : []
-    @packs_found_total_count = (Conf.solr_enable && address@hidden) ? Pack.count_by_solr(@query) : 0
-    
-    respond_to do |format|
-      format.html # search.rhtml
-    end
+    redirect_to(search_path + "?type=packs&query=" + params[:query])
   end
 
   # GET /packs

Modified: trunk/app/controllers/users_controller.rb (2221 => 2222)

--- trunk/app/controllers/users_controller.rb	2009-06-10 15:19:47 UTC (rev 2221)
+++ trunk/app/controllers/users_controller.rb	2009-06-10 15:21:55 UTC (rev 2222)
@@ -19,18 +19,7 @@
   
   # GET /users;search
   def search
-    @query = params[:query] || ''
-    @query.strip!
-    
-    results = (Conf.solr_enable && address@hidden) ? User.find_by_solr(@query, :limit => 100).results : []
-    
-    # Only show activated users!
-    @users = results.select { |u| u.activated? }
-    @users_found_total_count = (Conf.solr_enable && address@hidden) ? User.count_by_solr(@query) : 0
-    
-    respond_to do |format|
-      format.html # search.rhtml
-    end
+    redirect_to(search_path + "?type=users&query=" + params[:query])
   end
   
   # GET /users