diff options
Diffstat (limited to 'app/views/user/show.rhtml')
| -rw-r--r-- | app/views/user/show.rhtml | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 7daa8b11d..4e756b614 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -63,37 +63,41 @@ <% end %> <% if @xapian_requests.results.empty? %> - <h2>Freedom of Information requests made by <%= @is_you ? 'you' : 'this person' %></h2> + <h2>Freedom of Information requests made by <%= @is_you ? 'you' : 'this person' %> </h2> <p><%= @is_you ? 'You have' : 'This person has' %> made no Freedom of Information requests using this site.</p> <% else %> <h2> <%= @is_you ? 'Your ' : "This person's " %> - <%=pluralize(@xapian_requests.matches_estimated, "Freedom of Information request") %> + <%=pluralize(@display_user.info_requests.size, "Freedom of Information request") %> + <!-- matches_estimated <%=@xapian_requests.matches_estimated%> --> + <%= @page_desc %> </h2> <% for result in @xapian_requests.results %> <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> <% end %> - <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_requests.matches_estimated) %> + <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @display_user.info_requests.size) %> <% end %> <% if @xapian_comments.results.empty? %> - <h2><%= @is_you ? 'Your' : 'This person\'s' %> annotations</h2> + <h2><%= @is_you ? 'Your' : 'This person\'s' %> annotations </h2> <p>None made.</p> <% else %> <h2> - <%= @is_you ? 'Your ' : "This person's " %> - <%=pluralize(@xapian_comments.matches_estimated, "annotation") %> + <%= @is_you ? 'Your ' : "This person's " %> + <%=pluralize(@display_user.comments.size, "annotation") %> + <!-- matches_estimated <%=@xapian_comments.matches_estimated%> --> + <%= @page_desc %> </h2> <% for result in @xapian_comments.results %> <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %> <% end %> - <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @xapian_comments.matches_estimated) %> + <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @display_user.comments.size) %> <% end %> </div> |