Diff
Modified: trunk/app/controllers/blobs_controller.rb (2695 => 2696)
--- trunk/app/controllers/blobs_controller.rb 2011-09-08 20:03:01 UTC (rev 2695)
+++ trunk/app/controllers/blobs_controller.rb 2011-09-09 16:04:23 UTC (rev 2696)
@@ -70,6 +70,9 @@
:lock_filter => { 'CATEGORY' => 'Blob' },
:filters => expr)
+ @query = params[:query]
+ @query_type = 'files'
+
# index.rhtml
}
end
Modified: trunk/app/controllers/content_controller.rb (2695 => 2696)
--- trunk/app/controllers/content_controller.rb 2011-09-08 20:03:01 UTC (rev 2695)
+++ trunk/app/controllers/content_controller.rb 2011-09-09 16:04:23 UTC (rev 2696)
@@ -23,6 +23,8 @@
@pivot = contributions_list(Contribution, params, current_user,
:filters => expr, :arbitrary_models => true)
+ @query = params[:query]
+
# index.rhtml
end
# format.rss do
Modified: trunk/app/controllers/packs_controller.rb (2695 => 2696)
--- trunk/app/controllers/packs_controller.rb 2011-09-08 20:03:01 UTC (rev 2695)
+++ trunk/app/controllers/packs_controller.rb 2011-09-09 16:04:23 UTC (rev 2696)
@@ -43,6 +43,9 @@
:lock_filter => { 'CATEGORY' => 'Pack' },
:filters => expr)
+ @query = params[:query]
+ @query_type = 'packs'
+
# index.rhtml
}
end
Modified: trunk/app/controllers/search_controller.rb (2695 => 2696)
--- trunk/app/controllers/search_controller.rb 2011-09-08 20:03:01 UTC (rev 2695)
+++ trunk/app/controllers/search_controller.rb 2011-09-09 16:04:23 UTC (rev 2696)
@@ -31,8 +31,18 @@
if @type == "all"
search_all
else
- search_model
-#redirect_to :controller => params[:type], :action ="" "search", :query => params[:query]
+ case params[:type]
+ when 'workflows'
+ redirect_to(workflows_path(:query => params[:query]))
+ when 'files'
+ redirect_to(files_path(:query => params[:query]))
+ when 'packs'
+ redirect_to(packs_path(:query => params[:query]))
+ when 'services'
+ redirect_to(services_path(:query => params[:query]))
+ else
+ search_model
+ end
end
end
Modified: trunk/app/controllers/services_controller.rb (2695 => 2696)
--- trunk/app/controllers/services_controller.rb 2011-09-08 20:03:01 UTC (rev 2695)
+++ trunk/app/controllers/services_controller.rb 2011-09-09 16:04:23 UTC (rev 2696)
@@ -41,6 +41,9 @@
:lock_filter => { 'CATEGORY' => 'Service' },
:filters => expr)
+ @query = params[:query]
+ @query_type = 'services'
+
# index.rhtml
}
end
Modified: trunk/app/controllers/workflows_controller.rb (2695 => 2696)
--- trunk/app/controllers/workflows_controller.rb 2011-09-08 20:03:01 UTC (rev 2695)
+++ trunk/app/controllers/workflows_controller.rb 2011-09-09 16:04:23 UTC (rev 2696)
@@ -213,6 +213,9 @@
:lock_filter => { 'CATEGORY' => 'Workflow' },
:filters => expr)
+ @query = params[:query]
+ @query_type = 'workflows'
+
end
format.rss do
address@hidden = Workflow.find(:all, :order => "updated_at DESC") # list all (if required)
Modified: trunk/app/views/layouts/_search.rhtml (2695 => 2696)
--- trunk/app/views/layouts/_search.rhtml 2011-09-08 20:03:01 UTC (rev 2695)
+++ trunk/app/views/layouts/_search.rhtml 2011-09-09 16:04:23 UTC (rev 2696)
@@ -1,5 +1,5 @@
<% form_tag search_path, :method => :get do %>
- <%= text_field_tag :query, @query, :style => "padding: 0.1em;" %>
+ <%= text_field_tag :query, @query ? @query.strip : nil, :style => "padding: 0.1em;" %>
<%= select_tag :type, options_for_select(Conf.search_categories.collect { |t| [t.capitalize, t] }, @query_type) %>
<%= submit_tag "Search", :disable_with => "Searching..." %>
<% end %>