From 4fd1ac944eb4e36a8d6429faac60f389d9aba3b1 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Thu, 24 Sep 2015 13:46:18 +0800
Subject: [PATCH] small fix for delete sites

---
 app/helpers/tickets_helper.rb                 |  6 ++++--
 app/views/admin/tickets/_ticket.html.erb      | 10 ++++++----
 app/views/admin/tickets/_ticket_by_c.html.erb |  7 ++++++-
 app/views/admin/tickets/show.html.erb         | 18 ++++++++++--------
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/app/helpers/tickets_helper.rb b/app/helpers/tickets_helper.rb
index 3c60784..e7635f3 100644
--- a/app/helpers/tickets_helper.rb
+++ b/app/helpers/tickets_helper.rb
@@ -1,7 +1,9 @@
 module TicketsHelper
 	def smart_links_parser(html,site)
-		html = html.gsub("href=\"/uploads/","href=\"http://#{site.site_domain}/uploads/")
-		html = html.gsub("src=\"/uploads/","src=\"http://#{site.site_domain}/uploads/")
+		if !site.nil?
+			html = html.gsub("href=\"/uploads/","href=\"http://#{site.site_domain}/uploads/")
+			html = html.gsub("src=\"/uploads/","src=\"http://#{site.site_domain}/uploads/")
+		end
 		return html
 	end
 
diff --git a/app/views/admin/tickets/_ticket.html.erb b/app/views/admin/tickets/_ticket.html.erb
index 6bca2b0..b2345be 100644
--- a/app/views/admin/tickets/_ticket.html.erb
+++ b/app/views/admin/tickets/_ticket.html.erb
@@ -13,10 +13,12 @@
   <a class="ticket-link" href="<%= admin_ticket_path(ticket.id) %>">
     <span class="ticket-title"><%= ticket.subject %></span>
   </a>
-  <a class="ticket-site-link" href="http://<%= ticket.registered_site.site_domain %>" target="_blank">
-    <i class="fa fa-external-link"></i>
-    <%= ticket.registered_site.title %>
-  </a>
+  <% if !ticket.registered_site.nil? %>
+    <a class="ticket-site-link" href="http://<%= ticket.registered_site.site_domain %>" target="_blank">
+      <i class="fa fa-external-link"></i>
+      <%= ticket.registered_site.title %>
+    </a>
+  <% end %>
 	<div class="ticket-label pull-right">
   <% if ticket.is_urgent? %>
     <span class="label label-danger">
diff --git a/app/views/admin/tickets/_ticket_by_c.html.erb b/app/views/admin/tickets/_ticket_by_c.html.erb
index 8991224..34d7ee7 100644
--- a/app/views/admin/tickets/_ticket_by_c.html.erb
+++ b/app/views/admin/tickets/_ticket_by_c.html.erb
@@ -9,7 +9,12 @@
 %>
 <tr>
   <td><%= ticket_by_c.uid %></td>
-  <td><a href="http://<%= ticket_by_c.registered_site.site_domain %>" target="_blank"><%= ticket_by_c.registered_site.title %></a></td>
+  <td>
+    <% if !ticket_by_c.registered_site.nil? %>
+      <a href="http://<%= ticket_by_c.registered_site.site_domain %>" target="_blank"><%= ticket_by_c.registered_site.title %></a>
+    <% end %>
+    &nbsp;
+  </td>
   <td class="span6">
     <a href="/admin/tickets/<%= ticket_by_c.id.to_s %>"><%= ticket_by_c.subject %></a>
   </td>
diff --git a/app/views/admin/tickets/show.html.erb b/app/views/admin/tickets/show.html.erb
index e6068b5..1e00b1a 100644
--- a/app/views/admin/tickets/show.html.erb
+++ b/app/views/admin/tickets/show.html.erb
@@ -24,14 +24,16 @@
       <i class="ticket-home-btn-icon fa fa-home"></i>
       Back to Dashboard
     </a>
-    <a href="http://<%= @ticket.registered_site.site_domain %>" target="_blank" class="btn btn-normal">
-      <i class="ticket-external-link-icon fa fa-external-link"></i>
-        <%= @ticket.registered_site.title %>
-    </a>
-     <a href="/admin/tickets/search?keywords=sitename%3A+<%= @ticket.registered_site.title %>" target="_blank" class="btn btn-normal">
-      <i class="ticket-external-link-icon fa fa-search"></i>
-        Search tickets from <b><i><%= @ticket.registered_site.title %></i></b>
-    </a>
+    <% if !@ticket.registered_site.nil?
+      <a href="http://<%= @ticket.registered_site.site_domain %>" target="_blank" class="btn btn-normal">
+        <i class="ticket-external-link-icon fa fa-external-link"></i>
+          <%= @ticket.registered_site.title %>
+      </a>
+       <a href="/admin/tickets/search?keywords=sitename%3A+<%= @ticket.registered_site.title %>" target="_blank" class="btn btn-normal">
+        <i class="ticket-external-link-icon fa fa-search"></i>
+          Search tickets from <b><i><%= @ticket.registered_site.title %></i></b>
+      </a>
+    <% end %>
   </div>
   <div class="ticket-wrap">
     <div class="ticket-header">