From beb13207ada6f3d77e95405da3eb0d3dfb78e558 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Mon, 14 Sep 2015 19:36:01 +0800 Subject: [PATCH] small updates for tickets --- app/assets/stylesheets/tickets/ticket_show.scss | 5 +++++ app/controllers/admin/tickets_controller.rb | 9 ++++++--- app/views/admin/tickets/show.html.erb | 12 ++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/tickets/ticket_show.scss b/app/assets/stylesheets/tickets/ticket_show.scss index 2a176e7..290f839 100644 --- a/app/assets/stylesheets/tickets/ticket_show.scss +++ b/app/assets/stylesheets/tickets/ticket_show.scss @@ -807,3 +807,8 @@ opacity: 1; } } + + +.ticket-response-content img, .ticket-query img{ + cursor: pointer; +} diff --git a/app/controllers/admin/tickets_controller.rb b/app/controllers/admin/tickets_controller.rb index 3789285..8fe3a1a 100644 --- a/app/controllers/admin/tickets_controller.rb +++ b/app/controllers/admin/tickets_controller.rb @@ -187,9 +187,12 @@ class Admin::TicketsController < OrbitAdminController response.save tq.ticket_query_responses << response if params[:user_tags].present? - # send_notification_emails(response, tq.ticket) - p1 = fork { send_notification_emails(response, tq.ticket) } - Process.detach(p1) + Thread.new do + begin + send_notification_emails(response, tq.ticket) + rescue e + end + end end render :partial => "response", :object => response else diff --git a/app/views/admin/tickets/show.html.erb b/app/views/admin/tickets/show.html.erb index 1a2801c..33b0833 100644 --- a/app/views/admin/tickets/show.html.erb +++ b/app/views/admin/tickets/show.html.erb @@ -347,6 +347,18 @@ $(document).ready(function(){ return false; }) + var openImageWindow = null; + $("body").on("click", ".ticket-response-content img, .ticket-query img", function(){ + var el = $(this); + if(el.parent().prop("tagName") != "A"){ + if(openImageWindow == null){ + openImageWindow = window.open(el.attr("src")); + }else{ + openImageWindow.location = el.attr("src"); + } + } + }) + var timer = null; $(document).on("scroll",function(){ clearTimeout(timer);