Improved ticket_full to support customer output.
This commit is contained in:
parent
9ec70b1a0e
commit
f75c9f6a76
1 changed files with 19 additions and 10 deletions
|
@ -179,18 +179,30 @@ class TicketOverviewsController < ApplicationController
|
|||
end
|
||||
}
|
||||
|
||||
# log object as viewed
|
||||
log_view(ticket)
|
||||
|
||||
# get related articles
|
||||
ticket = ticket.attributes
|
||||
ticket[:article_ids] = []
|
||||
articles = ticket.articles || []
|
||||
articles = Ticket::Article.where( :ticket_id => params[:id] )
|
||||
|
||||
# get related users
|
||||
articles_used = []
|
||||
articles.each {|article|
|
||||
|
||||
# ignore internal article if customer is requesting
|
||||
next if article.internal == true && is_role('Customer')
|
||||
article_tmp = article.attributes
|
||||
|
||||
# load article ids
|
||||
ticket[:article_ids].push article.id
|
||||
ticket[:article_ids].push article_tmp['id']
|
||||
|
||||
# add attachment list to article
|
||||
article['attachments'] = Store.list( :object => 'Ticket::Article', :o_id => article.id )
|
||||
article_tmp['attachments'] = Store.list( :object => 'Ticket::Article', :o_id => article.id )
|
||||
|
||||
# remember article
|
||||
articles_used.push article_tmp
|
||||
|
||||
# load users
|
||||
if !users[article.created_by_id]
|
||||
|
@ -198,13 +210,10 @@ class TicketOverviewsController < ApplicationController
|
|||
end
|
||||
}
|
||||
|
||||
# log object as viewed
|
||||
log_view(ticket)
|
||||
|
||||
# return result
|
||||
render :json => {
|
||||
:ticket => ticket,
|
||||
:articles => articles,
|
||||
:articles => articles_used,
|
||||
:users => users,
|
||||
:edit_form => {
|
||||
:owner_id => {
|
||||
|
|
Loading…
Reference in a new issue