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/views | |
| parent | 6c6c3d01233cb095b3855bbdf1c33dbb90267771 (diff) | |
| parent | d2eaffde87286c0cc9c0658503a60706759f7f51 (diff) | |
Merge branch 'develop' - hotfix for database change
Diffstat (limited to 'help/app/views')
| -rw-r--r-- | help/app/views/tickets/_edit_form.html.haml | 2 | ||||
| -rw-r--r-- | help/app/views/tickets/_ticket.html.haml | 2 | ||||
| -rw-r--r-- | help/app/views/tickets/new.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
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} |