diff options
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/contact_validator.rb | 4 | ||||
-rw-r--r-- | app/models/incoming_message.rb | 4 | ||||
-rw-r--r-- | app/models/info_request.rb | 4 | ||||
-rw-r--r-- | app/models/info_request_event.rb | 4 | ||||
-rw-r--r-- | app/models/outgoing_message.rb | 4 | ||||
-rw-r--r-- | app/models/post_redirect.rb | 4 | ||||
-rw-r--r-- | app/models/public_body.rb | 27 | ||||
-rw-r--r-- | app/models/public_body_tag.rb | 26 | ||||
-rw-r--r-- | app/models/user.rb | 4 | ||||
-rw-r--r-- | app/models/user_info_request_sent_alert.rb | 13 |
10 files changed, 77 insertions, 17 deletions
diff --git a/app/models/contact_validator.rb b/app/models/contact_validator.rb index 4e4f1fcd7..c04e6c448 100644 --- a/app/models/contact_validator.rb +++ b/app/models/contact_validator.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 34 +# Schema version: 36 # # 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.2 2008-02-21 20:45:51 francis Exp $ +# $Id: contact_validator.rb,v 1.3 2008-02-26 15:13:51 francis Exp $ class ContactValidator < ActiveRecord::BaseWithoutTable column :name, :string diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 27698d1a8..7908f21e7 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 34 +# Schema version: 36 # # Table name: incoming_messages # @@ -18,7 +18,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.44 2008-02-25 00:39:27 francis Exp $ +# $Id: incoming_message.rb,v 1.45 2008-02-26 15:13:51 francis Exp $ # TODO diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 48ccedcc1..3ea3b59cc 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 34 +# Schema version: 36 # # Table name: info_requests # @@ -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.rb,v 1.45 2008-02-22 01:58:36 francis Exp $ +# $Id: info_request.rb,v 1.46 2008-02-26 15:13:51 francis Exp $ require 'digest/sha1' diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb index 599e46e82..7ba8a1f16 100644 --- a/app/models/info_request_event.rb +++ b/app/models/info_request_event.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 34 +# Schema version: 36 # # Table name: info_request_events # @@ -16,7 +16,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.17 2008-02-21 20:45:51 francis Exp $ +# $Id: info_request_event.rb,v 1.18 2008-02-26 15:13:51 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 9c76bc03f..eaaf9d636 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 34 +# Schema version: 36 # # 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.30 2008-02-25 11:17:29 francis Exp $ +# $Id: outgoing_message.rb,v 1.31 2008-02-26 15:13:51 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 40a5034ea..f81e9b2b8 100644 --- a/app/models/post_redirect.rb +++ b/app/models/post_redirect.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 34 +# Schema version: 36 # # Table name: post_redirects # @@ -25,7 +25,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.18 2008-02-21 20:45:51 francis Exp $ +# $Id: post_redirect.rb,v 1.19 2008-02-26 15:13:51 francis Exp $ require 'openssl' # for random bytes function diff --git a/app/models/public_body.rb b/app/models/public_body.rb index 9a364f009..5fdcb85e3 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 34 +# Schema version: 36 # # Table name: public_bodies # @@ -21,7 +21,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.20 2008-02-21 20:45:51 francis Exp $ +# $Id: public_body.rb,v 1.21 2008-02-26 15:13:51 francis Exp $ class PublicBody < ActiveRecord::Base validates_presence_of :name @@ -29,6 +29,7 @@ class PublicBody < ActiveRecord::Base validates_presence_of :request_email has_many :info_requests + has_many :public_body_tags #acts_as_solr :fields => [:name, :short_name] @@ -45,4 +46,26 @@ class PublicBody < ActiveRecord::Base acts_as_versioned self.non_versioned_columns << 'created_at' << 'updated_at' + + # Given an input string of tags, sets all tags to that string + def tag_string=(tag_string) + tags = tag_string.split(/\s+/).uniq + + ActiveRecord::Base.transaction do + for public_body_tag in self.public_body_tags + public_body_tag.destroy + end + for tag in tags + self.public_body_tags << PublicBodyTag.new(:name => tag) + end + end + end + + def tag_string + return self.public_body_tags.map { |t| t.name }.join(' ') + end + + def self.find_by_tag(tag) + return PublicBodyTag.find(:all, :conditions => ['name = ?', tag] ).map { |t| t.public_body } + end end diff --git a/app/models/public_body_tag.rb b/app/models/public_body_tag.rb new file mode 100644 index 000000000..9224c5299 --- /dev/null +++ b/app/models/public_body_tag.rb @@ -0,0 +1,26 @@ +# == Schema Information +# Schema version: 36 +# +# Table name: public_body_tags +# +# id :integer not null, primary key +# public_body_id :integer not null +# name :text not null +# created_at :datetime not null +# + +# models/public_body_tag.rb: +# Categories for public bodies. +# +# 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.1 2008-02-26 15:13:51 francis Exp $ + +class PublicBodyTag < ActiveRecord::Base + validates_presence_of :public_body + validates_presence_of :name + + belongs_to :public_body +end + diff --git a/app/models/user.rb b/app/models/user.rb index 1fa71dffb..ab680dc1e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,5 @@ # == Schema Information -# Schema version: 34 +# Schema version: 36 # # Table name: users # @@ -19,7 +19,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.28 2008-02-22 01:58:36 francis Exp $ +# $Id: user.rb,v 1.29 2008-02-26 15:13:51 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 8a272d274..b00b67e78 100644 --- a/app/models/user_info_request_sent_alert.rb +++ b/app/models/user_info_request_sent_alert.rb @@ -1,3 +1,14 @@ +# == Schema Information +# Schema version: 36 +# +# Table name: user_info_request_sent_alerts +# +# id :integer not null, primary key +# user_id :integer not null +# info_request_id :integer not null +# alert_type :string(255) not null +# + # models/user_info_request_sent_alert.rb: # Whether an alert has been sent to this user for this info_request, for a # given type of alert. @@ -5,7 +16,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.1 2008-02-22 01:58:36 francis Exp $ +# $Id: user_info_request_sent_alert.rb,v 1.2 2008-02-26 15:13:51 francis Exp $ class UserInfoRequestSentAlert < ActiveRecord::Base belongs_to :user |