diff --git a/app/controllers/admin/tickets_api_controller.rb b/app/controllers/admin/tickets_api_controller.rb index 69513df..e7aa33b 100644 --- a/app/controllers/admin/tickets_api_controller.rb +++ b/app/controllers/admin/tickets_api_controller.rb @@ -112,11 +112,16 @@ class Admin::TicketsApiController < ApplicationController r = {"query" => qu.query, "responses" => []} r["responses"] = qu.ticket_query_responses.asc(:created_at).collect do |qr| user = User.find(qr.response_by) rescue nil + if user.member_profile.avatar.nil? || user.member_profile.avatar.thumb.url == "thumb_person.png" + avatar = "http://" + request.host_with_port + "/assets/thumb_person.png" + else + avatar = "http://" + request.host_with_port + user.member_profile.avatar.thumb.url + end { "response" => qr.response, "response_time" => qr.created_at, "response_by" => (user.name if !user.nil?), - "avatar" => ("http://" + request.host_with_port + user.member_profile.avatar.thumb.url if !user.member_profile.avatar.nil?) + "avatar" => avatar } end response["ticket"]["queries"] << r diff --git a/app/views/admin/tickets/_response.html.erb b/app/views/admin/tickets/_response.html.erb index d802258..6d5cff9 100644 --- a/app/views/admin/tickets/_response.html.erb +++ b/app/views/admin/tickets/_response.html.erb @@ -2,7 +2,13 @@
<% user = User.find(response.response_by) rescue nil %> - + <% if user.member_profile.avatar.nil? || user.member_profile.avatar.thumb.url == "thumb_person.png" + avatar = "/assets/thumb_person.png" + else + avatar = user.member_profile.avatar.thumb.url + end + %> + <%= user.name if !user.nil? %>