Diff
Modified: trunk/app/controllers/blobs_controller.rb (2037 => 2038)
--- trunk/app/controllers/blobs_controller.rb 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/controllers/blobs_controller.rb 2008-12-08 14:41:41 UTC (rev 2038)
@@ -29,6 +29,7 @@
@query.strip!
@blobs = (SOLR_ENABLE && address@hidden) ? Blob.find_by_solr(@query, :limit => 100).results : []
+ @blobs_found_total_count = (SOLR_ENABLE && address@hidden) ? Blob.count_by_solr(@query) : 0
respond_to do |format|
format.html # search.rhtml
Modified: trunk/app/controllers/networks_controller.rb (2037 => 2038)
--- trunk/app/controllers/networks_controller.rb 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/controllers/networks_controller.rb 2008-12-08 14:41:41 UTC (rev 2038)
@@ -22,6 +22,7 @@
@query.strip!
@networks = (SOLR_ENABLE && address@hidden) ? Network.find_by_solr(@query, :limit => 100).results : []
+ @networks_found_total_count = (SOLR_ENABLE && address@hidden) ? Network.count_by_solr(@query) : 0
respond_to do |format|
format.html # search.rhtml
Modified: trunk/app/controllers/packs_controller.rb (2037 => 2038)
--- trunk/app/controllers/packs_controller.rb 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/controllers/packs_controller.rb 2008-12-08 14:41:41 UTC (rev 2038)
@@ -27,6 +27,7 @@
@query.strip!
@packs = (SOLR_ENABLE && address@hidden) ? Pack.find_by_solr(@query, :limit => 100).results : []
+ @packs_found_total_count = (SOLR_ENABLE && address@hidden) ? Pack.count_by_solr(@query) : 0
respond_to do |format|
format.html # search.rhtml
Modified: trunk/app/controllers/search_controller.rb (2037 => 2038)
--- trunk/app/controllers/search_controller.rb 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/controllers/search_controller.rb 2008-12-08 14:41:41 UTC (rev 2038)
@@ -46,6 +46,12 @@
if SOLR_ENABLE && address@hidden
@results = User.multi_solr_search(@query, :limit => 100,
:models => [User, Workflow, Blob, Network, Pack]).results
+
+ @users_found_total_count = User.count_by_solr(@query)
+ @workflows_found_total_count = Workflow.count_by_solr(@query)
+ @blobs_found_total_count = Blob.count_by_solr(@query)
+ @networks_found_total_count = Network.count_by_solr(@query)
+ @packs_found_total_count = Pack.count_by_solr(@query)
end
@users = @results.select do |r| r.instance_of?(User) end
Modified: trunk/app/controllers/users_controller.rb (2037 => 2038)
--- trunk/app/controllers/users_controller.rb 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/controllers/users_controller.rb 2008-12-08 14:41:41 UTC (rev 2038)
@@ -27,6 +27,7 @@
# Only show activated users!
@users = results.select { |u| u.activated? }
+ @users_found_total_count = (SOLR_ENABLE && address@hidden) ? User.count_by_solr(@query) : 0
respond_to do |format|
format.html # search.rhtml
Modified: trunk/app/views/blobs/search.rhtml (2037 => 2038)
--- trunk/app/views/blobs/search.rhtml 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/views/blobs/search.rhtml 2008-12-08 14:41:41 UTC (rev 2038)
@@ -2,7 +2,7 @@
<h1>Search Results</h1>
-<h2><%= pluralize(@blobs.length, "file") %> found for <%= @query ? "\"address@hidden"" : "" %></h2>
+<h2>Showing <%= pluralize(@blobs.length, "file") %> of <%= @blobs_found_total_count -%> found for <%= @query ? "\"address@hidden"" : "" %></h2>
<%= view_privileges_notice %>
<br/>
Modified: trunk/app/views/networks/search.rhtml (2037 => 2038)
--- trunk/app/views/networks/search.rhtml 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/views/networks/search.rhtml 2008-12-08 14:41:41 UTC (rev 2038)
@@ -2,7 +2,7 @@
<h1>Search Results</h1>
-<h2><%= pluralize(@networks.length, "group") %> found for <%= @query ? "\"address@hidden"" : "" %></h2>
+<h2>Showing <%= pluralize(@networks.length, "group") %> of <%= @networks_found_total_count -%> found for <%= @query ? "\"address@hidden"" : "" %></h2>
<%= render :partial => "networks/table", :locals => { :collection => @networks } %>
Modified: trunk/app/views/packs/search.rhtml (2037 => 2038)
--- trunk/app/views/packs/search.rhtml 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/views/packs/search.rhtml 2008-12-08 14:41:41 UTC (rev 2038)
@@ -2,7 +2,7 @@
<h1>Search Results</h1>
-<h2><%= pluralize(@packs.length, "pack") %> found for <%= @query ? "\"address@hidden"" : "" %></h2>
+<h2>Showing <%= pluralize(@packs.length, "pack") %> of <%= @packs_found_total_count -%> found for <%= @query ? "\"address@hidden"" : "" %></h2>
<%= view_privileges_notice %>
<br/>
Modified: trunk/app/views/search/show.rhtml (2037 => 2038)
--- trunk/app/views/search/show.rhtml 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/views/search/show.rhtml 2008-12-08 14:41:41 UTC (rev 2038)
@@ -22,7 +22,7 @@
<% unless @users.empty? %>
<div class="tabContainer">
- <div class="tabTitle">Users (<%= @users.length -%>)</div>
+ <div class="tabTitle">Users (<%= @users.length -%> of <%= @users_found_total_count -%>)</div>
<div class="tabContent">
<%= render :partial => "users/table", :locals => { :collection => @users, :query => @query } %>
</div>
@@ -31,7 +31,7 @@
<% unless @networks.empty? %>
<div class="tabContainer">
- <div class="tabTitle">Groups (<%= @networks.length -%>)</div>
+ <div class="tabTitle">Groups (<%= @networks.length -%> of <%= @networks_found_total_count -%>)</div>
<div class="tabContent">
<%= render :partial => "networks/table", :locals => { :collection => @networks, :query => @query } %>
</div>
@@ -49,7 +49,7 @@
<% unless @blobs.empty? %>
<div class="tabContainer">
- <div class="tabTitle">Files (<%= @blobs.length -%>)</div>
+ <div class="tabTitle">Files (<%= @blobs.length -%> of <%= @blobs_found_total_count -%>)</div>
<div class="tabContent">
<%= render :partial => "blobs/table", :locals => { :collection => @blobs, :query => @query } %>
</div>
@@ -58,7 +58,7 @@
<% unless @packs.empty? %>
<div class="tabContainer">
- <div class="tabTitle">Packs (<%= @packs.length -%>)</div>
+ <div class="tabTitle">Packs (<%= @packs.length -%> of <%= @packs_found_total_count -%>)</div>
<div class="tabContent">
<%= render :partial => "packs/table", :locals => { :collection => @packs, :query => @query } %>
</div>
Modified: trunk/app/views/users/search.rhtml (2037 => 2038)
--- trunk/app/views/users/search.rhtml 2008-12-08 13:11:27 UTC (rev 2037)
+++ trunk/app/views/users/search.rhtml 2008-12-08 14:41:41 UTC (rev 2038)
@@ -2,7 +2,7 @@
<h1>Search Results</h1>
-<h2><%= pluralize(@users.length, "user") %> found for <%= @query ? "\"address@hidden"" : "" %></h2>
+<h2>Showing <%= pluralize(@users.length, "user") %> of <%= @users_found_total_count -%> found for <%= @query ? "\"address@hidden"" : "" %></h2>
<%= render :partial => "users/table", :locals => { :collection => @users } %>