From 247db7fb3c7cba32eda052fdc8c1be54afc9a936 Mon Sep 17 00:00:00 2001
From: "BOYA,CHIU" <naruto0426@rulingcom.com>
Date: Tue, 3 Aug 2021 10:07:01 +0800
Subject: [PATCH] fix error

---
 app/controllers/admin/tickets_manage_controller.rb | 8 ++++----
 app/models/ticket.rb                               | 2 +-
 app/views/admin/tickets_manage/_ticket.html.erb    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/admin/tickets_manage_controller.rb b/app/controllers/admin/tickets_manage_controller.rb
index 7040a28..3978615 100644
--- a/app/controllers/admin/tickets_manage_controller.rb
+++ b/app/controllers/admin/tickets_manage_controller.rb
@@ -103,7 +103,7 @@ class Admin::TicketsManageController < OrbitAdminController
       ticket.category_id = category.id
       ticket.save
     end
-    redirect_to admin_ticket_path(ticket.id)
+    redirect_to admin_tickets_manage_path(ticket.id)
   end
 
   def start
@@ -111,7 +111,7 @@ class Admin::TicketsManageController < OrbitAdminController
     ticket.status = "commenced"
     ticket.taken_by = current_user.id
     ticket.save
-    redirect_to admin_ticket_path(ticket.id)
+    redirect_to admin_tickets_manage_path(ticket.id)
   end
 
   def close
@@ -119,7 +119,7 @@ class Admin::TicketsManageController < OrbitAdminController
     ticket.status = "closed"
     ticket.urgent = false
     ticket.save
-    redirect_to admin_ticket_path(ticket.id)
+    redirect_to admin_tickets_manage_path(ticket.id)
   end
 
   def leave
@@ -127,7 +127,7 @@ class Admin::TicketsManageController < OrbitAdminController
     ticket.status = "open"
     ticket.taken_by = nil
     ticket.save
-    redirect_to admin_ticket_path(ticket.id)
+    redirect_to admin_tickets_manage_path(ticket.id)
   end
 
   def reopen
diff --git a/app/models/ticket.rb b/app/models/ticket.rb
index 3b21f48..d0c5ebd 100644
--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -2,7 +2,7 @@ class Ticket
 	include Mongoid::Document
 	include Mongoid::Timestamps
 	include OrbitTag::Taggable
-  include OrbitCategory::Categorizable
+  	include OrbitCategory::Categorizable
 	include Slug
 
 	field :site_type
diff --git a/app/views/admin/tickets_manage/_ticket.html.erb b/app/views/admin/tickets_manage/_ticket.html.erb
index d7bceaa..362da14 100644
--- a/app/views/admin/tickets_manage/_ticket.html.erb
+++ b/app/views/admin/tickets_manage/_ticket.html.erb
@@ -10,7 +10,7 @@
 %>
 <div class="ticket ticket-item" id="ticket_<%= ticket.id.to_s %>" data-id="<%= ticket.id.to_s %>">
 	#<%= ticket.uid %> - 
-  <a class="ticket-link" href="<%= admin_ticket_path(ticket.id) %>">
+  <a class="ticket-link" href="<%= admin_tickets_manage_path(ticket.id) %>">
     <span class="ticket-title"><%= ticket.subject %></span>
   </a>
   <% if !ticket.registered_site.nil? %>
@@ -21,7 +21,7 @@
   <% else %>
     <span class="ticket-site-dead"><i class="fa fa-chain-broken"></i> Site deleted</span>
   <% end %>
-  <span class="ticket-date"><abbr title="<%= ticket.created_at.strftime("%dth %B %y %H:%M") %>"><i class="fa fa-calendar" aria-hidden="true"></i></abbr></span>
+  <span class="ticket-date"><abbr title="<%= ticket.created_at.strftime("%Y/%m/%d %H:%M:%S") %>"><i class="fa fa-calendar" aria-hidden="true"><%= ticket.created_at.strftime("%Y/%m/%d %H:%M:%S") %></i></abbr></span>
 	<div class="ticket-label pull-right">
   <% if ticket.is_urgent? %>
     <span class="label label-danger">