aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/models/censor_rule.rb4
-rw-r--r--app/models/comment.rb4
-rw-r--r--app/models/contact_validator.rb4
-rw-r--r--app/models/exim_log.rb4
-rw-r--r--app/models/exim_log_done.rb4
-rw-r--r--app/models/holiday.rb4
-rw-r--r--app/models/incoming_message.rb4
-rw-r--r--app/models/info_request.rb4
-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.rb5
-rw-r--r--app/models/public_body_tag.rb4
-rw-r--r--app/models/raw_email.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--app/views/admin_public_body/_form.rhtml3
-rw-r--r--db/schema.rb4
20 files changed, 43 insertions, 37 deletions
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb
index 18a962dfc..46a194446 100644
--- a/app/models/censor_rule.rb
+++ b/app/models/censor_rule.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: censor_rules
#
@@ -21,7 +21,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: censor_rule.rb,v 1.10 2009-04-08 05:34:52 francis Exp $
+# $Id: censor_rule.rb,v 1.11 2009-04-13 09:18:48 tony Exp $
class CensorRule < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/comment.rb b/app/models/comment.rb
index ac270b68c..3ec9a624e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# 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.14 2009-03-09 15:48:32 tony Exp $
+# $Id: comment.rb,v 1.15 2009-04-13 09:18:48 tony Exp $
class Comment < ActiveRecord::Base
strip_attributes!
diff --git a/app/models/contact_validator.rb b/app/models/contact_validator.rb
index 1a97ba789..4bd12347b 100644
--- a/app/models/contact_validator.rb
+++ b/app/models/contact_validator.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# 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.29 2009-03-09 15:48:32 tony Exp $
+# $Id: contact_validator.rb,v 1.30 2009-04-13 09:18:48 tony Exp $
class ContactValidator < ActiveRecord::BaseWithoutTable
strip_attributes!
diff --git a/app/models/exim_log.rb b/app/models/exim_log.rb
index e5d5d6378..c353f8286 100644
--- a/app/models/exim_log.rb
+++ b/app/models/exim_log.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: exim_logs
#
@@ -18,7 +18,7 @@
# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: exim_log.rb,v 1.9 2009-03-09 15:48:32 tony Exp $
+# $Id: exim_log.rb,v 1.10 2009-04-13 09:18:48 tony Exp $
class EximLog < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/exim_log_done.rb b/app/models/exim_log_done.rb
index 2f715a933..4ac201d26 100644
--- a/app/models/exim_log_done.rb
+++ b/app/models/exim_log_done.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: exim_log_dones
#
@@ -16,7 +16,7 @@
# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: exim_log_done.rb,v 1.5 2009-03-09 15:48:32 tony Exp $
+# $Id: exim_log_done.rb,v 1.6 2009-04-13 09:18:48 tony Exp $
class EximLogDone < ActiveRecord::Base
has_many :exim_logs
diff --git a/app/models/holiday.rb b/app/models/holiday.rb
index 025d6013b..8a4924a85 100644
--- a/app/models/holiday.rb
+++ b/app/models/holiday.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: holidays
#
@@ -21,7 +21,7 @@
# Copyright (c) 2009 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: holiday.rb,v 1.4 2009-03-16 21:06:07 francis Exp $
+# $Id: holiday.rb,v 1.5 2009-04-13 09:18:48 tony Exp $
class Holiday < ActiveRecord::Base
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 819d6c5b5..4f13e4c39 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: incoming_messages
#
@@ -19,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.198 2009-04-08 05:34:52 francis Exp $
+# $Id: incoming_message.rb,v 1.199 2009-04-13 09:18:48 tony 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 fed3d8801..025a9247e 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# 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.185 2009-04-08 16:13:11 louise Exp $
+# $Id: info_request.rb,v 1.186 2009-04-13 09:18:48 tony 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 efb58930b..05d2ce50a 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: info_request_events
#
@@ -21,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.78 2009-04-08 05:34:52 francis Exp $
+# $Id: info_request_event.rb,v 1.79 2009-04-13 09:18:48 tony Exp $
class InfoRequestEvent < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 223ff7731..5d81e5361 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: outgoing_messages
#
@@ -22,7 +22,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.82 2009-03-09 15:48:32 tony Exp $
+# $Id: outgoing_message.rb,v 1.83 2009-04-13 09:18:48 tony Exp $
class OutgoingMessage < ActiveRecord::Base
strip_attributes!
diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb
index 4309a2bea..4f94857cc 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# 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.47 2009-03-09 15:48:32 tony Exp $
+# $Id: post_redirect.rb,v 1.48 2009-04-13 09:18:48 tony Exp $
require 'openssl' # for random bytes function
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index e27f2bb68..97f48db44 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: public_bodies
#
@@ -17,6 +17,7 @@
# notes :text default(""), not null
# first_letter :string(255) not null
# publication_scheme :text default(""), not null
+# charity_number :text default(""), not null
#
# models/public_body.rb:
@@ -25,7 +26,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.139 2009-04-02 15:33:11 francis Exp $
+# $Id: public_body.rb,v 1.140 2009-04-13 09:18:48 tony Exp $
require 'csv'
require 'set'
diff --git a/app/models/public_body_tag.rb b/app/models/public_body_tag.rb
index 20c70686c..017a92b95 100644
--- a/app/models/public_body_tag.rb
+++ b/app/models/public_body_tag.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# 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.26 2009-03-09 15:48:32 tony Exp $
+# $Id: public_body_tag.rb,v 1.27 2009-04-13 09:18:48 tony Exp $
class PublicBodyTag < ActiveRecord::Base
strip_attributes!
diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb
index 1405bdf8d..b3cdf27ad 100644
--- a/app/models/raw_email.rb
+++ b/app/models/raw_email.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: raw_emails
#
@@ -13,7 +13,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: raw_email.rb,v 1.9 2009-03-09 15:48:32 tony Exp $
+# $Id: raw_email.rb,v 1.10 2009-04-13 09:18:48 tony Exp $
class RawEmail < ActiveRecord::Base
# deliberately don't strip_attributes, so keeps raw email properly
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index 464c58b60..b9ff4a204 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# 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.50 2009-03-09 15:48:32 tony Exp $
+# $Id: track_thing.rb,v 1.51 2009-04-13 09:18:48 tony 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 c53e1c0e7..ee6ba86d5 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: 74
+# Schema version: 75
#
# 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.19 2009-03-09 15:48:32 tony Exp $
+# $Id: track_things_sent_email.rb,v 1.20 2009-04-13 09:18:48 tony Exp $
class TrackThingsSentEmail < ActiveRecord::Base
belongs_to :info_request_event
diff --git a/app/models/user.rb b/app/models/user.rb
index f7c77af56..995786596 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 74
+# Schema version: 75
#
# Table name: users
#
@@ -23,7 +23,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.89 2009-04-09 12:22:46 louise Exp $
+# $Id: user.rb,v 1.90 2009-04-13 09:18:48 tony 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 6e521c3ad..3d7c7d0e9 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: 74
+# Schema version: 75
#
# 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.30 2009-03-09 15:48:32 tony Exp $
+# $Id: user_info_request_sent_alert.rb,v 1.31 2009-04-13 09:18:48 tony Exp $
class UserInfoRequestSentAlert < ActiveRecord::Base
belongs_to :user
diff --git a/app/views/admin_public_body/_form.rhtml b/app/views/admin_public_body/_form.rhtml
index 42aaf92db..f77ffed95 100644
--- a/app/views/admin_public_body/_form.rhtml
+++ b/app/views/admin_public_body/_form.rhtml
@@ -36,6 +36,9 @@
<p><label for="public_body_publication_scheme">Publication scheme URL</label><br/>
<%= text_field 'public_body', 'publication_scheme', :size => 60 %></p>
+<p><label for="public_body_charity_number">Charity Registration Number <small>(if a registered charity)</small></label><br/>
+<%= text_field 'public_body', 'charity_number', :size => 60 %></p>
+
<p><label for="public_body_notes">Public notes</label> <small>(for users to consider when making FOI requests to the authority)</small><br/>
<%= text_area 'public_body', 'notes', :rows => 3, :cols => 60 %></p>
diff --git a/db/schema.rb b/db/schema.rb
index 0f18df4a4..943baab5a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -9,7 +9,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 74) do
+ActiveRecord::Schema.define(:version => 75) do
create_table "acts_as_xapian_jobs", :force => true do |t|
t.string "model", :null => false
@@ -153,6 +153,7 @@ ActiveRecord::Schema.define(:version => 74) do
t.text "notes", :default => "", :null => false
t.string "first_letter", :null => false
t.text "publication_scheme", :default => "", :null => false
+ t.text "charity_number", :default => "", :null => false
end
add_index "public_bodies", ["first_letter"], :name => "index_public_bodies_on_first_letter"
@@ -179,6 +180,7 @@ ActiveRecord::Schema.define(:version => 74) do
t.text "home_page"
t.text "notes"
t.text "publication_scheme", :default => "", :null => false
+ t.text "charity_number", :default => "", :null => false
end
create_table "raw_emails", :force => true do |t|
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-27 11:56:55 +0000