diff options
| author | francis <francis> | 2007-11-07 11:10:56 +0000 |
|---|---|---|
| committer | francis <francis> | 2007-11-07 11:10:56 +0000 |
| commit | 3100fc065909177d72374f2bfbab819014271f4c (patch) | |
| tree | b5dda9f541068e2446b1ff8b4f1e65c44cc001c4 | |
| parent | 3055b7b65d6fb11ed69bfac6f63c0f5f9ab3afa0 (diff) | |
Tidy up error messages.
| -rw-r--r-- | app/models/info_request.rb | 4 | ||||
| -rw-r--r-- | app/models/outgoing_message.rb | 4 | ||||
| -rw-r--r-- | app/views/request/new.rhtml | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 8efd40497..bcda9719d 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -4,12 +4,12 @@ # 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.10 2007-10-30 20:02:28 francis Exp $ +# $Id: info_request.rb,v 1.11 2007-11-07 11:10:56 francis Exp $ require 'digest/sha1' class InfoRequest < ActiveRecord::Base - validates_presence_of :title + validates_presence_of :title, :message => "^Please enter a summary of your request" belongs_to :user #validates_presence_of :user_id # breaks during construction of new ones :( diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index 6ebeb1704..dc8541ba8 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -5,13 +5,13 @@ # 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.8 2007-10-30 14:23:21 francis Exp $ +# $Id: outgoing_message.rb,v 1.9 2007-11-07 11:10:56 francis Exp $ class OutgoingMessage < ActiveRecord::Base belongs_to :info_request validates_presence_of :info_request - validates_presence_of :body + validates_presence_of :body, :message => "^Please enter your letter requesting information." validates_inclusion_of :status, :in => ['ready', 'sent', 'failed'] validates_inclusion_of :message_type, :in => ['initial_request'] #, 'complaint'] diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml index 7d7477a38..c4d00f00c 100644 --- a/app/views/request/new.rhtml +++ b/app/views/request/new.rhtml @@ -20,7 +20,7 @@ <label for="info_request_title">Summary:</label> <%= f.text_field :title, :size => 50 %> </p> - <div class="form_note"> + <div class="form_item_note"> (a one line summary of the information you are requesting, e.g. 'Crime statistics by ward level for Wales') </div> |