aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/models/contact_validator.rb4
-rw-r--r--app/models/incoming_message.rb5
-rw-r--r--app/models/info_request.rb18
-rw-r--r--app/models/info_request_event.rb4
-rw-r--r--app/models/outgoing_message.rb4
-rw-r--r--app/models/post_redirect.rb4
-rw-r--r--app/models/public_body.rb4
-rw-r--r--app/models/public_body_tag.rb4
-rw-r--r--app/models/track_thing.rb4
-rw-r--r--app/models/track_things_sent_email.rb4
-rw-r--r--app/models/user.rb4
-rw-r--r--app/models/user_info_request_sent_alert.rb4
-rw-r--r--todo.txt61
13 files changed, 67 insertions, 57 deletions
diff --git a/app/models/contact_validator.rb b/app/models/contact_validator.rb
index 78c30e553..9d114bd85 100644
--- a/app/models/contact_validator.rb
+++ b/app/models/contact_validator.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: contact_validators
#
@@ -15,7 +15,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: contact_validator.rb,v 1.17 2008-07-16 23:45:41 francis Exp $
+# $Id: contact_validator.rb,v 1.18 2008-07-17 10:32:01 francis Exp $
class ContactValidator < ActiveRecord::BaseWithoutTable
column :name, :string
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 653097bab..eec02d899 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: incoming_messages
#
@@ -9,6 +9,7 @@
# created_at :datetime not null
# updated_at :datetime not null
# cached_attachment_text :text
+# cached_main_body_text :text
#
# models/incoming_message.rb:
@@ -18,7 +19,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: incoming_message.rb,v 1.121 2008-07-17 03:30:54 francis Exp $
+# $Id: incoming_message.rb,v 1.122 2008-07-17 10:32:01 francis Exp $
# TODO
# Move some of the (e.g. quoting) functions here into rblib, as they feel
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 60e2a15d8..8aad5b534 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: info_requests
#
@@ -23,7 +23,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: info_request.rb,v 1.121 2008-07-16 23:45:41 francis Exp $
+# $Id: info_request.rb,v 1.122 2008-07-17 10:32:01 francis Exp $
require 'digest/sha1'
require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian')
@@ -299,7 +299,7 @@ public
end
end
- # Work out what the situation of the request is In addition to values of
+ # Work out what the situation of the request is. In addition to values of
# self.described_state, can take these two values:
# waiting_classification
# waiting_response_overdue
@@ -328,13 +328,16 @@ public
return self.described_state
end
- # Fill in any missing event states for first response before a
- # description was made.
+ # Fill in any missing event states for first response before a description
+ # was made. i.e. We take the last described state in between two responses
+ # (inclusive of earlier), and set it as calculated value for the earlier
+ # response.
def calculate_event_states
curr_state = nil
for event in self.info_request_events.reverse
if not event.described_state.nil? and curr_state.nil?
curr_state = event.described_state
+ STDERR.puts "curr_state " + curr_state
end
if !curr_state.nil? && event.event_type == 'response'
@@ -348,6 +351,11 @@ public
event.save!
end
curr_state = nil
+ elsif !curr_state.nil? && event.event_type == 'followup_sent' && !event.described_state.nil? && event.described_state == 'waiting_response'
+ # followups can set the status to waiting response, which we don't
+ # want to propogate to the response itself, as that might already be
+ # set to waiting_clarification, which we want to know about.
+ curr_state = nil
end
end
end
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 7a76649ba..15e758275 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: info_request_events
#
@@ -20,7 +20,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: info_request_event.rb,v 1.48 2008-07-17 03:30:54 francis Exp $
+# $Id: info_request_event.rb,v 1.49 2008-07-17 10:32:01 francis Exp $
class InfoRequestEvent < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 74a3f0f6d..0b8276ca3 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: outgoing_messages
#
@@ -21,7 +21,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: outgoing_message.rb,v 1.55 2008-07-16 23:45:41 francis Exp $
+# $Id: outgoing_message.rb,v 1.56 2008-07-17 10:32:01 francis Exp $
class OutgoingMessage < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb
index 487b5b74d..edc9ed63f 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: post_redirects
#
@@ -26,7 +26,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: post_redirect.rb,v 1.35 2008-07-16 23:45:41 francis Exp $
+# $Id: post_redirect.rb,v 1.36 2008-07-17 10:32:01 francis Exp $
require 'openssl' # for random bytes function
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index ea8097f89..233468854 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: public_bodies
#
@@ -23,7 +23,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: public_body.rb,v 1.86 2008-07-16 23:55:49 francis Exp $
+# $Id: public_body.rb,v 1.87 2008-07-17 10:32:01 francis Exp $
require 'csv'
require 'set'
diff --git a/app/models/public_body_tag.rb b/app/models/public_body_tag.rb
index 927ad01f6..4f5e48fdb 100644
--- a/app/models/public_body_tag.rb
+++ b/app/models/public_body_tag.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: public_body_tags
#
@@ -15,7 +15,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: public_body_tag.rb,v 1.14 2008-07-16 23:45:41 francis Exp $
+# $Id: public_body_tag.rb,v 1.15 2008-07-17 10:32:01 francis Exp $
class PublicBodyTag < ActiveRecord::Base
validates_presence_of :public_body
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index ec7fe271c..301e34f18 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: track_things
#
@@ -21,7 +21,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: track_thing.rb,v 1.25 2008-07-16 23:45:41 francis Exp $
+# $Id: track_thing.rb,v 1.26 2008-07-17 10:32:01 francis Exp $
class TrackThing < ActiveRecord::Base
belongs_to :tracking_user, :class_name => 'User'
diff --git a/app/models/track_things_sent_email.rb b/app/models/track_things_sent_email.rb
index f9fea165a..ccfc79cb4 100644
--- a/app/models/track_things_sent_email.rb
+++ b/app/models/track_things_sent_email.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: track_things_sent_emails
#
@@ -18,7 +18,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: track_things_sent_email.rb,v 1.8 2008-07-16 23:45:41 francis Exp $
+# $Id: track_things_sent_email.rb,v 1.9 2008-07-17 10:32:01 francis Exp $
class TrackThingsSentEmail < ActiveRecord::Base
belongs_to :info_request_event
diff --git a/app/models/user.rb b/app/models/user.rb
index 5f7f45d04..e903bc09d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: users
#
@@ -21,7 +21,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: user.rb,v 1.58 2008-07-16 23:45:41 francis Exp $
+# $Id: user.rb,v 1.59 2008-07-17 10:32:01 francis Exp $
require 'digest/sha1'
diff --git a/app/models/user_info_request_sent_alert.rb b/app/models/user_info_request_sent_alert.rb
index e940df2a0..c80c834b8 100644
--- a/app/models/user_info_request_sent_alert.rb
+++ b/app/models/user_info_request_sent_alert.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 59
+# Schema version: 60
#
# Table name: user_info_request_sent_alerts
#
@@ -17,7 +17,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: user_info_request_sent_alert.rb,v 1.18 2008-07-16 23:45:41 francis Exp $
+# $Id: user_info_request_sent_alert.rb,v 1.19 2008-07-17 10:32:01 francis Exp $
class UserInfoRequestSentAlert < ActiveRecord::Base
belongs_to :user
diff --git a/todo.txt b/todo.txt
index aa0ee5f0b..6f06d4776 100644
--- a/todo.txt
+++ b/todo.txt
@@ -30,39 +30,29 @@ pages.
Next
====
-It's terribly slow.
Clear out all the need admin attention requests
Clear out all the need classifying requests
https://secure.mysociety.org/cvstrac/tktview?tn=1032
-This infers the wrong calculated state due to followups
+This infers the wrong calculated state due to followups - in the waiting
+clarification not being set to states?
https://secure.mysociety.org/admin/foi/request/show/619
-
-Show similar requests after you have filed yours - maybe on preview too.
-
-Advertise WDTK search queries on TWFY
-Advertise alerts on end pages with WDTK
+https://secure.mysociety.org/admin/foi/request/show/755
Internal review status/marker?
Request withdrawn by user status/marker?
Redo the RSS feeds
+- Look at Rob's TWFY.nz interface
- One click "track this" then single feed based on your preferences
- Page tracking things within the site
Maybe remove public tracking completely
Comments interleaved with body
-Antispam on contact form
-
Do something about shared spreadsheet
-Blog posts / Wikipedia articles about this request
- e.g. http://socialreporter.wordpress.com/2008/04/14/costs-of-the-bbc-action-action-network/
- http://reportr.net/2008/04/24/bbc-spent-6m-to-develop-the-iplayer/
-Or just look at referrers as Julian says
-
In sidebar of request
Share this request on Facebook, by email etc.
Email icon here: http://www.guardian.co.uk/news/video/2008/apr/03/mugabe
@@ -76,12 +66,13 @@ There is grey on grey text in header? bad idea?
Later
=====
-Find a way to get corrected email addresses from responses - somehow getting
-user to send them in?
-e.g. as in http://www.whatdotheyknow.com/request/1071/response/1870 which
-we found largely by accident.
+Advertise WDTK search queries on TWFY
+Advertise alerts on end pages with WDTK
-For followups, have radio button to say is it a new request or followup?
+Blog posts / Wikipedia articles about this request
+ e.g. http://socialreporter.wordpress.com/2008/04/14/costs-of-the-bbc-action-action-network/
+ http://reportr.net/2008/04/24/bbc-spent-6m-to-develop-the-iplayer/
+Or just look at referrers as Julian says
Alert you when someone you're tracking starts tracking another request
@@ -130,11 +121,10 @@ register for.
Offer search on 404s
-Rate limit requests using Ratty, with a freeze thing WTT-style, to detect
-vexatious requests.
-
Preview when sending followups - especially people need to see quoting/subject
When sending "my response is late"
+For followups, have radio button to say is it a new request or followup?
+
Interface for when you change your email address - easier to do now with post_redirect.circumstance?
@@ -154,12 +144,6 @@ Consider removing login links from notifications of new responses, now we have r
Properly escape all name_and_email functions
-Give hotline to call body for extra help
-e.g. Advice and assistance in making FoI requests to the House of Lords is available
-from the Freedom of Information Officer, Parliamentary Archives, House of
-Lords. London SW1A 0PW. Telephone 020 7219 0100. E-mail: foilords@parliament.uk
-http://www.parliament.uk/parliamentary_publications_and_archives/freedom_of_information_in_the_house_of_lords/lords__foi___how_to_obtain_information.cfm
-
Including 'Request for information' in the subject line of your e-mail will assist us in prioritising your request.
http://www.parliament.uk/parliamentary_publications_and_archives/freedom_of_information_in_the_house_of_lords/lords__foi___how_to_obtain_information.cfm
XXX do we need specifically that text, is it better than "Freedom of Information request" which we put now?
@@ -198,9 +182,21 @@ Quoting fixing TODO:
Larger new features
-------------------
+Antispam on contact form
+
+Find a way to get corrected email addresses from responses - somehow getting
+user to send them in?
+e.g. as in http://www.whatdotheyknow.com/request/1071/response/1870 which
+we found largely by accident.
+
+Rate limit requests using Ratty, with a freeze thing WTT-style, to detect
+vexatious requests.
+
Merge workflow into one stream - find information, if you can't find it then request it.
so just search is on front page, with popular stuff below a la Google Directory
-Use spelling correction for public bodies search?
+Google search within website of authority.
+Show similar requests after you have filed yours - maybe on preview too.
+Use spelling correction for public bodies search (in addition to substring?)
Editable user profile, including photo upload
@@ -222,13 +218,18 @@ Link to:
Aliases (not just short name, but multiple real names e.g. for museums)
Disclosure logs
Publication schemes (http://www.ico.gov.uk/what_we_cover/freedom_of_information/publication_schemes.aspx)
- Google search within website?
TWFY department search
Complaint email
e.g.
http://www.ordnancesurvey.co.uk/oswebsite/aboutus/foi/index.html
http://www.ordnancesurvey.co.uk/oswebsite/aboutus/foi/coiindex.html
+Give hotline to call body for extra help
+e.g. Advice and assistance in making FoI requests to the House of Lords is available
+from the Freedom of Information Officer, Parliamentary Archives, House of
+Lords. London SW1A 0PW. Telephone 020 7219 0100. E-mail: foilords@parliament.uk
+http://www.parliament.uk/parliamentary_publications_and_archives/freedom_of_information_in_the_house_of_lords/lords__foi___how_to_obtain_information.cfm
+
EU regulation 1049/2001
US (with Sunlight)
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-28 22:41:53 +0000