aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2008-01-02 20:29:38 +0000
committerfrancis <francis>2008-01-02 20:29:38 +0000
commit859f9b5db0634f4ae2485348b3d10bcd1e8f1942 (patch)
tree66a4a3b5a60c3cee2668ad6e7a2e533e34339c82
parent80d62bdfe2c4fd831659cb9ee48d624e72d4d9aa (diff)
Fix bug in error message display, found by observing a user.
-rw-r--r--app/controllers/request_controller.rb9
-rw-r--r--todo.txt2
2 files changed, 3 insertions, 8 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index ff09e43ff..b71c6f1ad 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: request_controller.rb,v 1.24 2008-01-02 15:45:00 francis Exp $
+# $Id: request_controller.rb,v 1.25 2008-01-02 20:29:38 francis Exp $
class RequestController < ApplicationController
@@ -81,15 +81,12 @@ class RequestController < ApplicationController
@incoming_message.save
flash[:notice] = "Thank you for classifying the response."
redirect_to show_request_url(:id => @info_request)
+ return
end
- if params[:incoming_message_id]
+ if params[:commit]
# Case when didn't choose radio option, but did submit form
flash[:error] = "Please choose whether or not you got some of the information that you wanted."
end
-
- @correspondences = @info_request.outgoing_messages + @info_request.incoming_messages
- @correspondences.sort! { |a,b| a.sent_at <=> b.sent_at }
- @status = @info_request.calculate_status
end
diff --git a/todo.txt b/todo.txt
index 184d27904..247a17bc9 100644
--- a/todo.txt
+++ b/todo.txt
@@ -41,8 +41,6 @@ Test that it is actually sending the request outgoing mail, by using deliveries
Remove "Outgoing messages is invalid" error
Make it so "mysociety test" can be done on the servers, so it checks any packages are installed
-
-When you classify something, it prints the error message on the page after it for no reason
Add fixtures for info_request_event