aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/comment_controller.rb14
-rw-r--r--public/stylesheets/main.css4
-rw-r--r--todo.txt36
3 files changed, 27 insertions, 27 deletions
diff --git a/app/controllers/comment_controller.rb b/app/controllers/comment_controller.rb
index ff49b2a79..d61d91dfe 100644
--- a/app/controllers/comment_controller.rb
+++ b/app/controllers/comment_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: comment_controller.rb,v 1.6 2008-09-02 14:57:31 francis Exp $
+# $Id: comment_controller.rb,v 1.7 2008-11-17 17:01:24 francis Exp $
class CommentController < ApplicationController
@@ -47,16 +47,14 @@ class CommentController < ApplicationController
:email => "Then your annotation to " + @info_request.title + " will be posted.",
:email_subject => "Confirm your annotation to " + @info_request.title
)
- @comment = @info_request.add_comment(params[:comment][:body], authenticated_user)
- # This automatically saves dependent objects in the same transaction
- @info_request.save!
- flash[:notice] = "Thank you for making an annotation!"
# Also subscribe to track for this request, so they get updates
+ # (do this first, so definitely don't send alert)
+ flash[:notice] = "Thank you for making an annotation!"
if params[:subscribe_to_request]
@track_thing = TrackThing.create_track_for_request(@info_request)
@existing_track = TrackThing.find_by_existing_track(@user, @track_thing)
- if not @existing_track
+ if !@existing_track
@track_thing.track_medium = 'email_daily'
@track_thing.tracking_user_id = @user.id
@track_thing.save!
@@ -66,6 +64,10 @@ class CommentController < ApplicationController
end
end
+ # This automatically saves dependent objects in the same transaction
+ @comment = @info_request.add_comment(params[:comment][:body], authenticated_user)
+ @info_request.save!
+
# we don't use comment_url here, as then you don't see the flash at top of page
redirect_to request_url(@info_request)
else
diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index a863d2679..8449aebb0 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -318,6 +318,10 @@ dd { margin: 0.6em 0 2em 4em; width: 33em; }
text-align: center;
clear: both;
}
+#frontpage_examples h2 {
+ text-align: center;
+ clear: both;
+}
#frontpage_examples li
{
}
diff --git a/todo.txt b/todo.txt
index 2ec878865..5d628602e 100644
--- a/todo.txt
+++ b/todo.txt
@@ -19,7 +19,6 @@ Clock for internal review
days.
Fix up the text: "The internal review should take 2-3 weeks for simple cases,
and up to 6 weeks even for complex reviews."
-
Awaiting internal review overdue state?
Search for text "internal review" in followups and add warning if they aren't
@@ -27,22 +26,12 @@ using the internal review mode.
Make the text of internal review have a bit that you have to edit.
+Tips on using the law:
+- You can go up and down between local and national - ask local places what their policy is, and hwo they are implementing it. Ask national things what odcuments set local policies.
+
Next
====
-For followups, have radio button to say is it a new request or followup?
-Finish "new information" option when writing followup, so makes new request
-
-Let people change status at any point
-Let admin users set things to internal review more easily
-
-Make it so you definitely don't get alert for the annotation that you just made
-
-Performance:
- Remove loading of public body tags from every info request load
- Completed in 15.53564 (0 reqs/sec) | Rendering: 1.03024 (6%) | DB: 14.46186 (93%) | 200 OK [http://www.whatdotheyknow.com/body/list/n]
- Make mongrel not single threaded
-
Watch these requests that are in internal review state or have been:
http://www.whatdotheyknow.com/request/communications_from_home_office
http://www.whatdotheyknow.com/request/community_justice_centre_sentenc
@@ -64,17 +53,22 @@ CSS / design things
Write code to make sure the Return-Path is never foi@sandwich.org.uk (even if the
Rails code breaks for Sendmail case in future botched Rails upgrades :)
-I still type stuff into notes rather than comments on public body form - not
-sure what to do about it.
-
-When writing initial request you have to put your name in the letter to sign it,
-but it only explains later about anonymous names, Hmmm.
-
-Remove "tracks by medium"
Later
=====
+Let requesters change status to anything at any point
+- using same interface let admin users set things to internal review more
+ easily (currently have to go to admin interface, as isn't on main describe
+ form)
+
+For followups, have radio button to say is it a new request or followup
+Do by uncommenting the "new information" option when writing a followup, so
+that it makes a new request
+
+Performance:
+ Remove loading of public body tags from every info request load
+
Rename show_response action to send_followup?
Would be nice if you try and send or resend (from admin interface, or by sending