Merge branch 'develop' of git@github.com:sebbacon/alaveteli into develop

Conflicts:
	app/models/request_mailer.rb

1 files changed, 37 insertions, 26 deletions

diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index c1a13273a..12b5247b5 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -22,6 +22,21 @@ class RequestController < ApplicationController
     rescue MissingSourceFile, NameError
     end
 
+    def select_authority
+        # Check whether we force the user to sign in right at the start, or we allow her
+        # to start filling the request anonymously
+        if force_registration_on_new_request && !authenticated?(
+                :web => _("To send your FOI request"),
+                :email => _("Then you'll be allowed to send FOI requests."),
+                :email_subject => _("Confirm your email address")
+            )
+            # do nothing - as "authenticated?" has done the redirect to signin page for us
+            return
+        end
+
+        medium_cache
+    end
+    
     def show
         medium_cache
         @locale = self.locale_from_params()
@@ -37,7 +52,7 @@ class RequestController < ApplicationController
             # Look up by new style text names 
             @info_request = InfoRequest.find_by_url_title(params[:url_title])
             if @info_request.nil?
-                raise "Request not found" 
+                raise ActiveRecord::RecordNotFound.new("Request not found")
             end
             set_last_request(@info_request)
 
@@ -66,7 +81,7 @@ class RequestController < ApplicationController
 
             @last_info_request_event_id = @info_request.last_event_id_needing_description
             @new_responses_count = @info_request.events_needing_description.select {|i| i.event_type == 'response'}.size
-1
+
             # Sidebar stuff
             # ... requests that have similar imporant terms
             behavior_cache :tag => ['similar', @info_request.id] do
@@ -129,26 +144,10 @@ class RequestController < ApplicationController
     def list
         medium_cache
         @view = params[:view]
-
-        if @view.nil?
-            redirect_to request_list_url(:view => 'successful')
-            return
-        end
-
-        if @view == 'recent'
-            @title = _("Recently sent Freedom of Information requests")
-            query = "variety:sent";
-            sortby = "newest"
-            @track_thing = TrackThing.create_track_for_all_new_requests
-        elsif @view == 'successful'
-            @title = _("Recently successful responses")
-            query = 'variety:response (status:successful OR status:partially_successful)'
-            sortby = "described"
-            @track_thing = TrackThing.create_track_for_all_successful_requests
-        else
-            raise "unknown request list view " + @view.to_s
-        end
-        
+        params[:latest_status] = @view
+        query = make_query_from_params
+        @title = _("View and search requests")
+        sortby = "newest"
         @page = get_search_page_from_params if !@page # used in cache case, as perform_search sets @page as side effect
         behavior_cache :tag => [@view, @page] do
             xapian_object = perform_search([InfoRequestEvent], query, sortby, 'request_collapse')
@@ -157,7 +156,7 @@ class RequestController < ApplicationController
         end
         
         @title = @title + " (page " + @page.to_s + ")" if (@page > 1)
-
+        @track_thing = TrackThing.create_track_for_search_query(query)
         @feed_autodetect = [ { :url => do_track_url(@track_thing, 'feed'), :title => @track_thing.params[:title_in_rss], :has_json => true } ]
 
         # Don't let robots go more than 20 pages in
@@ -203,7 +202,7 @@ class RequestController < ApplicationController
                     params[:info_request][:public_body_id] = params[:url_name]
                 else
                     public_body = PublicBody.find_by_url_name_with_historic(params[:url_name])
-                    raise "None found" if public_body.nil? # XXX proper 404
+                    raise ActiveRecord::RecordNotFound.new("None found") if public_body.nil? # XXX proper 404
                     params[:info_request][:public_body_id] = public_body.id
                 end
             elsif params[:public_body_id]
@@ -686,10 +685,10 @@ class RequestController < ApplicationController
         raise "internal error, pre-auth filter should have caught this" if !@info_request.user_can_view?(authenticated_user)
   
         @attachment = IncomingMessage.get_attachment_by_url_part_number(@incoming_message.get_attachments_for_display, @part_number)
-        raise "attachment not found part number " + @part_number.to_s + " incoming_message " + @incoming_message.id.to_s if @attachment.nil?
+        raise ActiveRecord::RecordNotFound.new("attachment not found part number " + @part_number.to_s + " incoming_message " + @incoming_message.id.to_s) if @attachment.nil?
 
         # check filename in URL matches that in database (use a censor rule if you want to change a filename)
-        raise "please use same filename as original file has, display: '" + @attachment.display_filename + "' old_display: '" + @attachment.old_display_filename + "' original: '" + @original_filename + "'" if @attachment.display_filename != @original_filename && @attachment.old_display_filename != @original_filename
+        raise ActiveRecord::RecordNotFound.new("please use same filename as original file has, display: '" + @attachment.display_filename + "' old_display: '" + @attachment.old_display_filename + "' original: '" + @original_filename + "'") if @attachment.display_filename != @original_filename && @attachment.old_display_filename != @original_filename
 
         @attachment_url = get_attachment_url(:id => @incoming_message.info_request_id,
                 :incoming_message_id => @incoming_message.id, :part => @part_number,
@@ -743,5 +742,17 @@ class RequestController < ApplicationController
             return
         end
     end
+
+    # Type ahead search
+    def search_typeahead
+        # Since acts_as_xapian doesn't support the Partial match flag, we work around it
+        # by making the last work a wildcard, which is quite the same
+        query = params[:q] + '*'
+
+        query = query.split(' ').join(' OR ')       # XXX: HACK for OR instead of default AND!
+        @xapian_requests = perform_search([InfoRequestEvent], query, 'relevant', 'request_collapse', 5)
+
+        render :partial => "request/search_ahead.rhtml"
+    end
 end