diff options
| author | Azul <azul@leap.se> | 2014-05-16 08:42:36 +0200 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2014-05-16 08:42:36 +0200 |
| commit | 8fbbb8717f0578536b97c2dc0883c632f120e976 (patch) | |
| tree | 17aeb2b48ada703ac916a9a65fbf3c75a5dadb86 /engines/support/app/views/tickets/_comment.html.haml | |
| parent | 81555ec6244ed76f92e3629880f68104b8705817 (diff) | |
| parent | a4f7a410c536d88c91c834cab6ee950c71005ddd (diff) | |
Merge remote-tracking branch 'origin/develop'
Conflicts:
app/assets/javascripts/srp
test/nagios/soledad_sync.py
test/nagios/webapp_login.py
Diffstat (limited to 'engines/support/app/views/tickets/_comment.html.haml')
| -rw-r--r-- | engines/support/app/views/tickets/_comment.html.haml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/engines/support/app/views/tickets/_comment.html.haml b/engines/support/app/views/tickets/_comment.html.haml new file mode 100644 index 0000000..778ca13 --- /dev/null +++ b/engines/support/app/views/tickets/_comment.html.haml @@ -0,0 +1,20 @@ +- if admin? or !comment.private # only show comment if user is admin or comment is not private + %tr + %td.user + %div + %strong + - if comment.posted_by_user + = comment.posted_by_user.login + - else + = t(:anonymous) + %div= comment.posted_at.to_s(:short) + - if comment.posted_by_user && comment.posted_by_user.is_admin? + %div + %span.label.label-inverse + = t(:admin) + - if comment.private + %div + %span.label.label-important + = t(:private) + %td.comment + = simple_format(comment.body)
\ No newline at end of file |