Merge branch 'develop' into feature/billing-no-authenticated-payments

Conflicts:
	billing/config/locales/en.yml

3 files changed, 5 insertions, 5 deletions

diff --git a/help/app/views/tickets/_edit_form.html.haml b/help/app/views/tickets/_edit_form.html.haml
index 5252c2e..714f8ff 100644
--- a/help/app/views/tickets/_edit_form.html.haml
+++ b/help/app/views/tickets/_edit_form.html.haml
@@ -1,7 +1,7 @@
 :ruby
   # created by user link
   if @ticket.created_by_user
-    created_by = link_to(@ticket.created_by_user.login, user_overview_path(@ticket.created_by_user))
+    created_by = link_to @ticket.created_by_user.login, @ticket.created_by_user
   else
     created_by = t(:anonymous)
   end
@@ -9,7 +9,7 @@
   # regarding user link
   if admin?
     if @ticket.regarding_user_actual_user
-      regarding_user_link = link_to @ticket.regarding_user_actual_user.login, user_overview_path(@ticket.regarding_user_actual_user)
+      regarding_user_link = link_to @ticket.regarding_user_actual_user.login, @ticket.regarding_user_actual_user
     else
       regarding_user_link =  "(#{t(:unknown)})"
     end
@@ -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}