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/_ticket_data.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/_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: |