aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/comment.rb4
-rw-r--r--app/models/contact_validator.rb4
-rw-r--r--app/models/info_request.rb4
-rw-r--r--app/models/info_request_event.rb5
-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.rb5
-rw-r--r--app/models/user_info_request_sent_alert.rb4
-rw-r--r--todo.txt10
13 files changed, 31 insertions, 29 deletions
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 0d219a9a8..973ff08f0 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# Table name: comments
#
@@ -19,7 +19,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: comment.rb,v 1.3 2008-08-26 22:54:46 francis Exp $
+# $Id: comment.rb,v 1.4 2008-08-31 12:46:52 francis Exp $
class Comment < ActiveRecord::Base
belongs_to :user
diff --git a/app/models/contact_validator.rb b/app/models/contact_validator.rb
index a0bcbf229..e6d3fb2b1 100644
--- a/app/models/contact_validator.rb
+++ b/app/models/contact_validator.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# 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.19 2008-08-09 15:19:01 francis Exp $
+# $Id: contact_validator.rb,v 1.20 2008-08-31 12:46:52 francis Exp $
class ContactValidator < ActiveRecord::BaseWithoutTable
column :name, :string
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 5cc4afabf..cc0c481f6 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# 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.132 2008-08-29 09:44:31 francis Exp $
+# $Id: info_request.rb,v 1.133 2008-08-31 12:46:52 francis Exp $
require 'digest/sha1'
require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian')
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 08e0fa0b8..470842c3d 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# Table name: info_request_events
#
@@ -13,6 +13,7 @@
# last_described_at :datetime
# incoming_message_id :integer
# outgoing_message_id :integer
+# comment_id :integer
#
# models/info_request_event.rb:
@@ -20,7 +21,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.53 2008-08-29 22:39:36 francis Exp $
+# $Id: info_request_event.rb,v 1.54 2008-08-31 12:46:52 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 d13fa80b1..3e441eacb 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# 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.60 2008-08-22 04:18:18 francis Exp $
+# $Id: outgoing_message.rb,v 1.61 2008-08-31 12:46:52 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 21130d515..9102fc231 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# 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.37 2008-08-09 15:19:01 francis Exp $
+# $Id: post_redirect.rb,v 1.38 2008-08-31 12:46:52 francis Exp $
require 'openssl' # for random bytes function
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index c90c76f56..2b9546d39 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# 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.101 2008-08-19 10:17:08 francis Exp $
+# $Id: public_body.rb,v 1.102 2008-08-31 12:46:52 francis Exp $
require 'csv'
require 'set'
diff --git a/app/models/public_body_tag.rb b/app/models/public_body_tag.rb
index af459b35b..82d2588f3 100644
--- a/app/models/public_body_tag.rb
+++ b/app/models/public_body_tag.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# 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.16 2008-08-09 15:19:01 francis Exp $
+# $Id: public_body_tag.rb,v 1.17 2008-08-31 12:46:53 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 ad9dfc1b8..9bb771961 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# 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.37 2008-08-29 17:55:47 francis Exp $
+# $Id: track_thing.rb,v 1.38 2008-08-31 12:46:53 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 f21cf4d2c..d1efea4e7 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: 62
+# Schema version: 64
#
# 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.10 2008-08-09 15:19:01 francis Exp $
+# $Id: track_things_sent_email.rb,v 1.11 2008-08-31 12:46:53 francis Exp $
class TrackThingsSentEmail < ActiveRecord::Base
belongs_to :info_request_event
diff --git a/app/models/user.rb b/app/models/user.rb
index f401b9609..b94fe8e34 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 62
+# Schema version: 64
#
# Table name: users
#
@@ -13,6 +13,7 @@
# email_confirmed :boolean default(false), not null
# url_name :text not null
# last_daily_track_email :datetime default(Sat Jan 01 00:00:00 UTC 2000)
+# admin_level :string(255) default("none"), not null
#
# models/user.rb:
@@ -21,7 +22,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.64 2008-08-29 12:23:01 francis Exp $
+# $Id: user.rb,v 1.65 2008-08-31 12:46:53 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 7ae76edd1..e9d0b6e5d 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: 62
+# Schema version: 64
#
# 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.21 2008-08-29 09:44:31 francis Exp $
+# $Id: user_info_request_sent_alert.rb,v 1.22 2008-08-31 12:46:53 francis Exp $
class UserInfoRequestSentAlert < ActiveRecord::Base
belongs_to :user
diff --git a/todo.txt b/todo.txt
index fdb8770cb..7c50e673a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -9,8 +9,6 @@ Site move:
Next
====
-Test: Check new .zips are being indexed
-
Comments interleaved with body
- Annotation thing too far down when much sidebar e.g. http://localhost:3000/request/heya#outgoing-199
- Put classification box above annotation one?
@@ -22,9 +20,6 @@ Comments interleaved with body
- Show them on user page
- Show them on public body pages
-http://www.whatdotheyknow.com/request/communications_about_whatdotheyk
- Mask all emails from binary attachments
-
Internal review status/marker?
http://www.whatdotheyknow.com/request/search_engine_advertising_bought
http://www.whatdotheyknow.com/request/communications_from_home_office_
@@ -44,6 +39,7 @@ Clear out all the need admin attention requests
Clear out all the need classifying requests
Admin:
+ Link to individual parts of FAQ
Optimise loading of front admin page
Have internal links to different parts of request page
Somehow fold up the enormous pages on many admin pages
@@ -54,6 +50,9 @@ Icon for annotations in search results
Comments etc. do not sort in right order - by date, but not by time
+The form where you classify requests does not have bold highlighting on it in
+the key words. It is too verbose to read.
+
Later
=====
@@ -207,6 +206,7 @@ Quoting fixing TODO:
http://www.whatdotheyknow.com/request/errors_in_list_of_postbox_locati#incoming-2272
http://localhost:3000/request/cctv_data_retention_and_use#incoming-2093
http://www.whatdotheyknow.com/request/stasi_activity_at_climate_camp#incoming-3362
+ http://www.whatdotheyknow.com/request/total_remuneration_and_benefits#incoming-2436
http://www.whatdotheyknow.com/request/public_inspection_periods_for_lo_2#outgoing-1707 # square bracket in link