diff options
author | Azul <azul@leap.se> | 2013-01-18 07:44:57 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2013-01-18 07:44:57 +0100 |
commit | 27730c7e665ed64e691fdf6dbeebc39c8bfbbc4b (patch) | |
tree | cd1df0a9a7d3f0a9812b512cfb93db0f79b0421f /help/app/views/tickets/_ticket_data.html.haml | |
parent | 247a6f14db14543773beb1a1e96f2c335800eb82 (diff) | |
parent | 19d563e2e2db98ecc5143229f554df6a09bc457e (diff) |
Merge remote-tracking branch 'origin/master' into feature/fixed-email-address
Conflicts:
users/app/views/emails/_email.html.haml
Diffstat (limited to 'help/app/views/tickets/_ticket_data.html.haml')
-rw-r--r-- | help/app/views/tickets/_ticket_data.html.haml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/help/app/views/tickets/_ticket_data.html.haml b/help/app/views/tickets/_ticket_data.html.haml index fee080f..d68d3e9 100644 --- a/help/app/views/tickets/_ticket_data.html.haml +++ b/help/app/views/tickets/_ticket_data.html.haml @@ -1,10 +1,20 @@ .spam12 %b Created by: - - if User.find(@ticket.created_by) - = User.find(@ticket.created_by).login + - if @ticket.created_by_user + = link_to @ticket.created_by_user.login, edit_user_path(@ticket.created_by_user) #todo: won't want edit path - else Unauthenticated ticket creator + - if @ticket.regarding_user + %b + Regarding user: + - if admin? + - if @ticket.regarding_user_actual_user + = link_to @ticket.regarding_user_actual_user.login, edit_user_path(@ticket.regarding_user_actual_user) #todo: won't want edit path + - else + = @ticket.regarding_user + ' (no such user)' + - else # a non-admin is viewing the ticket, so they shouldn't see confirmation of whether the regarding_user exists or not. + = @ticket.regarding_user - if @ticket.email %b email: |