Added support of signature.

This commit is contained in:
Martin Edenhofer 2012-10-02 07:46:08 +02:00
parent abe409ad94
commit c3e6c4028a
3 changed files with 66 additions and 37 deletions

View file

@ -22,6 +22,8 @@ class Index extends App.Controller
@edit_form = undefined @edit_form = undefined
@ticket_id = params.ticket_id @ticket_id = params.ticket_id
@article_id = params.article_id @article_id = params.article_id
@signature = undefined
@signature_used = undefined
@key = 'ticket::' + @ticket_id @key = 'ticket::' + @ticket_id
cache = App.Store.get( @key ) cache = App.Store.get( @key )
@ -53,6 +55,9 @@ class Index extends App.Controller
# get edit form attributes # get edit form attributes
@edit_form = data.edit_form @edit_form = data.edit_form
# get signature
@signature = data.signature
# load user collection # load user collection
App.Collection.load( type: 'User', data: data.users ) App.Collection.load( type: 'User', data: data.users )
@ -133,6 +138,9 @@ class Index extends App.Controller
model: { model: {
configure_attributes: @configure_attributes_article, configure_attributes: @configure_attributes_article,
}, },
# params: {
# body: @signature.body,
# }
form_data: @edit_form, form_data: @edit_form,
) )
@ -258,6 +266,16 @@ class Index extends App.Controller
@el.find('[name="cc"]').parents('.control-group').removeClass('hide') @el.find('[name="cc"]').parents('.control-group').removeClass('hide')
# @el.find('[name="subject"]').parents('.control-group').removeClass('hide') # @el.find('[name="subject"]').parents('.control-group').removeClass('hide')
# add signature
if !@signature_used && @signature && @signature.body
@signature_used = true
body = @el.find('[name="body"]').val() || ''
body = body + "\n" + @signature.body
@el.find('[name="body"]').val( body )
# update textarea size
@el.find('[name="body"]').trigger('change')
reply: (e) => reply: (e) =>
e.preventDefault() e.preventDefault()
article_id = $(e.target).parents('[data-id]').data('id') article_id = $(e.target).parents('[data-id]').data('id')
@ -306,7 +324,7 @@ class Index extends App.Controller
selection = window.Session['UISelection'].trim() selection = window.Session['UISelection'].trim()
selection = selection.replace /^(.*)$/mg, (match) => selection = selection.replace /^(.*)$/mg, (match) =>
'> ' + match '> ' + match
body = body + selection body = selection + "\n" + body
@el.find('[name="body"]').val(body) @el.find('[name="body"]').val(body)
# update textarea size # update textarea size

View file

