harry
/
tickets
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for tickets

This commit is contained in:
Harry Bomrah 2017-04-12 19:43:24 +08:00
parent 05ff4b488c
commit fd3f22abaa
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/admin/tickets_api_controller.rb
View File

@ -107,6 +107,7 @@ class Admin::TicketsApiController < ApplicationController
response["ticket"] = get_ticket_hash(ticket) response["ticket"] = get_ticket_hash(ticket)
response["ticket"]["creator_name"] = ticket.ticket_creater_name response["ticket"]["creator_name"] = ticket.ticket_creater_name
response["ticket"]["creator_id"] = ticket.ticket_creater_id response["ticket"]["creator_id"] = ticket.ticket_creater_id
response["ticket"]["creater_cpanel_id"] = ticket.ticket_creater_cpanel_id
response["ticket"]["queries"] = [] response["ticket"]["queries"] = []
ticket.ticket_queries.asc(:created_at).each do |qu| ticket.ticket_queries.asc(:created_at).each do |qu|
r = {"query" => qu.query, "responses" => []} r = {"query" => qu.query, "responses" => []}

21
app/models/ticket.rb
View File

@ -2,34 +2,39 @@ class Ticket
include Mongoid::Document include Mongoid::Document
include Mongoid::Timestamps include Mongoid::Timestamps
include OrbitTag::Taggable include OrbitTag::Taggable
include OrbitCategory::Categorizable include OrbitCategory::Categorizable
include Slug include Slug
field :site_type field :site_type
field :ticket_creater_id field :ticket_creater_id
field :ticket_creater_name field :ticket_creater_name
field :ticket_creater_cpanel_id
field :subject field :subject
field :urgent, type: Boolean, default: false field :urgent, type: Boolean, default: false
field :reopened_count, type: Integer, :default => 0 field :reopened_count, type: Integer, :default => 0
field :status, :default => "open" field :status, :default => "open"
field :taken_by, type: BSON::ObjectId field :taken_by, type: BSON::ObjectId
scope :open, ->{ where(status: "open") } scope :open, ->{ where(status: "open") }
scope :closed, ->{ where(status: "closed") } scope :closed, ->{ where(status: "closed") }
scope :commenced, ->{ where(status: "commenced") } scope :commenced, ->{ where(status: "commenced") }
scope :not_urgent, ->{ where(:urgent.in => [false,nil]) } scope :not_urgent, ->{ where(:urgent.in => [false,nil]) }
scope :all_urgent, ->{ where(urgent: true) } scope :all_urgent, ->{ where(urgent: true) }
belongs_to :registered_site belongs_to :registered_site
has_many :ticket_queries, :dependent => :destroy has_many :ticket_queries, :autosave => true, :dependent => :destroy
accepts_nested_attributes_for :ticket_queries, :allow_destroy => true
def can_be_reopened? def can_be_reopened?
self.reopened_count < 2 self.reopened_count < 2
end end
def author
!self.ticket_creater_name.nil? ? self.ticket_creater_name : self.ticket_creater_cpanel_id
end
def is_urgent? def is_urgent?
self.urgent self.urgent
end end

5
app/models/ticket_query_response.rb
View File

@ -11,4 +11,9 @@ class TicketQueryResponse
scope :for_clients, ->{ where(:internal_response.in => [nil, false]) } scope :for_clients, ->{ where(:internal_response.in => [nil, false]) }
belongs_to :ticket_query belongs_to :ticket_query
def author
User.find(self.response_by)
end
end end