diff options
author | Azul <azul@leap.se> | 2013-11-18 21:05:59 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2013-11-18 21:05:59 +0100 |
commit | e3ac45fc57fc3566a7963e5ea0d888d6349387e5 (patch) | |
tree | ac866353183d856702f7de99b5eac00f91143e78 /help/app/models/ticket.rb | |
parent | 6c6c3d01233cb095b3855bbdf1c33dbb90267771 (diff) | |
parent | d2eaffde87286c0cc9c0658503a60706759f7f51 (diff) |
Merge branch 'develop' - hotfix for database change
Diffstat (limited to 'help/app/models/ticket.rb')
-rw-r--r-- | help/app/models/ticket.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/help/app/models/ticket.rb b/help/app/models/ticket.rb index 74f2050..cd22758 100644 --- a/help/app/models/ticket.rb +++ b/help/app/models/ticket.rb @@ -12,7 +12,7 @@ class Ticket < CouchRest::Model::Base property :created_by, String, :protected => true # nil for anonymous tickets, should never be changed property :regarding_user, String # may be nil or valid username - property :title, String + property :subject, String property :email, String property :is_open, TrueClass, :default => true property :comments, [TicketComment] @@ -33,7 +33,7 @@ class Ticket < CouchRest::Model::Base load_views(own_path.join('..', 'designs', 'ticket')) end - validates :title, :presence => true + validates :subject, :presence => true validates :email, :allow_blank => true, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/ def self.search(options = {}) |