From 70b5bb660622985b9918047d7b381cdf3b19e94f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Tue, 25 Aug 2015 19:03:26 +0800 Subject: [PATCH] some css update and and email fork removed --- app/assets/stylesheets/tickets/_common.scss | 2 +- app/controllers/admin/tickets_controller.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/tickets/_common.scss b/app/assets/stylesheets/tickets/_common.scss index 77574f4..91bdc95 100644 --- a/app/assets/stylesheets/tickets/_common.scss +++ b/app/assets/stylesheets/tickets/_common.scss @@ -1,5 +1,5 @@ @charset "utf-8"; - +@import 'ticket_variables'; #filter { display: none; } diff --git a/app/controllers/admin/tickets_controller.rb b/app/controllers/admin/tickets_controller.rb index 5883a96..4f7dfed 100644 --- a/app/controllers/admin/tickets_controller.rb +++ b/app/controllers/admin/tickets_controller.rb @@ -186,8 +186,9 @@ class Admin::TicketsController < OrbitAdminController response.user_tags = params[:user_tags] if params[:user_tags].present? response.save if params[:user_tags].present? - p1 = fork { send_notification_emails(response, tq.ticket) } - Process.detach(p1) + send_notification_emails(response, tq.ticket) + # p1 = fork { send_notification_emails(response, tq.ticket) } + # Process.detach(p1) end tq.ticket_query_responses << response render :partial => "response", :object => response