9 files changed, 13 insertions, 13 deletions
diff --git a/help/app/assets/javascripts/tickets.js b/help/app/assets/javascripts/tickets.js
index bf7965c..18537aa 100644
--- a/help/app/assets/javascripts/tickets.js
+++ b/help/app/assets/javascripts/tickets.js
@@ -1,4 +1,4 @@
 //$(document).ready(function () {
 //  $.fn.editable.defaults.mode = 'inline';
-//  $('#title').editable();
+//  $('#subject').editable();
 //});
 \ No newline at end of file
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 = {})
diff --git a/help/app/views/tickets/_edit_form.html.haml b/help/app/views/tickets/_edit_form.html.haml
index 5252c2e..fa0ab44 100644
--- a/help/app/views/tickets/_edit_form.html.haml
+++ b/help/app/views/tickets/_edit_form.html.haml
@@ -26,7 +26,7 @@
       %span.label.label-success= t(:closed)
     %span.label.label-clear= t(:created_by_on, :user => created_by, :time => @ticket.created_at.to_s(:short)).html_safe
   %div= t(:subject)
-  = f.text_field :title, :class => 'large full-width'
+  = f.text_field :subject, :class => 'large full-width'
   .row-fluid
     .span4
       %div= t(:status)
diff --git a/help/app/views/tickets/_ticket.html.haml b/help/app/views/tickets/_ticket.html.haml
index a064c4e..5bc33c8 100644
--- a/help/app/views/tickets/_ticket.html.haml
+++ b/help/app/views/tickets/_ticket.html.haml
@@ -1,6 +1,6 @@
 - url = auto_ticket_path(ticket)
 %tr
-  %td= link_to ticket.title, url
+  %td= link_to ticket.subject, url
   %td= link_to ticket.created_at.to_s(:short), url
   %td= link_to ticket.updated_at.to_s(:short), url
   %td= ticket.commenters
diff --git a/help/app/views/tickets/new.html.haml b/help/app/views/tickets/new.html.haml
index c0a343d..393e5d6 100644
--- a/help/app/views/tickets/new.html.haml
+++ b/help/app/views/tickets/new.html.haml
@@ -11,7 +11,7 @@
 
 = simple_form_for @ticket, :validate => true, :html => {:class => 'form-horizontal'} do |f|
   = hidden_ticket_fields
-  = f.input :title, :label => t(:subject)
+  = f.input :subject
   - if logged_in?
     = f.input :email, input_html: {value: email}
     = f.input :regarding_user, input_html: {value: regarding}
diff --git a/help/test/factories.rb b/help/test/factories.rb
index bce3af1..be04f15 100644
--- a/help/test/factories.rb
+++ b/help/test/factories.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
 
   factory :ticket do
-    title { Faker::Lorem.sentence }
+    subject { Faker::Lorem.sentence }
     email { Faker::Internet.email }
 
     factory :ticket_with_comment do
diff --git a/help/test/functional/tickets_controller_test.rb b/help/test/functional/tickets_controller_test.rb
index 3747ad0..0f56e6e 100644
--- a/help/test/functional/tickets_controller_test.rb
+++ b/help/test/functional/tickets_controller_test.rb
@@ -53,7 +53,7 @@ class TicketsControllerTest < ActionController::TestCase
   end
 
   test "should create unauthenticated ticket" do
-    params = {:title => "unauth ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
+    params = {:subject => "unauth ticket test subject", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
 
     assert_difference('Ticket.count') do
       post :create, :ticket => params
@@ -70,7 +70,7 @@ class TicketsControllerTest < ActionController::TestCase
 
   test "should create authenticated ticket" do
 
-    params = {:title => "auth ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
+    params = {:subject => "auth ticket test subject", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
 
     login
 
diff --git a/help/test/unit/ticket_comment_test.rb b/help/test/unit/ticket_comment_test.rb
index 44865ed..fe8cc95 100644
--- a/help/test/unit/ticket_comment_test.rb
+++ b/help/test/unit/ticket_comment_test.rb
@@ -36,7 +36,7 @@ class TicketCommentTest < ActiveSupport::TestCase
 =end
 
   test "add comments" do
-    testticket = Ticket.create :title => "testing"
+    testticket = Ticket.create :subject => "testing"
     assert_equal testticket.comments.count, 0
     comment = TicketComment.new :body => "my email broke"
     #assert comment.valid? #validating or saving necessary for setting posted_at
diff --git a/help/test/unit/ticket_test.rb b/help/test/unit/ticket_test.rb
index 751fe70..f5e6ea7 100644
--- a/help/test/unit/ticket_test.rb
+++ b/help/test/unit/ticket_test.rb
@@ -44,12 +44,12 @@ class TicketTest < ActiveSupport::TestCase
 # TODO: do once have current_user stuff in order
   test "code if & only if not creator-validated" do
     User.current_test = nil
-    t1 = Ticket.create :title => 'test title'
+    t1 = Ticket.create :subject => 'test title'
     assert_not_nil t1.code
     assert_nil t1.created_by
 
     User.current_test = 4
-    t2 = Ticket.create :title => 'test title'
+    t2 = Ticket.create :subject => 'test title'
     assert_nil t2.code
     assert_not_nil t2.created_by
   end
@@ -64,7 +64,7 @@ class TicketTest < ActiveSupport::TestCase
     # TODO: the by_includes_post_by view is only used for tests. Maybe we should get rid of it and change the test to including ordering?
 
 
-    testticket = Ticket.create :title => "test retrieving commented tickets"
+    testticket = Ticket.create :subject => "test retrieving commented tickets"
     comment = TicketComment.new :body => "my email broke", :posted_by => "123"
     assert_equal 0, testticket.comments.count
     assert_equal [], Ticket.by_includes_post_by.key('123').all