Merge branch 'release/0.5' into develop

1 files changed, 6 insertions, 5 deletions

diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 8ac41b05a..82b1b8629 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -45,20 +45,21 @@ class GeneralController < ApplicationController
                          :joins => :translations)
                 end
             end
-            # Get some successful requests #
+            # Get some successful requests
             begin
                 query = 'variety:response (status:successful OR status:partially_successful)'
-                # query = 'variety:response' # XXX debug
-                sortby = "described"
+                sortby = "newest"
                 max_count = 5
                 xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', max_count)
                 @request_events = xapian_object.results.map { |r| r[:model] }
-                @request_events = @request_events.sort_by { |e| e.described_at }.reverse
+                
+                # If there are not yet enough successful requests, fill out the list with
+                # other requests
                 if @request_events.count < max_count
                     query = 'variety:sent'
                     xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_title_collapse', max_count-@request_events.count)
                     more_events = xapian_object.results.map { |r| r[:model] }
-                    @request_events += more_events.sort_by { |e| e.described_at }.reverse
+                    @request_events += more_events
                 end
             rescue
                 @request_events = []