diff options
| author | jessib <jessib@leap.se> | 2013-01-17 11:28:27 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-01-17 11:28:27 -0800 |
| commit | a4105f068e6f8ce89fbba475048f2a1e02e0fcbc (patch) | |
| tree | 91353015c71c5e2b73c416f1b6974423c1298632 /help/app/views/tickets/_comment.html.haml | |
| parent | dc16c6f8e5382f9e5470eb2a40081d41f4112437 (diff) | |
| parent | 6347fdbe0d932e78dfa8259bf81355edb19508e9 (diff) | |
Merge branch 'master' into feature/tickets_controllers_simplification
Conflicts:
users/app/controllers/users_controller.rb
Diffstat (limited to 'help/app/views/tickets/_comment.html.haml')
| -rw-r--r-- | help/app/views/tickets/_comment.html.haml | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/help/app/views/tickets/_comment.html.haml b/help/app/views/tickets/_comment.html.haml index 1d8ee41..501ceec 100644 --- a/help/app/views/tickets/_comment.html.haml +++ b/help/app/views/tickets/_comment.html.haml @@ -1,16 +1,20 @@ - # style is super ugly but just for now -%tr - %td - - if commenter = User.find(comment.posted_by) - %b - = 'Posted by' + (commenter.is_admin? ? ' admin' : '') + ':' - = commenter.login - - else - %b - Unauthenticated post - .pull-right - %b - Posted at: - = comment.posted_at.to_s(:short) - %br - = comment.body +- if admin? or !comment.private # only show comment if user is admin or comment is not private + %tr + %td + - if comment.posted_by_user + %b + = 'Posted by' + (comment.posted_by_user.is_admin? ? ' admin' : '') + ':' + = comment.posted_by_user.login + - else + %b + Unauthenticated post + - if comment.private + (Private comment) + .pull-right + %b + Posted at: + = comment.posted_at.to_s(:short) + %br + = comment.body + |