diff options
| -rw-r--r-- | app/models/info_request.rb | 12 | ||||
| -rw-r--r-- | app/models/user.rb | 6 | ||||
| -rw-r--r-- | todo.txt | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index c354fb3af..101773a30 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -4,17 +4,17 @@ # 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.4 2007-09-10 18:58:43 francis Exp $ +# $Id: info_request.rb,v 1.5 2007-09-11 15:23:59 francis Exp $ class InfoRequest < ActiveRecord::Base + validates_presence_of :title + belongs_to :user - belongs_to :public_body - has_many :outgoing_message +# validates_presence_of :user_id -# validates_presence_of :user -# validates_numericality_of :user - validates_presence_of :title + belongs_to :public_body validates_presence_of :public_body_id + has_many :outgoing_message end diff --git a/app/models/user.rb b/app/models/user.rb index b03cf18cc..adf2d1592 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -4,16 +4,16 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user.rb,v 1.3 2007-09-03 09:09:02 francis Exp $ +# $Id: user.rb,v 1.4 2007-09-11 15:23:59 francis Exp $ require 'digest/sha1' class User < ActiveRecord::Base - validates_presence_of :name - validates_presence_of :email validates_uniqueness_of :email, :case_sensitive => false + validates_presence_of :name + has_many :user attr_accessor :password_confirmation @@ -1,8 +1,6 @@ Give a better login dialog -Set "null" and "default" options more in schema Tidy up error message text (like "body must be filled in") on info request form -Make sure that constraints / foreign keys in model are in same order as data in schema Check have validates_presence_of for every belongs_to Check using :string rather than :text for definitely limited fields like "status" IF just title is blank says "Info request must be filled in" @@ -16,6 +14,7 @@ Tidying ======= Rename "file_request" controller to "new" ? +Set "null" and "default" options more in schema Add SQL foreign keys to database schema execute 'ALTER TABLE researchers ADD CONSTRAINT fk_researchers_departments FOREIGN KEY ( department_id ) REFERENCES departments( id ) ' http://wiki.rubyonrails.org/rails/pages/UsingMigrations link to: |