@ -87,18 +87,16 @@ class TicketsController < ApplicationController
head :ok head :ok
end end
# GET /ticket_customer # GET /ticket_customer
# GET /tickets_customer # GET /tickets_customer
def ticket_customer def ticket_customer
# get closed/open states # get closed/open states
ticket_state_list_open = Ticket::State.where( ticket_state_list_open = Ticket::State.where(
:ticket_state_type_id => Ticket::StateType.where(:name => ['new','open', 'pending remidner', 'pending action']) :ticket_state_type_id => Ticket::StateType.where( :name => ['new','open', 'pending reminder', 'pending action'] )
) )
ticket_state_list_closed = Ticket::State.where( ticket_state_list_closed = Ticket::State.where(
:ticket_state_type_id => Ticket::StateType.where(:name => ['closed'] ) :ticket_state_type_id => Ticket::StateType.where( :name => ['closed'] )
) )
# get tickets # get tickets
@ -150,10 +148,10 @@ class TicketsController < ApplicationController
def ticket_history def ticket_history
# get ticket data # get ticket data
ticket = Ticket.find(params[:id]) ticket = Ticket.find( params[:id] )
# permissin check # permissin check
return if !ticket_permission(ticket) return if !ticket_permission( ticket )
# get history of ticket # get history of ticket
history = History.history_list( 'Ticket', params[:id], 'Ticket::Article' ) history = History.history_list( 'Ticket', params[:id], 'Ticket::Article' )
@ -212,7 +210,7 @@ class TicketsController < ApplicationController
end end
# permissin check # permissin check
return if !ticket_permission(ticket_slave) return if !ticket_permission( ticket_slave )
# check diffetent ticket ids # check diffetent ticket ids
if ticket_slave.id == ticket_master.id if ticket_slave.id == ticket_master.id
@ -243,31 +241,43 @@ class TicketsController < ApplicationController
def ticket_full def ticket_full
# permission check # permission check
ticket = Ticket.find(params[:id]) ticket = Ticket.find( params[:id] )
return if !ticket_permission(ticket) return if !ticket_permission( ticket )
# get related users # get related users
users = {} users = {}
if !users[ticket.owner_id] if !users[ticket.owner_id]
users[ticket.owner_id] = User.user_data_full(ticket.owner_id) users[ticket.owner_id] = User.user_data_full( ticket.owner_id )
end end
if !users[ticket.customer_id] if !users[ticket.customer_id]
users[ticket.customer_id] = User.user_data_full(ticket.customer_id) users[ticket.customer_id] = User.user_data_full( ticket.customer_id )
end end
if !users[ticket.created_by_id] if !users[ticket.created_by_id]
users[ticket.created_by_id] = User.user_data_full(ticket.created_by_id) users[ticket.created_by_id] = User.user_data_full( ticket.created_by_id )
end end
owner_ids = [] owner_ids = []
ticket.agent_of_group.each { |user| ticket.agent_of_group.each { |user|
owner_ids.push user.id owner_ids.push user.id
if !users[user.id] if !users[user.id]
users[user.id] = User.user_data_full(user.id) users[user.id] = User.user_data_full( user.id )
end end
} }
# log object as viewed # log object as viewed
log_view(ticket) log_view( ticket )
# get signature
signature = ticket.group.signature.attributes
# replace tags
signature['body'] = NotificationFactory.build(
:string => signature['body'],
:objects => {
:ticket => ticket,
:user => current_user,
}
)
# get related articles # get related articles
ticket = ticket.attributes ticket = ticket.attributes
@ -293,7 +303,7 @@ class TicketsController < ApplicationController
# load users # load users
if !users[article.created_by_id] if !users[article.created_by_id]
users[article.created_by_id] = User.user_data_full(article.created_by_id) users[article.created_by_id] = User.user_data_full( article.created_by_id )
end end
} }
@ -313,16 +323,17 @@ class TicketsController < ApplicationController
next if !agents[ user.id ] next if !agents[ user.id ]
groups_users[ group_id ].push user.id groups_users[ group_id ].push user.id
if !users[user.id] if !users[user.id]
users[user.id] = User.user_data_full(user.id) users[user.id] = User.user_data_full( user.id )
end end
} }
} }
# return result # return result
render :json => { render :json => {
:ticket => ticket, :ticket => ticket,
:articles => articles_used, :articles => articles_used,
:users => users, :signature => signature,
:users => users,
:edit_form => { :edit_form => {
:group_id__owner_id => groups_users, :group_id__owner_id => groups_users,
:owner_id => owner_ids, :owner_id => owner_ids,
@ -347,20 +358,20 @@ class TicketsController < ApplicationController
# get related users # get related users
if !users[ticket.owner_id] if !users[ticket.owner_id]
users[ticket.owner_id] = User.user_data_full(ticket.owner_id) users[ticket.owner_id] = User.user_data_full( ticket.owner_id )
end end
if !users[ticket.customer_id] if !users[ticket.customer_id]
users[ticket.customer_id] = User.user_data_full(ticket.customer_id) users[ticket.customer_id] = User.user_data_full( ticket.customer_id )
end end
if !users[ticket.created_by_id] if !users[ticket.created_by_id]
users[ticket.created_by_id] = User.user_data_full(ticket.created_by_id) users[ticket.created_by_id] = User.user_data_full( ticket.created_by_id )
end end
owner_ids = [] owner_ids = []
ticket.agent_of_group.each { |user| ticket.agent_of_group.each { |user|
owner_ids.push user.id owner_ids.push user.id
if !users[user.id] if !users[user.id]
users[user.id] = User.user_data_full(user.id) users[user.id] = User.user_data_full( user.id )
end end
} }
@ -374,13 +385,13 @@ class TicketsController < ApplicationController
# load users # load users
if !users[article.created_by_id] if !users[article.created_by_id]
users[article.created_by_id] = User.user_data_full(article.created_by_id) users[article.created_by_id] = User.user_data_full( article.created_by_id )
end end
end end
create_attributes[:owner_id].each {|user_id| create_attributes[:owner_id].each {|user_id|
if !users[user_id] if !users[user_id]
users[user_id] = User.user_data_full(user_id) users[user_id] = User.user_data_full( user_id )
end end
} }