Give link to user page if logged in user uses contact form.

5 files changed, 8 insertions, 17 deletions

diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 15a846e50..0ba7da12d 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -4,7 +4,7 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: help_controller.rb,v 1.7 2008-07-09 14:12:56 francis Exp $
+# $Id: help_controller.rb,v 1.8 2008-10-03 17:48:37 francis Exp $
 
 class HelpController < ApplicationController
     
@@ -27,7 +27,7 @@ class HelpController < ApplicationController
                     params[:contact][:email],
                     params[:contact][:subject],
                     params[:contact][:message],
-                    (@user ? ("logged in as user " + @user.email) : "not logged in")
+                    @user
                 )
                 flash[:notice] = "Your message has been sent. Thank you for getting in touch! We'll get back to you soon."
                 redirect_to frontpage_url 
diff --git a/app/models/contact_mailer.rb b/app/models/contact_mailer.rb
index b35450cef..f0fb37d20 100644
--- a/app/models/contact_mailer.rb
+++ b/app/models/contact_mailer.rb
@@ -4,17 +4,17 @@
 # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
 # Email: francis@mysociety.org; WWW: http://www.mysociety.org/
 #
-# $Id: contact_mailer.rb,v 1.7 2008-09-04 08:37:26 francis Exp $
+# $Id: contact_mailer.rb,v 1.8 2008-10-03 17:48:37 francis Exp $
 
 class ContactMailer < ApplicationMailer
 
     # Send message to administrator
-    def message(name, email, subject, message, request_details)
+    def message(name, email, subject, message, logged_in_user)
         @from = name + " <" + email + ">"
         @recipients = contact_from_name_and_email
         @subject = subject
         @body = { :message => message,
-            :request_details => request_details 
+            :logged_in_user => logged_in_user 
         }
     end
 
diff --git a/app/views/contact_mailer/message.rhtml b/app/views/contact_mailer/message.rhtml
index b5a54b4d3..54303cdd5 100644
--- a/app/views/contact_mailer/message.rhtml
+++ b/app/views/contact_mailer/message.rhtml
@@ -1,5 +1,6 @@
 <%= @message.strip %>
 
 ---------------------------------------------------------------------
-Message sent using WhatDoTheyKnow contact form, <%= @request_details %>
+Message sent using WhatDoTheyKnow contact form, 
+<%=(@logged_in_user ? ("logged in as user " + main_url(user_url(@logged_in_user))) : "not logged in")%>
 ---------------------------------------------------------------------
diff --git a/app/views/request/show_response.rhtml b/app/views/request/show_response.rhtml
index e8f99fc4e..25b9e6470 100644
--- a/app/views/request/show_response.rhtml
+++ b/app/views/request/show_response.rhtml
@@ -39,6 +39,7 @@
             To do that please send a private email to <%=h(@postal_email_name)%> 
             &lt;<%=link_to h(@postal_email), "mailto:" + @postal_email%>&gt;
             containing your postal address, and asking them to reply to this request.
+            Or you could phone them.
         </dd>
 
         </dl>
diff --git a/todo.txt b/todo.txt
index c74440b28..5074ee453 100644
--- a/todo.txt
+++ b/todo.txt
@@ -30,17 +30,6 @@ Internal review status/marker?
     (search for phrase "internal review"!)
 Remember - internal reviews can be *aborted* if they just send the response :)
 
-Request mailed by post to user (maybe), and not uploaded
-    http://www.whatdotheyknow.com/request/archaeology_south_easts_responsi
-    http://www.whatdotheyknow.com/request/contract_signed_with_donarbon_wa
-    http://www.whatdotheyknow.com/request/bradford_city_council_common_pur
-Postal address required, but not yet provided
-    http://www.whatdotheyknow.com/request/copies_of_foi_requests_000108_to
-    http://www.whatdotheyknow.com/request/re_issuing_of_foi_decision_notic (and partially successful)
-    http://www.whatdotheyknow.com/request/controlled_drinking_zones_21
-Payment required
-    http://www.whatdotheyknow.com/request/staff_absences_due_to_long_term
-
 Request withdrawn by user status/marker?
 
 Perhaps encourage user to annotate what they learnt after getting information?