diff options
| author | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
| commit | 7d7741f7d26c3ae7ee1dc347a6b1a1142a3c2824 (patch) | |
| tree | 5ec11b9600d4330ec94f56dda779634cd7dcae1b /help/app/views/tickets/_ticket.html.haml | |
| parent | 2485527650c4832d764d318e91c10bafde8b8ae5 (diff) | |
| parent | b550cd14f33b9664fe6b547dc56107fae7d12caf (diff) | |
Merge branch 'master' into feature/unauthenticated_tickets
Conflicts:
help/app/views/tickets/_comment.html.haml
help/app/views/tickets/_new_comment.html.haml
Diffstat (limited to 'help/app/views/tickets/_ticket.html.haml')
| -rw-r--r-- | help/app/views/tickets/_ticket.html.haml | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/help/app/views/tickets/_ticket.html.haml b/help/app/views/tickets/_ticket.html.haml index 3edfa8b..7b37652 100644 --- a/help/app/views/tickets/_ticket.html.haml +++ b/help/app/views/tickets/_ticket.html.haml @@ -1,13 +1,17 @@ +- updated_at_text = 'updated: ' + ticket.updated_at.to_s(:long) %tr %td %b = link_to ticket.title, ticket - %br - %small - created: - = ticket.created_at.to_s(:short) - updated: - = ticket.updated_at.to_s(:short) - %small.pull-right - comments by: - = ticket.commenters + - if params[:controller] == 'tickets' + %br + %small + created: + = ticket.created_at.to_s(:long) + = updated_at_text + %small.pull-right + comments by: + = ticket.commenters + - else + %small + = updated_at_text
\ No newline at end of file |