Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
André Bauer 2016-11-22 11:00:12 +01:00
commit f4942d0c8b
43 changed files with 1370 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.pkgr.yml
View file

@ -3,10 +3,6 @@ description: Zammad is a web based open source helpdesk/customer support system
homepage: https://zammad.org homepage: https://zammad.org
notifications: false notifications: false
targets: targets:
centos-6:
dependencies:
- nginx
- postgresql-server
centos-7: centos-7:
dependencies: dependencies:
- nginx - nginx

2
app/assets/javascripts/app/controllers/_application_controller_form.coffee
View file

@ -435,7 +435,7 @@ class App.ControllerForm extends App.Controller
else else
value = parseInt(value) value = parseInt(value)
if param[item.name] isnt undefined if param[item.name] isnt undefined
if typeof param[item.name] is 'string' if typeof param[item.name] is 'string' || typeof param[item.name] is 'boolean' || typeof param[item.name] is 'number'
param[item.name] = [param[item.name], value] param[item.name] = [param[item.name], value]
else else
param[item.name].push value param[item.name].push value

3
app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee
View file

@ -6,6 +6,9 @@ class Index extends App.ControllerIntegrationBase
['This service shows you contacts of incoming calls and a caller list in realtime.'] ['This service shows you contacts of incoming calls and a caller list in realtime.']
['Also caller id of outbound calls can be changed.'] ['Also caller id of outbound calls can be changed.']
] ]
events:
'click .js-select': 'selectAll'
'change .js-switch input': 'switch'
render: => render: =>
super super

11
app/assets/javascripts/app/controllers/_settings/area.coffee
View file

@ -35,10 +35,11 @@ class App.SettingsArea extends App.Controller
elements = [] elements = []
for setting in settings for setting in settings
if setting.preferences.controller && App[setting.preferences.controller] if setting.preferences.hidden isnt true
item = new App[setting.preferences.controller](setting: setting) if setting.preferences.controller && App[setting.preferences.controller]
else item = new App[setting.preferences.controller](setting: setting)
item = new App.SettingsAreaItem(setting: setting) else
elements.push item.el item = new App.SettingsAreaItem(setting: setting)
elements.push item.el
@html elements @html elements

7
app/assets/javascripts/app/controllers/_settings/area_item.coffee
View file

@ -1,4 +1,5 @@
class App.SettingsAreaItem extends App.Controller class App.SettingsAreaItem extends App.Controller
template: 'settings/item'
events: events:
'submit form': 'update' 'submit form': 'update'
@ -21,8 +22,12 @@ class App.SettingsAreaItem extends App.Controller
# form # form
@configure_attributes = @setting.options['form'] @configure_attributes = @setting.options['form']
for attribute in @configure_attributes
if attribute.tag is 'boolean'
attribute.translate = true
# item # item
@html App.view('settings/item')( @html App.view(@template)(
setting: @setting setting: @setting
) )

2
app/assets/javascripts/app/controllers/_settings/area_storage_provider.coffee Normal file
View file

@ -0,0 +1,2 @@
class App.SettingsAreaStorageProvider extends App.SettingsAreaItem
template: 'settings/storage_provider'

2
app/assets/javascripts/app/controllers/_settings/area_ticket_hook_position.coffee Normal file
View file

@ -0,0 +1,2 @@
class App.SettingsAreaTicketHookPosition extends App.SettingsAreaItem
template: 'settings/ticket_hook_position'

132
app/assets/javascripts/app/controllers/_settings/area_ticket_number.coffee Normal file
View file

@ -0,0 +1,132 @@
class App.SettingsAreaTicketNumber extends App.Controller
events:
'submit form': 'update'
constructor: ->
super
@render()
render: =>
# defaults
directValue = 0
for item in @setting.options['form']
directValue += 1
if directValue > 1
for item in @setting.options['form']
item['default'] = @setting.state_current.value[item.name]
else
item['default'] = @setting.state_current.value
@map =
'Ticket::Number::Increment': 'ticket_number_increment'
'Ticket::Number::Date': 'ticket_number_date'
# form
@configure_attributes = @setting.options['form']
# item
@html App.view('settings/ticket_number')(
setting: @setting
)
togglePreferences = (params, attribute, @attributes, classname, form) =>
return if attribute.name isnt 'ticket_number'
@showPreferences(params.ticket_number)
updatePreview = (params, attribute) =>
paramsParent = @formParam(@$('.js-form'))
number = "#{App.Config.get('ticket_hook')}???"
if paramsParent.ticket_number is 'Ticket::Number::Increment'
paramsItem = @paramsPreferences('Ticket::Number::Increment')
number = "#{App.Config.get('ticket_hook')}#{App.Config.get('system_id')}"
counter = '1'
if paramsItem.min_size
minSize = parseInt(paramsItem.min_size)
if paramsItem.checksum
minSize -= 1
if minSize > 1
for itemCounter in [2 .. minSize]
counter = "0#{counter}"
number += counter
if paramsItem.checksum
number += '9'
else if paramsParent.ticket_number is 'Ticket::Number::Date'
paramsItem = @paramsPreferences('Ticket::Number::Date')
current = new Date()
currentDay = current.getDate()
currentMonth = current.getMonth() + 1
currentYear = current.getFullYear()
number = "#{App.Config.get('ticket_hook')}#{currentYear}#{currentMonth}#{currentDay}#{App.Config.get('system_id')}001"
if paramsItem.checksum
number += '9'
@$('.js-preview').text(number)
new App.ControllerForm(
el: @el.find('.js-form'),
model: { configure_attributes: @configure_attributes, className: '' }
autofocus: false
handlers: [togglePreferences, updatePreview]
)
# preferences
preferences_settings = @setting.preferences.settings_included || ['ticket_number_increment', 'ticket_number_date']
for preferences_setting in preferences_settings
setting = App.Setting.findByAttribute('name', preferences_setting)
value = App.Setting.get(preferences_setting)
el = $(App.view("settings/#{preferences_setting}")(
setting: setting
))
new App.ControllerForm(
el: el.find('.js-formItem'),
model: { configure_attributes: setting.options['form'], className: '' }
autofocus: false
params: value
handlers: [updatePreview]
)
@$('.js-formPreferences').append(el)
# show current preferences
@showPreferences(item['default'])
showPreferences: (name) =>
@$('.js-formPreferencesItem').addClass('hidden')
@$(".js-formPreferencesItem[data-backend=\"#{name}\"]").removeClass('hidden')
paramsPreferences: (name) =>
@formParam(@$(".js-formPreferencesItem[data-backend=\"#{name}\"] form"))
update: (e) =>
e.preventDefault()
@formDisable(@$('.js-form'))
params = @formParam(@$('.js-form'))
if params.ticket_number
paramsItem = @paramsPreferences(params.ticket_number)
setting_name = @map[params.ticket_number]
if setting_name && paramsItem
App.Setting.set(setting_name, paramsItem)
@setting['state_current'] = {value: params.ticket_number}
ui = @
@setting.save(
done: =>
ui.formEnable(e)
App.Event.trigger 'notify', {
type: 'success'
msg: App.i18n.translateContent('Update successful!')
timeout: 2000
}
# rerender ui || get new collections and session data
App.Setting.preferencesPost(@setting)
fail: (settings, details) ->
ui.formEnable(e)
App.Event.trigger 'notify', {
type: 'error'
msg: App.i18n.translateContent(details.error_human || details.error || 'Unable to update object!')
timeout: 2000
}
)

12
app/assets/javascripts/app/controllers/_ui_element/postmaster_set.coffee
View file

@ -16,8 +16,11 @@ class App.UiElement.postmaster_set
relation: 'TicketState' relation: 'TicketState'
}, },
{ {
value: 'x-zammad-ticket-customer' value: 'x-zammad-ticket-customer_id'
name: 'Customer' name: 'Customer'
relation: 'User'
tag: 'user_autocompletion'
disableCreateUser: true,
}, },
{ {
@ -26,10 +29,11 @@ class App.UiElement.postmaster_set
relation: 'Group' relation: 'Group'
}, },
{ {
value: 'x-zammad-ticket-owner' value: 'x-zammad-ticket-owner_id'
name: 'Owner' name: 'Owner'
relation: 'User', relation: 'User'
tag: 'user_autocompletion', tag: 'user_autocompletion'
disableCreateUser: true,
}, },
{ {
value: 'x-zammad-ignore' value: 'x-zammad-ignore'

15
app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
View file

@ -48,6 +48,7 @@ class App.TicketZoomArticleNew extends App.Controller
possibleArticleType['email'] = true possibleArticleType['email'] = true
# gets referenced in @setArticleType # gets referenced in @setArticleType
@internalSelector = true
@type = @defaults['type'] || 'note' @type = @defaults['type'] || 'note'
@articleTypes = [] @articleTypes = []
if possibleArticleType.note if possibleArticleType.note
@ -115,6 +116,9 @@ class App.TicketZoomArticleNew extends App.Controller
}, },
] ]
if @permissionCheck('ticket.customer')
@internalSelector = false
@textareaHeight = @textareaHeight =
open: 148 open: 148
closed: 20 closed: 20
@ -194,11 +198,12 @@ class App.TicketZoomArticleNew extends App.Controller
ticket = App.Ticket.fullLocal(@ticket_id) ticket = App.Ticket.fullLocal(@ticket_id)
@html App.view('ticket_zoom/article_new')( @html App.view('ticket_zoom/article_new')(
ticket: ticket ticket: ticket
articleTypes: @articleTypes articleTypes: @articleTypes
article: @defaults article: @defaults
form_id: @form_id form_id: @form_id
isCustomer: @permissionCheck('ticket.customer') isCustomer: @permissionCheck('ticket.customer')
internalSelector: @internalSelector
) )
@setArticleType(@type) @setArticleType(@type)

2
app/assets/javascripts/app/lib/app_post/utils.coffee
View file

@ -206,7 +206,7 @@ class App.Utils
# Replace all x tags with the type of replacementTag # Replace all x tags with the type of replacementTag
html.find('textarea').each( -> html.find('textarea').each( ->
outer = @outerHTML; outer = @outerHTML
# Replace opening tag # Replace opening tag
regex = new RegExp('<' + @tagName, 'i') regex = new RegExp('<' + @tagName, 'i')

22
app/assets/javascripts/app/views/integration/sipgate.jst.eco
View file

@ -1,5 +1,27 @@
<form> <form>
<h2>sipgate.io <%- @T('Settings') %></h2>
<p><%- @T('You need to configure the Zammad endpoints in the Sipgate web interface') %>:<p>
<div class="settings-entry">
<table class="settings-list" style="width: 100%;">
<thead>
<tr>
<th width="20%"><%- @T('Type') %>
<th width="80%"><%- @T('URL') %>
</thead>
<tbody>
<tr>
<td class="settings-list-row-control"><%- @T('Inbound') %>
<td class="settings-list-control-cell"><input type="url" class="form-control form-control--small js-select" readonly value="<%- @C('http_type') %>://<%- @C('fqdn') %>/api/v1/sipgate/in">
<tr>
<td class="settings-list-row-control"><%- @T('Outbound') %>
<td class="settings-list-control-cell"><input type="url" class="form-control form-control--small js-select" readonly value="<%- @C('http_type') %>://<%- @C('fqdn') %>/api/v1/sipgate/out">
</tbody>
</table>
</div>
<h2><%- @T('Inbound') %></h2> <h2><%- @T('Inbound') %></h2>
<p><%- @T('Blocked caller ids based on sender caller id.') %> <p><%- @T('Blocked caller ids based on sender caller id.') %>

4
app/assets/javascripts/app/views/login.jst.eco
View file

@ -81,8 +81,8 @@
</div> </div>
</div> </div>
<div class="poweredBy"> <div class="poweredBy">
<%- @Icon('logo') %> <a href="https://zammad.org" target="_blank"><%- @Icon('logo') %></a>
<%- @T('Powered by') %> <%- @T('Powered by') %>
<%- @Icon('logotype', 'logotype') %> <a href="https://zammad.org" target="_blank"><%- @Icon('logotype', 'logotype') %></a>
</div> </div>
</div> </div>

2
app/assets/javascripts/app/views/settings/item.jst.eco
View file

@ -1,6 +1,6 @@
<form class="settings-entry" id="<%= @setting.name %>"> <form class="settings-entry" id="<%= @setting.name %>">
<h2><%- @T(@setting.title) %></h2> <h2><%- @T(@setting.title) %></h2>
<p class="help-text"><%- @RichText(@setting.description) %></p> <p class="help-text"><%- @T(@setting.description) %></p>
<div class="horizontal end"> <div class="horizontal end">
<div class="form-item flex"></div> <div class="form-item flex"></div>
<button type="submit" class="btn btn--primary"><%- @T('Submit') %></button> <button type="submit" class="btn btn--primary"><%- @T('Submit') %></button>

22
app/assets/javascripts/app/views/settings/storage_provider.jst.eco Normal file
View file

@ -0,0 +1,22 @@
<form class="settings-entry" id="<%= @setting.name %>">
<h2><%- @T(@setting.title) %></h2>
<p class="help-text"><%- @T('You can switch between the backend for new attachments even on a system that is already in production without any loss of data.') %></p>
<p class="help-text"><%- @T('If you want to move already stored attachments from one backend to another, you need to execute the following via console.') %></p>
</p>
<p class="help-text"><%- @T('Move all from "%s" to "%s"', 'filesystem', 'database') %>:</p>
</p>
<code>
rails&gt; Store::File.move('File', 'DB')
</code>
<p class="help-text"><%- @T('Move all from "%s" to "%s"', 'database', 'filesystem') %>:</p>
</p>
<code>
rails&gt; Store::File.move('DB', 'File')
</code>
<br>
<br>
<div class="horizontal end">
<div class="form-item flex"></div>
<button type="submit" class="btn btn--primary"><%- @T('Submit') %></button>
</div>
</form>

13
app/assets/javascripts/app/views/settings/ticket_hook_position.jst.eco Normal file
View file

@ -0,0 +1,13 @@
<form class="settings-entry" id="<%= @setting.name %>">
<h2><%- @T(@setting.title) %></h2>
<p class="help-text"><%- @T('The format of the subject.') %></p>
<ul>
<li><%- @T('|Right| means |Some Subject [Ticket#12345]|') %>
<li><%- @T('|Left| means |[Ticket#12345] Some Subject|') %>
<li><%- @T('|None| means |Some Subject| (without ticket number). In the last case you should enable "postmaster___follow___up___search___in" to recognize followups based on email headers and/or body.') %>
</ul>
<div class="horizontal end">
<div class="js-form form-item flex"></div>
<button type="submit" class="btn btn--primary"><%- @T('Submit') %></button>
</div>
</form>

19
app/assets/javascripts/app/views/settings/ticket_number.jst.eco Normal file
View file

@ -0,0 +1,19 @@
<div class="settings-entry" id="<%= @setting.name %>">
<h2><%- @T(@setting.title) %></h2>
<p class="help-text">
<%- @T('Selects the ticket number generator module.') %>
<ul>
<li><%- @T('|Increment| increments the ticket number, the SystemID and the counter are used with "SystemID.Counter" format (e.g. 1010138, 1010139).') %>
<li><%- @T('With |Date| the ticket numbers will be generated by the current date, the SystemID and the counter. The format looks like "Year.Month.Day.SystemID.Counter" (e.g. 201206231010138, 201206231010139).') %>
</ul>
<form class="js-form"></form>
<br>
<div class="js-formPreferences"></div>
<br>
<label class="formGroup-label"><%- @T('Preview') %></label>
<div class="js-preview"></div>
<br>
<form class="horizontal end">
<button type="submit" class="btn btn--primary"><%- @T('Submit') %></button>
</form>
</div>

6
app/assets/javascripts/app/views/settings/ticket_number_date.jst.eco Normal file
View file

@ -0,0 +1,6 @@
<div class="js-date js-formPreferencesItem hidden" data-backend="Ticket::Number::Date">
<label class="formGroup-label"><%- @T('Options') %></label>
<div><%- @T('With Checksum the counter will be appended with a checksum at the end. The format looks like "%s" (e. g. %s).', 'Year.Month.Day.SystemID.Counter.CheckSum', '2012070110101520, 2012070110101535') %></div>
<br>
<form class="js-formItem"></form>
</div>

6
app/assets/javascripts/app/views/settings/ticket_number_increment.jst.eco Normal file
View file

@ -0,0 +1,6 @@
<div class="js-increment js-formPreferencesItem hidden" data-backend="Ticket::Number::Increment">
<label class="formGroup-label"><%- @T('Options') %></label>
<div><%- @T('With Checksum the counter will be appended with a checksum at the end. The format looks like "%s" (e. g. %s).', 'SystemID.Counter.CheckSum', '10101384, 10101392') %></div>
<br>
<form class="js-formItem"></form>
</div>

2
app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
View file

@ -21,6 +21,7 @@
<% end %> <% end %>
</div> </div>
</div> </div>
<% if @internalSelector: %>
<div class="editControls-item is-hidden js-toggleVisibility js-selectInternalPublic"> <div class="editControls-item is-hidden js-toggleVisibility js-selectInternalPublic">
<div class="editControls-iconHolder"> <div class="editControls-iconHolder">
<div class="editControls-icon icon-internal" title="<%- @Ti("set to public") %>"> <div class="editControls-icon icon-internal" title="<%- @Ti("set to public") %>">
@ -31,6 +32,7 @@
</div> </div>
</div> </div>
</div> </div>
<% end %>
</div> </div>
<div class="article-content bubble-gap"> <div class="article-content bubble-gap">
<div class="internal-border"> <div class="internal-border">

13
app/models/channel/driver/smtp.rb
View file

@ -49,16 +49,21 @@ class Channel::Driver::Smtp
options[:openssl_verify_mode] = 'none' options[:openssl_verify_mode] = 'none'
end end
mail = Channel::EmailBuild.build(attr, notification) mail = Channel::EmailBuild.build(attr, notification)
mail.delivery_method :smtp, { smtp_params = {
openssl_verify_mode: options[:openssl_verify_mode], openssl_verify_mode: options[:openssl_verify_mode],
address: options[:host], address: options[:host],
port: options[:port], port: options[:port],
domain: options[:domain], domain: options[:domain],
user_name: options[:user],
password: options[:password],
enable_starttls_auto: options[:enable_starttls_auto], enable_starttls_auto: options[:enable_starttls_auto],
authentication: options[:authentication],
} }
# add authentication only if needed
if options[:user] && !options[:user].empty?
smtp_params[:user_name] = options[:user]
smtp_params[:password] = options[:password]
smtp_params[:authentication] = options[:authentication]
end
mail.delivery_method :smtp, smtp_params
mail.deliver mail.deliver
end end
end end

1
app/models/channel/email_parser.rb
View file

@ -394,6 +394,7 @@ returns
p 'ERROR: ' + e.inspect # rubocop:disable Rails/Output p 'ERROR: ' + e.inspect # rubocop:disable Rails/Output
Rails.logger.error message Rails.logger.error message
Rails.logger.error 'ERROR: ' + e.inspect Rails.logger.error 'ERROR: ' + e.inspect
Rails.logger.error 'ERROR: ' + e.backtrace.inspect
File.open(filename, 'wb') { |file| File.open(filename, 'wb') { |file|
file.write msg file.write msg
} }

2
app/models/channel/filter/auto_response_check.rb
View file

@ -15,7 +15,7 @@ module Channel::Filter::AutoResponseCheck
mail[ 'x-zammad-article-preferences'.to_sym ]['is-auto-response'] = true mail[ 'x-zammad-article-preferences'.to_sym ]['is-auto-response'] = true
return if mail[ 'x-loop'.to_sym ] && mail[ 'x-loop'.to_sym ] =~ /(yes|true)/i return if mail[ 'x-loop'.to_sym ] && mail[ 'x-loop'.to_sym ] =~ /(yes|true)/i
return if mail[ 'precedence'.to_sym ] && mail[ 'precedence'.to_sym ] =~ /bulk/i return if mail[ 'precedence'.to_sym ] && mail[ 'precedence'.to_sym ] =~ /(bulk|list|junk)/i
return if mail[ 'auto-submitted'.to_sym ] && mail[ 'auto-submitted'.to_sym ] =~ /auto-(generated|replied)/i return if mail[ 'auto-submitted'.to_sym ] && mail[ 'auto-submitted'.to_sym ] =~ /auto-(generated|replied)/i
return if mail[ 'x-auto-response-suppress'.to_sym ] && mail[ 'x-auto-response-suppress'.to_sym ] =~ /all/i return if mail[ 'x-auto-response-suppress'.to_sym ] && mail[ 'x-auto-response-suppress'.to_sym ] =~ /all/i

1
app/models/observer/transaction.rb
View file

@ -29,6 +29,7 @@ class Observer::Transaction < ActiveRecord::Observer
sync_backends = [] sync_backends = []
Setting.where(area: 'Transaction::Backend::Sync').order(:name).each { |setting| Setting.where(area: 'Transaction::Backend::Sync').order(:name).each { |setting|
backend = Setting.get(setting.name) backend = Setting.get(setting.name)
next if params[:disable] && params[:disable].include?(backend)
sync_backends.push Kernel.const_get(backend) sync_backends.push Kernel.const_get(backend)
} }

16
app/models/ticket.rb
View file

@ -844,6 +844,22 @@ result
references references
end end
=begin
get all articles of a ticket in correct order (overwrite active record default method)
artilces = ticket.articles
result
[article1, articl2]
=end
def articles
Ticket::Article.where(ticket_id: id).order(:created_at, :id)
end
private private
def check_generate def check_generate

2
app/models/ticket/number.rb
View file

@ -20,7 +20,7 @@ returns
# generate number # generate number
49_999.times { 49_999.times {
number = adapter.generate number = adapter.generate
ticket = Ticket.find_by( number: number ) ticket = Ticket.find_by(number: number)
return number if !ticket return number if !ticket
} }
raise "Can't generate new ticket number!" raise "Can't generate new ticket number!"

8
app/models/ticket/number/date.rb
View file

@ -43,6 +43,14 @@ module Ticket::Number::Date
# vehikel number. The modulus to 10 of this sum is substracted from # vehikel number. The modulus to 10 of this sum is substracted from
# 10. See: http://www.pruefziffernberechnung.de/F/Fahrzeugnummer.shtml # 10. See: http://www.pruefziffernberechnung.de/F/Fahrzeugnummer.shtml
# (german) # (german)
# fix for https://github.com/zammad/zammad/issues/413 - can be removed later
if config.class == FalseClass || config.class == TrueClass
config = {
checksum: config
}
end
if config[:checksum] if config[:checksum]
chksum = 0 chksum = 0
mult = 1 mult = 1

30
app/models/ticket/overviews.rb
View file

@ -90,13 +90,36 @@ returns
# get only tickets with permissions # get only tickets with permissions
access_condition = Ticket.access_condition(user) access_condition = Ticket.access_condition(user)
ticket_attributes = Ticket.new.attributes
list = [] list = []
overviews.each { |overview| overviews.each { |overview|
query_condition, bind_condition, tables = Ticket.selector2sql(overview.condition, user) query_condition, bind_condition, tables = Ticket.selector2sql(overview.condition, user)
order_by = "#{overview.order[:by]} #{overview.order[:direction]}" # validate direction
raise "Invalid order direction '#{overview.order[:direction]}'" if overview.order[:direction] && overview.order[:direction] !~ /^(ASC|DESC)$/i
# check if order by exists
order_by = overview.order[:by]
if !ticket_attributes.key?(order_by)
order_by = if ticket_attributes.key?("#{order_by}_id")
"#{order_by}_id"
else
'created_at'
end
end
order_by = "tickets.#{order_by} #{overview.order[:direction]}"
# check if group by exists
if overview.group_by && !overview.group_by.empty? if overview.group_by && !overview.group_by.empty?
order_by = "#{overview.group_by}_id, #{order_by}" group_by = overview.group_by
if !ticket_attributes.key?(group_by)
group_by = if ticket_attributes.key?("#{group_by}_id")
"#{group_by}_id"
end
end
if group_by
order_by = "tickets.#{group_by}, #{order_by}"
end
end end
ticket_result = Ticket.select('id, updated_at') ticket_result = Ticket.select('id, updated_at')
@ -115,9 +138,10 @@ returns
} }
tickets.push ticket_item tickets.push ticket_item
} }
count = Ticket.where(access_condition).where(query_condition, *bind_condition).count() count = Ticket.where(access_condition).where(query_condition, *bind_condition).joins(tables).count()
item = { item = {
overview: { overview: {
name: overview.name,
id: overview.id, id: overview.id,
view: overview.link, view: overview.link,
updated_at: overview.updated_at, updated_at: overview.updated_at,

5
app/models/transaction.rb
View file

@ -13,7 +13,10 @@ class Transaction
if options[:interface_handle] if options[:interface_handle]
ApplicationHandleInfo.current = original_interface_handle ApplicationHandleInfo.current = original_interface_handle
end end
Observer::Transaction.commit(disable_notification: options[:disable_notification]) Observer::Transaction.commit(
disable_notification: options[:disable_notification],
disable: options[:disable],
)
PushMessages.finish PushMessages.finish
end end
end end

4
app/models/transaction/background_job.rb
View file

@ -24,7 +24,9 @@ class Transaction::BackgroundJob
def perform def perform
Setting.where(area: 'Transaction::Backend::Async').order(:name).each { |setting| Setting.where(area: 'Transaction::Backend::Async').order(:name).each { |setting|
backend = Kernel.const_get(Setting.get(setting.name)) backend = Setting.get(setting.name)
next if @params[:disable] && @params[:disable].include?(backend)
backend = Kernel.const_get(backend)
Observer::Transaction.execute_singel_backend(backend, @item, @params) Observer::Transaction.execute_singel_backend(backend, @item, @params)
} }
end end

150
app/models/transaction/trigger.rb
View file

@ -29,7 +29,7 @@ class Transaction::Trigger
return if @item[:object] != 'Ticket' return if @item[:object] != 'Ticket'
triggers = Trigger.where(active: true) triggers = Trigger.where(active: true).order('LOWER(name)')
return if triggers.empty? return if triggers.empty?
ticket = Ticket.lookup(id: @item[:object_id]) ticket = Ticket.lookup(id: @item[:object_id])
@ -39,86 +39,94 @@ class Transaction::Trigger
end end
original_user_id = UserInfo.current_user_id original_user_id = UserInfo.current_user_id
UserInfo.current_user_id = 1
triggers.each { |trigger| Transaction.execute(reset_user_id: true, disable: ['Transaction::Trigger']) do
condition = trigger.condition triggers.each { |trigger|
condition = trigger.condition
# check action # check action
if condition['ticket.action'] if condition['ticket.action']
next if condition['ticket.action']['operator'] == 'is' && condition['ticket.action']['value'] != @item[:type] next if condition['ticket.action']['operator'] == 'is' && condition['ticket.action']['value'] != @item[:type]
next if condition['ticket.action']['operator'] != 'is' && condition['ticket.action']['value'] == @item[:type] next if condition['ticket.action']['operator'] != 'is' && condition['ticket.action']['value'] == @item[:type]
condition.delete('ticket.action') condition.delete('ticket.action')
end
# check "has changed" options
has_changed_condition_exists = false
has_changed = false
condition.each do |key, value|
next if !value
next if !value['operator']
next if !value['operator']['has changed']
has_changed_condition_exists = true
# next if has changed? && !@item[:changes][attribute]
(object_name, attribute) = key.split('.', 2)
# remove condition item, because it has changed
if @item[:changes][attribute]
has_changed = true
condition.delete(key)
next
end end
break
end
next if has_changed_condition_exists && !has_changed # check action
if condition['article.action']
next if !article
condition.delete('article.action')
end
# check if selector is matching # check "has changed" options
condition['ticket.id'] = { has_changed_condition_exists = false
operator: 'is', has_changed = false
value: ticket.id, condition.each do |key, value|
} next if !value
if article next if !value['operator']
condition['article.id'] = { next if !value['operator']['has changed']
operator: 'is', has_changed_condition_exists = true
value: article.id,
}
end
ticket_count, tickets = Ticket.selectors(condition, 1) # next if has changed? && !@item[:changes][attribute]
next if ticket_count.zero? (object_name, attribute) = key.split('.', 2)
next if tickets.first.id != ticket.id
# check if min one article attribute is used # remove condition item, because it has changed
article_selector = false if @item[:changes][attribute]
trigger.condition.each do |key, _value| has_changed = true
(object_name, attribute) = key.split('.', 2) condition.delete(key)
next if object_name != 'article' next
next if attribute == 'id'
article_selector = true
end
# check in min one attribute has changed
if @item[:type] == 'update' && !article_selector
match = false
if has_changed_condition_exists && has_changed
match = true
else
trigger.condition.each do |key, _value|
(object_name, attribute) = key.split('.', 2)
next if object_name != 'ticket'
next if !@item[:changes][attribute]
match = true
break
end end
break
end end
next if !match
end next if has_changed_condition_exists && !has_changed
Transaction.execute do
# check if selector is matching
condition['ticket.id'] = {
operator: 'is',
value: ticket.id,
}
# check if min one article attribute is used
article_selector = false
trigger.condition.each do |key, _value|
(object_name, attribute) = key.split('.', 2)
next if object_name != 'article'
next if attribute == 'id'
article_selector = true
end
next if article_selector && !article
if article_selector
condition['article.id'] = {
operator: 'is',
value: article.id,
}
end
ticket_count, tickets = Ticket.selectors(condition, 1)
next if ticket_count.zero?
next if tickets.first.id != ticket.id
# check in min one attribute has changed
if @item[:type] == 'update' && !article_selector
match = false
if has_changed_condition_exists && has_changed
match = true
else
trigger.condition.each do |key, _value|
(object_name, attribute) = key.split('.', 2)
next if object_name != 'ticket'
next if !@item[:changes][attribute]
match = true
break
end
end
next if !match
end
ticket.perform_changes(trigger.perform, 'trigger', @item) ticket.perform_changes(trigger.perform, 'trigger', @item)
end }
} end
UserInfo.current_user_id = original_user_id UserInfo.current_user_id = original_user_id
end end

10
contrib/apache2/zammad.conf
View file

@ -4,7 +4,7 @@
<VirtualHost *:80> <VirtualHost *:80>
# replace 'localhost' with your fqdn if you want to use zammad from remote # replace 'localhost' with your fqdn if you want to use zammad from remote
ServerName localhost ServerName ubuntu.local
## don't loose time with IP address lookups ## don't loose time with IP address lookups
HostnameLookups Off HostnameLookups Off
@ -18,9 +18,8 @@
ProxyRequests Off ProxyRequests Off
ProxyPreserveHost On ProxyPreserveHost On
<Proxy *> <Proxy localhost:3000>
Order deny,allow Require local
Allow from localhost
</Proxy> </Proxy>
ProxyPass /assets ! ProxyPass /assets !
@ -38,8 +37,7 @@
<Directory "/opt/zammad/public"> <Directory "/opt/zammad/public">
Options FollowSymLinks Options FollowSymLinks
Order allow,deny Require all granted
Allow from all
</Directory> </Directory>
</VirtualHost> </VirtualHost>

2
db/migrate/20120101000001_create_base.rb
View file

@ -577,7 +577,7 @@ class CreateBase < ActiveRecord::Migration
t.string :key, limit: 250, null: true t.string :key, limit: 250, null: true
t.integer :related_o_id, null: true t.integer :related_o_id, null: true
t.integer :related_stats_store_object_id, null: true t.integer :related_stats_store_object_id, null: true
t.string :data, limit: 2500, null: true t.string :data, limit: 5000, null: true
t.integer :created_by_id, null: false t.integer :created_by_id, null: false
t.timestamps limit: 3, null: false t.timestamps limit: 3, null: false
end end

110
db/migrate/20120101000010_create_ticket.rb
View file

@ -186,18 +186,18 @@ class CreateTicket < ActiveRecord::Migration
add_index :ticket_counters, [:generator], unique: true add_index :ticket_counters, [:generator], unique: true
create_table :overviews do |t| create_table :overviews do |t|
t.references :role, null: false t.references :role, null: false
t.column :name, :string, limit: 250, null: false t.column :name, :string, limit: 250, null: false
t.column :link, :string, limit: 250, null: false t.column :link, :string, limit: 250, null: false
t.column :prio, :integer, null: false t.column :prio, :integer, null: false
t.column :condition, :string, limit: 2500, null: false t.column :condition, :text, limit: 500.kilobytes + 1, null: false
t.column :order, :string, limit: 2500, null: false t.column :order, :string, limit: 2500, null: false
t.column :group_by, :string, limit: 250, null: true t.column :group_by, :string, limit: 250, null: true
t.column :organization_shared, :boolean, null: false, default: false t.column :organization_shared, :boolean, null: false, default: false
t.column :view, :string, limit: 1000, null: false t.column :view, :string, limit: 1000, null: false
t.column :active, :boolean, null: false, default: true t.column :active, :boolean, null: false, default: true
t.column :updated_by_id, :integer, null: false t.column :updated_by_id, :integer, null: false
t.column :created_by_id, :integer, null: false t.column :created_by_id, :integer, null: false
t.timestamps limit: 3, null: false t.timestamps limit: 3, null: false
end end
add_index :overviews, [:name] add_index :overviews, [:name]
@ -217,34 +217,34 @@ class CreateTicket < ActiveRecord::Migration
add_index :overviews_groups, [:group_id] add_index :overviews_groups, [:group_id]
create_table :triggers do |t| create_table :triggers do |t|
t.column :name, :string, limit: 250, null: false t.column :name, :string, limit: 250, null: false
t.column :condition, :string, limit: 2500, null: false t.column :condition, :text, limit: 500.kilobytes + 1, null: false
t.column :perform, :string, limit: 2500, null: false t.column :perform, :text, limit: 500.kilobytes + 1, null: false
t.column :disable_notification, :boolean, null: false, default: true t.column :disable_notification, :boolean, null: false, default: true
t.column :note, :string, limit: 250, null: true t.column :note, :string, limit: 250, null: true
t.column :active, :boolean, null: false, default: true t.column :active, :boolean, null: false, default: true
t.column :updated_by_id, :integer, null: false t.column :updated_by_id, :integer, null: false
t.column :created_by_id, :integer, null: false t.column :created_by_id, :integer, null: false
t.timestamps limit: 3, null: false t.timestamps limit: 3, null: false
end end
add_index :triggers, [:name], unique: true add_index :triggers, [:name], unique: true
create_table :jobs do |t| create_table :jobs do |t|
t.column :name, :string, limit: 250, null: false t.column :name, :string, limit: 250, null: false
t.column :timeplan, :string, limit: 1000, null: false t.column :timeplan, :string, limit: 2500, null: false
t.column :condition, :string, limit: 2500, null: false t.column :condition, :text, limit: 500.kilobytes + 1, null: false
t.column :perform, :string, limit: 2500, null: false t.column :perform, :text, limit: 500.kilobytes + 1, null: false
t.column :disable_notification, :boolean, null: false, default: true t.column :disable_notification, :boolean, null: false, default: true
t.column :last_run_at, :timestamp, limit: 3, null: true t.column :last_run_at, :timestamp, limit: 3, null: true
t.column :next_run_at, :timestamp, limit: 3, null: true t.column :next_run_at, :timestamp, limit: 3, null: true
t.column :running, :boolean, null: false, default: false t.column :running, :boolean, null: false, default: false
t.column :processed, :integer, null: false, default: 0 t.column :processed, :integer, null: false, default: 0
t.column :matching, :integer, null: false t.column :matching, :integer, null: false
t.column :pid, :string, limit: 250, null: true t.column :pid, :string, limit: 250, null: true
t.column :note, :string, limit: 250, null: true t.column :note, :string, limit: 250, null: true
t.column :active, :boolean, null: false, default: false t.column :active, :boolean, null: false, default: false
t.column :updated_by_id, :integer, null: false t.column :updated_by_id, :integer, null: false
t.column :created_by_id, :integer, null: false t.column :created_by_id, :integer, null: false
t.timestamps limit: 3, null: false t.timestamps limit: 3, null: false
end end
add_index :jobs, [:name], unique: true add_index :jobs, [:name], unique: true
@ -285,14 +285,14 @@ class CreateTicket < ActiveRecord::Migration
add_index :links, [:link_object_source_id, :link_object_source_value, :link_object_target_id, :link_object_target_value, :link_type_id], unique: true, name: 'links_uniq_total' add_index :links, [:link_object_source_id, :link_object_source_value, :link_object_target_id, :link_object_target_value, :link_type_id], unique: true, name: 'links_uniq_total'
create_table :postmaster_filters do |t| create_table :postmaster_filters do |t|
t.column :name, :string, limit: 250, null: false t.column :name, :string, limit: 250, null: false
t.column :channel, :string, limit: 250, null: false t.column :channel, :string, limit: 250, null: false
t.column :match, :string, limit: 5000, null: false t.column :match, :text, limit: 500.kilobytes + 1, null: false
t.column :perform, :string, limit: 5000, null: false t.column :perform, :text, limit: 500.kilobytes + 1, null: false
t.column :active, :boolean, null: false, default: true t.column :active, :boolean, null: false, default: true
t.column :note, :string, limit: 250, null: true t.column :note, :string, limit: 250, null: true
t.column :updated_by_id, :integer, null: false t.column :updated_by_id, :integer, null: false
t.column :created_by_id, :integer, null: false t.column :created_by_id, :integer, null: false
t.timestamps limit: 3, null: false t.timestamps limit: 3, null: false
end end
add_index :postmaster_filters, [:channel] add_index :postmaster_filters, [:channel]
@ -359,7 +359,7 @@ class CreateTicket < ActiveRecord::Migration
t.column :first_response_time, :integer, null: true t.column :first_response_time, :integer, null: true
t.column :update_time, :integer, null: true t.column :update_time, :integer, null: true
t.column :solution_time, :integer, null: true t.column :solution_time, :integer, null: true
t.column :condition, :string, limit: 5000, null: true t.column :condition, :text, limit: 500.kilobytes + 1, null: true
t.column :updated_by_id, :integer, null: false t.column :updated_by_id, :integer, null: false
t.column :created_by_id, :integer, null: false t.column :created_by_id, :integer, null: false
t.timestamps limit: 3, null: false t.timestamps limit: 3, null: false
@ -367,12 +367,12 @@ class CreateTicket < ActiveRecord::Migration
add_index :slas, [:name], unique: true add_index :slas, [:name], unique: true
create_table :macros do |t| create_table :macros do |t|
t.string :name, limit: 250, null: true t.string :name, limit: 250, null: true
t.string :perform, limit: 5000, null: false t.text :perform, limit: 500.kilobytes + 1, null: false
t.boolean :active, null: false, default: true t.boolean :active, null: false, default: true
t.string :note, limit: 250, null: true t.string :note, limit: 250, null: true
t.integer :updated_by_id, null: false t.integer :updated_by_id, null: false
t.integer :created_by_id, null: false t.integer :created_by_id, null: false
t.timestamps limit: 3, null: false t.timestamps limit: 3, null: false
end end
add_index :macros, [:name], unique: true add_index :macros, [:name], unique: true
@ -436,11 +436,11 @@ class CreateTicket < ActiveRecord::Migration
add_index :chat_agents, [:created_by_id], unique: true add_index :chat_agents, [:created_by_id], unique: true
create_table :report_profiles do |t| create_table :report_profiles do |t|
t.column :name, :string, limit: 150, null: true t.column :name, :string, limit: 150, null: true
t.column :condition, :string, limit: 6000, null: true t.column :condition, :text, limit: 500.kilobytes + 1, null: true
t.column :active, :boolean, null: false, default: true t.column :active, :boolean, null: false, default: true
t.column :updated_by_id, :integer, null: false t.column :updated_by_id, :integer, null: false
t.column :created_by_id, :integer, null: false t.column :created_by_id, :integer, null: false
t.timestamps limit: 3, null: false t.timestamps limit: 3, null: false
end end
add_index :report_profiles, [:name], unique: true add_index :report_profiles, [:name], unique: true

44
db/migrate/20161117000001_job_unable_to_create_issue_432.rb Normal file
View file

@ -0,0 +1,44 @@
class JobUnableToCreateIssue432 < ActiveRecord::Migration
def up
# return if it's a new setup
return if !Setting.find_by(name: 'system_init_done')
ActiveRecord::Migration.change_table :jobs do |t|
t.change :timeplan, :string, limit: 2500
t.change :condition, :text, limit: 500.kilobytes + 1
t.change :perform, :text, limit: 500.kilobytes + 1
end
ActiveRecord::Migration.change_table :triggers do |t|
t.change :condition, :text, limit: 500.kilobytes + 1
t.change :perform, :text, limit: 500.kilobytes + 1
end
ActiveRecord::Migration.change_table :overviews do |t|
t.change :condition, :text, limit: 500.kilobytes + 1
end
ActiveRecord::Migration.change_table :report_profiles do |t|
t.change :condition, :text, limit: 500.kilobytes + 1
end
ActiveRecord::Migration.change_table :slas do |t|
t.change :condition, :text, limit: 500.kilobytes + 1
end
ActiveRecord::Migration.change_table :macros do |t|
t.change :perform, :text, limit: 500.kilobytes + 1
end
ActiveRecord::Migration.change_table :postmaster_filters do |t|
t.change :match, :text, limit: 500.kilobytes + 1
t.change :perform, :text, limit: 500.kilobytes + 1
end
ActiveRecord::Migration.change_table :stats_stores do |t|
t.change :data, :string, limit: 5000
end
Cache.clear
end
end

55
db/migrate/20161117000002_ticket_number_generator_issue_427.rb Normal file
View file

@ -0,0 +1,55 @@
class TicketNumberGeneratorIssue427 < ActiveRecord::Migration
def up
# return if it's a new setup
return if !Setting.find_by(name: 'system_init_done')
setting = Setting.find_by(name: 'ticket_number')
setting.preferences = {
settings_included: %w(ticket_number_increment ticket_number_date),
controller: 'SettingsAreaTicketNumber',
permission: ['admin.ticket'],
}
setting.save!
setting = Setting.find_by(name: 'ticket_number_increment')
setting.preferences = {
permission: ['admin.ticket'],
hidden: true,
}
setting.save!
setting = Setting.find_by(name: 'ticket_number_date')
setting.preferences = {
permission: ['admin.ticket'],
hidden: true,
}
# just to make sure that value is saved correctly - https://github.com/zammad/zammad/issues/413
if setting.state_current['value'] == true || setting.state_current['value'] == false
setting.state_current['value'] = { 'checksum' => setting.state_current['value'] }
end
setting.save!
setting = Setting.find_by(name: 'ticket_hook_position')
setting.preferences = {
controller: 'SettingsAreaTicketHookPosition',
permission: ['admin.ticket'],
}
setting.options = {
form: [
{
display: '',
null: true,
name: 'ticket_hook_position',
tag: 'select',
translate: true,
options: {
'left' => 'left',
'right' => 'right',
'none' => 'none',
},
},
],
}
setting.save!
end
end

30
db/migrate/20161117000003_store_config_name_update_issue_428.rb Normal file
View file

@ -0,0 +1,30 @@
class StoreConfigNameUpdateIssue428 < ActiveRecord::Migration
def up
# return if it's a new setup
return if !Setting.find_by(name: 'system_init_done')
setting = Setting.find_by(name: 'storage')
return if !Setting
setting.name = 'storage_provider'
setting.options = {
form: [
{
display: '',
null: true,
name: 'storage_provider',
tag: 'select',
tranlate: true,
options: {
'DB' => 'Database',
'File' => 'Filesystem',
},
},
],
}
setting.preferences = {
controller: 'SettingsAreaStorageProvider',
online_service_disable: true,
permission: ['admin.system'],
}
setting.save!
end
end

33
db/seeds.rb
View file

@ -259,7 +259,7 @@ Setting.create_if_not_exists(
Setting.create_if_not_exists( Setting.create_if_not_exists(
title: 'Storage Mechanism', title: 'Storage Mechanism',
name: 'storage', name: 'storage_provider',
area: 'System::Storage', area: 'System::Storage',
description: '"Database" stores all attachments in the database (not recommended for storing large amounts of data). "Filesystem" stores the data on the filesystem. You can switch between the modules even on a system that is already in production without any loss of data.', description: '"Database" stores all attachments in the database (not recommended for storing large amounts of data). "Filesystem" stores the data on the filesystem. You can switch between the modules even on a system that is already in production without any loss of data.',
options: { options: {
@ -267,17 +267,19 @@ Setting.create_if_not_exists(
{ {
display: '', display: '',
null: true, null: true,
name: 'storage', name: 'storage_provider',
tag: 'select', tag: 'select',
tranlate: true,
options: { options: {
'DB' => 'Database', 'DB' => 'Database',
'FS' => 'Filesystem', 'File' => 'Filesystem',
}, },
}, },
], ],
}, },
state: 'DB', state: 'DB',
preferences: { preferences: {
controller: 'SettingsAreaStorageProvider',
online_service_disable: true, online_service_disable: true,
permission: ['admin.system'], permission: ['admin.system'],
}, },
@ -1137,10 +1139,10 @@ Setting.create_if_not_exists(
title: 'Ticket Hook Position', title: 'Ticket Hook Position',
name: 'ticket_hook_position', name: 'ticket_hook_position',
area: 'Ticket::Base', area: 'Ticket::Base',
description: "@T('The format of the subject.') description: "The format of the subject.
* @T('**Right** means **Some Subject [Ticket#12345]**') * **Right** means **Some Subject [Ticket#12345]**
* @T('**Left** means **[Ticket#12345] Some Subject**') * **Left** means **[Ticket#12345] Some Subject**
* @T('**None** means **Some Subject** (without ticket number). In the last case you should enable *postmaster_follow_up_search_in* to recognize followups based on email headers and/or body.')", * **None** means **Some Subject** (without ticket number). In the last case you should enable *postmaster_follow_up_search_in* to recognize followups based on email headers and/or body.",
options: { options: {
form: [ form: [
{ {
@ -1148,6 +1150,7 @@ Setting.create_if_not_exists(
null: true, null: true,
name: 'ticket_hook_position', name: 'ticket_hook_position',
tag: 'select', tag: 'select',
translate: true,
options: { options: {
'left' => 'left', 'left' => 'left',
'right' => 'right', 'right' => 'right',
@ -1158,6 +1161,7 @@ Setting.create_if_not_exists(
}, },
state: 'right', state: 'right',
preferences: { preferences: {
controller: 'SettingsAreaTicketHookPosition',
permission: ['admin.ticket'], permission: ['admin.ticket'],
}, },
frontend: false frontend: false
@ -1166,11 +1170,9 @@ Setting.create_if_not_exists(
title: 'Ticket Number Format', title: 'Ticket Number Format',
name: 'ticket_number', name: 'ticket_number',
area: 'Ticket::Number', area: 'Ticket::Number',
description: "@T('Selects the ticket number generator module.') description: "Selects the ticket number generator module.
* @T('**Increment** increments the ticket number, the SystemID and the counter are used with SystemID.Counter format (e.g. 1010138, 1010139).') * **Increment** increments the ticket number, the SystemID and the counter are used with SystemID.Counter format (e.g. 1010138, 1010139).
* @T('With **Date** the ticket numbers will be generated by the current date, the SystemID and the counter. The format looks like Year.Month.Day.SystemID.counter (e.g. 201206231010138, 201206231010139).') * With **Date** the ticket numbers will be generated by the current date, the SystemID and the counter. The format looks like Year.Month.Day.SystemID.counter (e.g. 201206231010138, 201206231010139).",
@T('With param 'Checksum => true' the counter will be appended as checksum to the string. The format looks like SystemID.Counter.CheckSum (e. g. 10101384, 10101392) or Year.Month.Day.SystemID.Counter.CheckSum (e.g. 2012070110101520, 2012070110101535).')",
options: { options: {
form: [ form: [
{ {
@ -1178,6 +1180,7 @@ Setting.create_if_not_exists(
null: true, null: true,
name: 'ticket_number', name: 'ticket_number',
tag: 'select', tag: 'select',
translate: true,
options: { options: {
'Ticket::Number::Increment' => 'Increment (SystemID.Counter)', 'Ticket::Number::Increment' => 'Increment (SystemID.Counter)',
'Ticket::Number::Date' => 'Date (Year.Month.Day.SystemID.Counter)', 'Ticket::Number::Date' => 'Date (Year.Month.Day.SystemID.Counter)',
@ -1187,6 +1190,8 @@ Setting.create_if_not_exists(
}, },
state: 'Ticket::Number::Increment', state: 'Ticket::Number::Increment',
preferences: { preferences: {
settings_included: %w(ticket_number_increment ticket_number_date),
controller: 'SettingsAreaTicketNumber',
permission: ['admin.ticket'], permission: ['admin.ticket'],
}, },
frontend: false frontend: false
@ -1244,6 +1249,7 @@ Setting.create_if_not_exists(
}, },
preferences: { preferences: {
permission: ['admin.ticket'], permission: ['admin.ticket'],
hidden: true,
}, },
frontend: false frontend: false
) )
@ -1267,10 +1273,11 @@ Setting.create_if_not_exists(
], ],
}, },
state: { state: {
checksum: false, checksum: false
}, },
preferences: { preferences: {
permission: ['admin.ticket'], permission: ['admin.ticket'],
hidden: true,
}, },
frontend: false frontend: false
) )

31
lib/import/otrs.rb
View file

@ -632,13 +632,20 @@ module Import::OTRS
ticket_new.delete(:owner) ticket_new.delete(:owner)
end end
record['Articles'].each { |article|
# utf8 encode
_utf8_encode(article)
# lookup customers to create first
_article_based_customers(article)
}
# find customer # find customer
if ticket_new[:customer] if ticket_new[:customer]
user = User.lookup(login: ticket_new[:customer].downcase) user = User.lookup(login: ticket_new[:customer].downcase)
ticket_new[:customer_id] = if user ticket_new[:customer_id] = if user
user.id user.id
else else
1 _first_customer_id(record['Articles'])
end end
ticket_new.delete(:customer) ticket_new.delete(:customer)
else else
@ -664,16 +671,6 @@ module Import::OTRS
end end
end end
# utf8 encode
record['Articles'].each { |article|
_utf8_encode(article)
}
# lookup customers to create first
record['Articles'].each { |article|
_article_based_customers(article)
}
record['Articles'].each do |article| record['Articles'].each do |article|
retries = 3 retries = 3
@ -1598,4 +1595,16 @@ module Import::OTRS
%w(ProcessManagementProcessID ProcessManagementActivityID ZammadMigratorChanged ZammadMigratorChangedOld) %w(ProcessManagementProcessID ProcessManagementActivityID ZammadMigratorChanged ZammadMigratorChangedOld)
end end
def self._first_customer_id(articles)
user_id = 1
articles.each { |article|
next if article['sender'] != 'customer'
next if article['from'].empty?
user_id = article['created_by_id'].to_i
break
}
user_id
end
end end

43
lib/search_index_backend.rb
View file

@ -339,8 +339,6 @@ get count of tickets and tickets which match on selector
end end
def self.selector2query(selector, _current_user, aggs_interval, limit) def self.selector2query(selector, _current_user, aggs_interval, limit)
filter_must = []
filter_must_not = []
query_must = [] query_must = []
query_must_not = [] query_must_not = []
if selector && !selector.empty? if selector && !selector.empty?
@ -355,9 +353,9 @@ get count of tickets and tickets which match on selector
t[:term][key_tmp] = data['value'] t[:term][key_tmp] = data['value']
end end
if data['operator'] == 'is' if data['operator'] == 'is'
filter_must.push t query_must.push t
elsif data['operator'] == 'is not' elsif data['operator'] == 'is not'
filter_must_not.push t query_must_not.push t
elsif data['operator'] == 'contains' elsif data['operator'] == 'contains'
query_must.push t query_must.push t
elsif data['operator'] == 'contains not' elsif data['operator'] == 'contains not'
@ -391,43 +389,18 @@ get count of tickets and tickets which match on selector
from: aggs_interval[:from], from: aggs_interval[:from],
to: aggs_interval[:to], to: aggs_interval[:to],
} }
filter_must.push r query_must.push r
end end
if !query_must.empty? || !query_must_not.empty? if !data[:query][:bool]
if !data[:query][:filtered] data[:query][:bool] = {}
data[:query][:filtered] = {}
end
if !data[:query][:filtered][:query]
data[:query][:filtered][:query] = {}
end
if !data[:query][:filtered][:query][:bool]
data[:query][:filtered][:query][:bool] = {}
end
end end
if !query_must.empty? if !query_must.empty?
data[:query][:filtered][:query][:bool][:must] = query_must data[:query][:bool][:must] = query_must
end end
if !query_must_not.empty? if !query_must_not.empty?
data[:query][:filtered][:query][:bool][:must_not] = query_must_not data[:query][:bool][:must_not] = query_must_not
end
if !filter_must.empty? || !filter_must.empty?
if !data[:query][:filtered]
data[:query][:filtered] = {}
end
if !data[:query][:filtered][:filter]
data[:query][:filtered][:filter] = {}
end
if !data[:query][:filtered][:filter][:bool]
data[:query][:filtered][:filter][:bool] = {}
end
end
if !filter_must.empty?
data[:query][:filtered][:filter][:bool][:must] = filter_must
end
if !filter_must_not.empty?
data[:query][:filtered][:filter][:bool][:must_not] = filter_must_not
end end
# add sort # add sort

18
public/assets/tests/form.js
View file

@ -715,13 +715,14 @@ test("form postmaster filter", function() {
}, },
}, },
set: { set: {
'x-zammad-ticket-customer': { 'x-zammad-ticket-customer_id': {
value: 'customer' value: 'customer',
value_completion: ''
}, },
'x-zammad-ticket-group_id': { 'x-zammad-ticket-group_id': {
value: '1' value: '1'
}, },
'x-zammad-ticket-owner': { 'x-zammad-ticket-owner_id': {
value: 'owner', value: 'owner',
value_completion: '' value_completion: ''
}, },
@ -757,13 +758,14 @@ test("form postmaster filter", function() {
} }
}, },
set: { set: {
'x-zammad-ticket-customer': { 'x-zammad-ticket-customer_id': {
value: 'customer' value: 'customer',
value_completion: ''
}, },
'x-zammad-ticket-group_id': { 'x-zammad-ticket-group_id': {
value: '1' value: '1'
}, },
'x-zammad-ticket-owner': { 'x-zammad-ticket-owner_id': {
value: 'owner', value: 'owner',
value_completion: '' value_completion: ''
}, },
@ -774,7 +776,7 @@ test("form postmaster filter", function() {
}; };
deepEqual(params, test_params, 'form param check') deepEqual(params, test_params, 'form param check')
el.find('[name="set::x-zammad-ticket-priority_id::value"]').closest('.js-filterElement').find('.js-remove').click() el.find('[name="set::x-zammad-ticket-priority_id::value"]').closest('.js-filterElement').find('.js-remove').click()
el.find('[name="set::x-zammad-ticket-customer::value"]').closest('.js-filterElement').find('.js-remove').click() el.find('[name="set::x-zammad-ticket-customer_id::value"]').closest('.js-filterElement').find('.js-remove').click()
App.Delay.set(function() { App.Delay.set(function() {
test("form param check after remove click", function() { test("form param check after remove click", function() {
params = App.ControllerForm.params(el) params = App.ControllerForm.params(el)
@ -792,7 +794,7 @@ test("form postmaster filter", function() {
} }
}, },
set: { set: {
'x-zammad-ticket-owner': { 'x-zammad-ticket-owner_id': {
value: 'owner', value: 'owner',
value_completion: '' value_completion: ''
}, },

551
test/unit/ticket_overview_test.rb
View file

@ -8,6 +8,14 @@ class TicketOverviewTest < ActiveSupport::TestCase
customer1 = nil customer1 = nil
customer2 = nil customer2 = nil
customer3 = nil customer3 = nil
overview1 = nil
overview2 = nil
overview3 = nil
overview4 = nil
overview5 = nil
overview6 = nil
overview7 = nil
overview8 = nil
test 'aaa - setup' do test 'aaa - setup' do
# create base # create base
@ -93,7 +101,7 @@ class TicketOverviewTest < ActiveSupport::TestCase
Overview.destroy_all Overview.destroy_all
UserInfo.current_user_id = 1 UserInfo.current_user_id = 1
overview_role = Role.find_by(name: 'Agent') overview_role = Role.find_by(name: 'Agent')
Overview.create_or_update( overview1 = Overview.create_or_update(
name: 'My assigned Tickets', name: 'My assigned Tickets',
link: 'my_assigned', link: 'my_assigned',
prio: 1000, prio: 1000,
@ -120,7 +128,7 @@ class TicketOverviewTest < ActiveSupport::TestCase
}, },
) )
Overview.create_or_update( overview2 = Overview.create_or_update(
name: 'Unassigned & Open', name: 'Unassigned & Open',
link: 'all_unassigned', link: 'all_unassigned',
prio: 1010, prio: 1010,
@ -146,7 +154,7 @@ class TicketOverviewTest < ActiveSupport::TestCase
view_mode_default: 's', view_mode_default: 's',
}, },
) )
Overview.create_or_update( overview3 = Overview.create_or_update(
name: 'My Tickets 2', name: 'My Tickets 2',
link: 'my_tickets_2', link: 'my_tickets_2',
prio: 1020, prio: 1020,
@ -173,9 +181,36 @@ class TicketOverviewTest < ActiveSupport::TestCase
view_mode_default: 's', view_mode_default: 's',
}, },
) )
overview4 = Overview.create_or_update(
name: 'My Tickets only with Note',
link: 'my_tickets_onyl_with_note',
prio: 1030,
role_id: overview_role.id,
user_ids: [agent1.id],
condition: {
'article.type_id' => {
operator: 'is',
value: Ticket::Article::Type.find_by(name: 'note').id,
},
'ticket.owner_id' => {
operator: 'is',
pre_condition: 'current_user.id',
},
},
order: {
by: 'created_at',
direction: 'ASC',
},
view: {
d: %w(title customer group created_at),
s: %w(title customer group created_at),
m: %w(number title customer group created_at),
view_mode_default: 's',
},
)
overview_role = Role.find_by(name: 'Customer') overview_role = Role.find_by(name: 'Customer')
Overview.create_or_update( overview5 = Overview.create_or_update(
name: 'My Tickets', name: 'My Tickets',
link: 'my_tickets', link: 'my_tickets',
prio: 1100, prio: 1100,
@ -201,7 +236,7 @@ class TicketOverviewTest < ActiveSupport::TestCase
view_mode_default: 's', view_mode_default: 's',
}, },
) )
Overview.create_or_update( overview6 = Overview.create_or_update(
name: 'My Organization Tickets', name: 'My Organization Tickets',
link: 'my_organization_tickets', link: 'my_organization_tickets',
prio: 1200, prio: 1200,
@ -228,7 +263,7 @@ class TicketOverviewTest < ActiveSupport::TestCase
view_mode_default: 's', view_mode_default: 's',
}, },
) )
Overview.create_or_update( overview7 = Overview.create_or_update(
name: 'My Organization Tickets (open)', name: 'My Organization Tickets (open)',
link: 'my_organization_tickets_open', link: 'my_organization_tickets_open',
prio: 1200, prio: 1200,
@ -258,7 +293,7 @@ class TicketOverviewTest < ActiveSupport::TestCase
) )
overview_role = Role.find_by(name: 'Admin') overview_role = Role.find_by(name: 'Admin')
Overview.create_or_update( overview8 = Overview.create_or_update(
name: 'Not Shown Admin', name: 'Not Shown Admin',
link: 'not_shown_admin', link: 'not_shown_admin',
prio: 9900, prio: 9900,
@ -282,14 +317,15 @@ class TicketOverviewTest < ActiveSupport::TestCase
) )
end end
test 'ticket create' do test 'bbb overiview index' do
result = Ticket::Overviews.all( result = Ticket::Overviews.all(
current_user: agent1, current_user: agent1,
) )
assert_equal(2, result.count) assert_equal(3, result.count)
assert_equal('My assigned Tickets', result[0].name) assert_equal('My assigned Tickets', result[0].name)
assert_equal('Unassigned & Open', result[1].name) assert_equal('Unassigned & Open', result[1].name)
assert_equal('My Tickets only with Note', result[2].name)
result = Ticket::Overviews.all( result = Ticket::Overviews.all(
current_user: agent2, current_user: agent2,
@ -322,4 +358,501 @@ class TicketOverviewTest < ActiveSupport::TestCase
end end
test 'ccc overiview content' do
Ticket.destroy_all
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
assert_equal(result[2][:count], 0)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
ticket1 = Ticket.create(
title: 'overview test 1',
group: Group.lookup(name: 'OverviewTest'),
customer_id: 2,
state: Ticket::State.lookup(name: 'new'),
priority: Ticket::Priority.lookup(name: '2 normal'),
updated_by_id: 1,
created_by_id: 1,
)
article1 = Ticket::Article.create(
ticket_id: ticket1.id,
from: 'some_sender@example.com',
to: 'some_recipient@example.com',
subject: 'some subject',
message_id: 'some@id',
body: 'some message... 123',
internal: false,
sender: Ticket::Article::Sender.find_by(name: 'Customer'),
type: Ticket::Article::Type.find_by(name: 'email'),
updated_by_id: 1,
created_by_id: 1,
)
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert_not(result[1][:tickets].empty?)
assert_equal(result[1][:tickets][0][:id], ticket1.id)
assert_equal(result[1][:count], 1)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
assert_equal(result[2][:count], 0)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
ticket2 = Ticket.create(
title: 'overview test 2',
group: Group.lookup(name: 'OverviewTest'),
customer_id: 2,
state: Ticket::State.lookup(name: 'new'),
priority: Ticket::Priority.lookup(name: '3 high'),
updated_by_id: 1,
created_by_id: 1,
)
article2 = Ticket::Article.create(
ticket_id: ticket2.id,
from: 'some_sender@example.com',
to: 'some_recipient@example.com',
subject: 'some subject',
message_id: 'some@id',
body: 'some message... 123',
internal: false,
sender: Ticket::Article::Sender.find_by(name: 'Agent'),
type: Ticket::Article::Type.find_by(name: 'note'),
updated_by_id: 1,
created_by_id: 1,
)
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert_not(result[1][:tickets].empty?)
assert_equal(result[1][:tickets][0][:id], ticket1.id)
assert_equal(result[1][:tickets][1][:id], ticket2.id)
assert_equal(result[1][:count], 2)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
assert_equal(result[2][:count], 0)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
ticket2.owner_id = agent1.id
ticket2.save!
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[0][:tickets][0][:id], ticket2.id)
assert_equal(result[0][:count], 1)
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert_not(result[1][:tickets].empty?)
assert_equal(result[1][:tickets][0][:id], ticket1.id)
assert_equal(result[1][:count], 1)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert_equal(result[2][:tickets][0][:id], ticket2.id)
assert_equal(result[2][:count], 1)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
ticket3 = Ticket.create(
title: 'overview test 3',
group: Group.lookup(name: 'OverviewTest'),
customer_id: 2,
state: Ticket::State.lookup(name: 'new'),
priority: Ticket::Priority.lookup(name: '1 low'),
updated_by_id: 1,
created_by_id: 1,
)
article3 = Ticket::Article.create(
ticket_id: ticket3.id,
from: 'some_sender@example.com',
to: 'some_recipient@example.com',
subject: 'some subject',
message_id: 'some@id',
body: 'some message... 123',
internal: false,
sender: Ticket::Article::Sender.find_by(name: 'Customer'),
type: Ticket::Article::Type.find_by(name: 'email'),
updated_by_id: 1,
created_by_id: 1,
)
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[0][:tickets][0][:id], ticket2.id)
assert_equal(result[0][:count], 1)
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert_not(result[1][:tickets].empty?)
assert_equal(result[1][:tickets][0][:id], ticket1.id)
assert_equal(result[1][:tickets][1][:id], ticket3.id)
assert_equal(result[1][:count], 2)
assert_equal(result[2][:overview][:id], overview4.id)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert_equal(result[2][:tickets][0][:id], ticket2.id)
assert_equal(result[2][:count], 1)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:id], overview3.id)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
overview2.order = {
by: 'created_at',
direction: 'DESC',
}
overview2.save!
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[0][:tickets][0][:id], ticket2.id)
assert_equal(result[0][:count], 1)
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert_not(result[1][:tickets].empty?)
assert_equal(result[1][:tickets][0][:id], ticket3.id)
assert_equal(result[1][:tickets][1][:id], ticket1.id)
assert_equal(result[1][:count], 2)
assert_equal(result[2][:overview][:id], overview4.id)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert_equal(result[2][:tickets][0][:id], ticket2.id)
assert_equal(result[2][:count], 1)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:id], overview3.id)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
overview2.order = {
by: 'priority_id',
direction: 'DESC',
}
overview2.save!
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[0][:tickets][0][:id], ticket2.id)
assert_equal(result[0][:count], 1)
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert_not(result[1][:tickets].empty?)
assert_equal(result[1][:tickets][0][:id], ticket1.id)
assert_equal(result[1][:tickets][1][:id], ticket3.id)
assert_equal(result[1][:count], 2)
assert_equal(result[2][:overview][:id], overview4.id)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert_equal(result[2][:tickets][0][:id], ticket2.id)
assert_equal(result[2][:count], 1)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:id], overview3.id)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
overview2.order = {
by: 'priority_id',
direction: 'ASC',
}
overview2.save!
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[0][:tickets][0][:id], ticket2.id)
assert_equal(result[0][:count], 1)
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert_not(result[1][:tickets].empty?)
assert_equal(result[1][:tickets][0][:id], ticket3.id)
assert_equal(result[1][:tickets][1][:id], ticket1.id)
assert_equal(result[1][:count], 2)
assert_equal(result[2][:overview][:id], overview4.id)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert_equal(result[2][:tickets][0][:id], ticket2.id)
assert_equal(result[2][:count], 1)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:id], overview3.id)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
overview2.order = {
by: 'priority',
direction: 'DESC',
}
overview2.save!
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[0][:tickets][0][:id], ticket2.id)
assert_equal(result[0][:count], 1)
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert_not(result[1][:tickets].empty?)
assert_equal(result[1][:tickets][0][:id], ticket1.id)
assert_equal(result[1][:tickets][1][:id], ticket3.id)
assert_equal(result[1][:count], 2)
assert_equal(result[2][:overview][:id], overview4.id)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert_equal(result[2][:tickets][0][:id], ticket2.id)
assert_equal(result[2][:count], 1)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:id], overview3.id)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
overview2.order = {
by: 'priority',
direction: 'ASC',
}
overview2.save!
result = Ticket::Overviews.index(agent1)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[0][:tickets][0][:id], ticket2.id)
assert_equal(result[0][:count], 1)
assert_equal(result[0][:tickets].class, Array)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert_not(result[1][:tickets].empty?)
assert_equal(result[1][:tickets][0][:id], ticket3.id)
assert_equal(result[1][:tickets][1][:id], ticket1.id)
assert_equal(result[1][:count], 2)
assert_equal(result[2][:overview][:id], overview4.id)
assert_equal(result[2][:overview][:name], 'My Tickets only with Note')
assert_equal(result[2][:overview][:view], 'my_tickets_onyl_with_note')
assert_equal(result[2][:tickets].class, Array)
assert_equal(result[2][:tickets][0][:id], ticket2.id)
assert_equal(result[2][:count], 1)
result = Ticket::Overviews.index(agent2)
assert_equal(result[0][:overview][:id], overview1.id)
assert_equal(result[0][:overview][:name], 'My assigned Tickets')
assert_equal(result[0][:overview][:view], 'my_assigned')
assert_equal(result[0][:count], 0)
assert_equal(result[0][:tickets].class, Array)
assert(result[0][:tickets].empty?)
assert_equal(result[1][:overview][:id], overview2.id)
assert_equal(result[1][:overview][:name], 'Unassigned & Open')
assert_equal(result[1][:overview][:view], 'all_unassigned')
assert_equal(result[1][:tickets].class, Array)
assert(result[1][:tickets].empty?)
assert_equal(result[1][:count], 0)
assert_equal(result[2][:overview][:id], overview3.id)
assert_equal(result[2][:overview][:name], 'My Tickets 2')
assert_equal(result[2][:overview][:view], 'my_tickets_2')
assert_equal(result[2][:tickets].class, Array)
assert(result[2][:tickets].empty?)
end
end end

183
test/unit/ticket_trigger_test.rb
View file

@ -4,8 +4,37 @@ require 'test_helper'
class TicketTriggerTest < ActiveSupport::TestCase class TicketTriggerTest < ActiveSupport::TestCase
test '1 basic' do test '1 basic' do
trigger1 = Trigger.create_or_update( trigger1 = Trigger.create_or_update(
name: 'aaa loop check',
condition: {
'article.subject' => {
'operator' => 'contains',
'value' => 'Thanks for your inquiry',
},
},
perform: {
'ticket.tags' => {
'operator' => 'add',
'value' => 'should_not_loop',
},
'notification.email' => {
'body' => 'some lala',
'recipient' => 'ticket_customer',
'subject' => 'Thanks for your inquiry - loop check (#{ticket.title})!',
},
},
disable_notification: true,
active: true,
created_by_id: 1,
updated_by_id: 1,
)
trigger2 = Trigger.create_or_update(
name: 'auto reply', name: 'auto reply',
condition: { condition: {
'ticket.action' => {
'operator' => 'is',
'value' => 'create',
},
'ticket.state_id' => { 'ticket.state_id' => {
'operator' => 'is', 'operator' => 'is',
'value' => Ticket::State.lookup(name: 'new').id.to_s, 'value' => Ticket::State.lookup(name: 'new').id.to_s,
@ -31,7 +60,54 @@ class TicketTriggerTest < ActiveSupport::TestCase
updated_by_id: 1, updated_by_id: 1,
) )
trigger2 = Trigger.create_or_update( trigger3 = Trigger.create_or_update(
name: 'auto tag 1',
condition: {
'ticket.action' => {
'operator' => 'is',
'value' => 'update',
},
'ticket.state_id' => {
'operator' => 'is',
'value' => Ticket::State.lookup(name: 'new').id.to_s,
}
},
perform: {
'ticket.priority_id' => {
'value' => Ticket::Priority.lookup(name: '3 high').id.to_s,
},
'ticket.tags' => {
'operator' => 'remove',
'value' => 'kk',
},
},
disable_notification: true,
active: true,
created_by_id: 1,
updated_by_id: 1,
)
trigger4 = Trigger.create_or_update(
name: 'auto tag 2',
condition: {
'ticket.state_id' => {
'operator' => 'is',
'value' => Ticket::State.lookup(name: 'new').id.to_s,
}
},
perform: {
'ticket.tags' => {
'operator' => 'add',
'value' => 'abc',
},
},
disable_notification: true,
active: true,
created_by_id: 1,
updated_by_id: 1,
)
trigger5 = Trigger.create_or_update(
name: 'not matching', name: 'not matching',
condition: { condition: {
'ticket.state_id' => { 'ticket.state_id' => {
@ -50,6 +126,31 @@ class TicketTriggerTest < ActiveSupport::TestCase
updated_by_id: 1, updated_by_id: 1,
) )
trigger6 = Trigger.create_or_update(
name: 'zzz last',
condition: {
'article.subject' => {
'operator' => 'contains',
'value' => 'some subject 1234',
},
},
perform: {
'ticket.tags' => {
'operator' => 'add',
'value' => 'article_create_trigger',
},
'notification.email' => {
'body' => 'some lala',
'recipient' => 'ticket_customer',
'subject' => 'Thanks for your inquiry - 1234 check (#{ticket.title})!',
},
},
disable_notification: true,
active: true,
created_by_id: 1,
updated_by_id: 1,
)
ticket1 = Ticket.create( ticket1 = Ticket.create(
title: "some <b>title</b>\n äöüß", title: "some <b>title</b>\n äöüß",
group: Group.lookup(name: 'Users'), group: Group.lookup(name: 'Users'),
@ -89,7 +190,7 @@ class TicketTriggerTest < ActiveSupport::TestCase
assert_equal('new', ticket1.state.name, 'ticket1.state verify') assert_equal('new', ticket1.state.name, 'ticket1.state verify')
assert_equal('3 high', ticket1.priority.name, 'ticket1.priority verify') assert_equal('3 high', ticket1.priority.name, 'ticket1.priority verify')
assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify')
assert_equal(%w(aa kk), Tag.tag_list(object: 'Ticket', o_id: ticket1.id)) assert_equal(%w(aa kk abc), Tag.tag_list(object: 'Ticket', o_id: ticket1.id))
article1 = ticket1.articles.last article1 = ticket1.articles.last
assert_match('Zammad <zammad@localhost>', article1.from) assert_match('Zammad <zammad@localhost>', article1.from)
assert_match('nicole.braun@zammad.org', article1.to) assert_match('nicole.braun@zammad.org', article1.to)
@ -108,7 +209,7 @@ class TicketTriggerTest < ActiveSupport::TestCase
assert_equal('new', ticket1.state.name, 'ticket1.state verify') assert_equal('new', ticket1.state.name, 'ticket1.state verify')
assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify')
assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify')
assert_equal(%w(aa kk), Tag.tag_list(object: 'Ticket', o_id: ticket1.id)) assert_equal(%w(aa kk abc), Tag.tag_list(object: 'Ticket', o_id: ticket1.id))
ticket1.state = Ticket::State.lookup(name: 'open') ticket1.state = Ticket::State.lookup(name: 'open')
ticket1.save ticket1.save
@ -120,7 +221,7 @@ class TicketTriggerTest < ActiveSupport::TestCase
assert_equal('open', ticket1.state.name, 'ticket1.state verify') assert_equal('open', ticket1.state.name, 'ticket1.state verify')
assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify') assert_equal('2 normal', ticket1.priority.name, 'ticket1.priority verify')
assert_equal(2, ticket1.articles.count, 'ticket1.articles verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify')
assert_equal(%w(aa kk), Tag.tag_list(object: 'Ticket', o_id: ticket1.id)) assert_equal(%w(aa kk abc), Tag.tag_list(object: 'Ticket', o_id: ticket1.id))
ticket1.state = Ticket::State.lookup(name: 'new') ticket1.state = Ticket::State.lookup(name: 'new')
ticket1.save ticket1.save
@ -132,14 +233,8 @@ class TicketTriggerTest < ActiveSupport::TestCase
assert_equal('Users', ticket1.group.name, 'ticket1.group verify') assert_equal('Users', ticket1.group.name, 'ticket1.group verify')
assert_equal('new', ticket1.state.name, 'ticket1.state verify') assert_equal('new', ticket1.state.name, 'ticket1.state verify')
assert_equal('3 high', ticket1.priority.name, 'ticket1.priority verify') assert_equal('3 high', ticket1.priority.name, 'ticket1.priority verify')
assert_equal(3, ticket1.articles.count, 'ticket1.articles verify') assert_equal(2, ticket1.articles.count, 'ticket1.articles verify')
assert_equal(%w(aa kk), Tag.tag_list(object: 'Ticket', o_id: ticket1.id)) assert_equal(%w(aa abc), Tag.tag_list(object: 'Ticket', o_id: ticket1.id))
article1 = ticket1.articles.last
assert_match('Zammad <zammad@localhost>', article1.from)
assert_match('nicole.braun@zammad.org', article1.to)
assert_match('Thanks for your inquiry (some <b>title</b> äöüß)!', article1.subject)
assert_match('Braun<br>some &lt;b&gt;title&lt;/b&gt;', article1.body)
assert_equal('text/html', article1.content_type)
ticket2 = Ticket.create( ticket2 = Ticket.create(
title: "some title\n äöüß", title: "some title\n äöüß",
@ -179,11 +274,12 @@ class TicketTriggerTest < ActiveSupport::TestCase
created_by_id: 1, created_by_id: 1,
) )
assert(ticket3, 'ticket3 created') assert(ticket3, 'ticket3 created')
Ticket::Article.create( Ticket::Article.create(
ticket_id: ticket3.id, ticket_id: ticket3.id,
from: 'some_sender@example.com', from: 'some_sender@example.com',
to: 'some_recipient@example.com', to: 'some_recipient@example.com',
subject: 'some subject', subject: 'some subject 1234',
message_id: 'some@id', message_id: 'some@id',
content_type: 'text/html', content_type: 'text/html',
body: 'some message <b>note</b><br>new line', body: 'some message <b>note</b><br>new line',
@ -208,9 +304,9 @@ class TicketTriggerTest < ActiveSupport::TestCase
assert_equal('Users', ticket3.group.name, 'ticket3.group verify') assert_equal('Users', ticket3.group.name, 'ticket3.group verify')
assert_equal('new', ticket3.state.name, 'ticket3.state verify') assert_equal('new', ticket3.state.name, 'ticket3.state verify')
assert_equal('3 high', ticket3.priority.name, 'ticket3.priority verify') assert_equal('3 high', ticket3.priority.name, 'ticket3.priority verify')
assert_equal(2, ticket3.articles.count, 'ticket3.articles verify') assert_equal(3, ticket3.articles.count, 'ticket3.articles verify')
assert_equal(%w(aa kk), Tag.tag_list(object: 'Ticket', o_id: ticket3.id)) assert_equal(%w(aa kk abc article_create_trigger), Tag.tag_list(object: 'Ticket', o_id: ticket3.id))
article3 = ticket3.articles.last article3 = ticket3.articles[1]
assert_match('Zammad <zammad@localhost>', article3.from) assert_match('Zammad <zammad@localhost>', article3.from)
assert_match('nicole.braun@zammad.org', article3.to) assert_match('nicole.braun@zammad.org', article3.to)
assert_match('Thanks for your inquiry (some <b>title</b> äöüß3)!', article3.subject) assert_match('Thanks for your inquiry (some <b>title</b> äöüß3)!', article3.subject)
@ -218,6 +314,61 @@ class TicketTriggerTest < ActiveSupport::TestCase
assert_match('&gt; some message note<br>&gt; new line', article3.body) assert_match('&gt; some message note<br>&gt; new line', article3.body)
assert_no_match('&gt; some message &lt;b&gt;note&lt;/b&gt;<br>&gt; new line', article3.body) assert_no_match('&gt; some message &lt;b&gt;note&lt;/b&gt;<br>&gt; new line', article3.body)
assert_equal('text/html', article3.content_type) assert_equal('text/html', article3.content_type)
article3 = ticket3.articles[2]
assert_match('Zammad <zammad@localhost>', article3.from)
assert_match('nicole.braun@zammad.org', article3.to)
assert_match('Thanks for your inquiry - 1234 check (some <b>title</b> äöüß3)!', article3.subject)
assert_equal('text/html', article3.content_type)
Ticket::Article.create(
ticket_id: ticket3.id,
from: 'some_sender@example.com',
to: 'some_recipient@example.com',
subject: 'some subject - not 1234',
message_id: 'some@id',
content_type: 'text/html',
body: 'some message <b>note</b><br>new line',
internal: false,
sender: Ticket::Article::Sender.find_by(name: 'Agent'),
type: Ticket::Article::Type.find_by(name: 'note'),
updated_by_id: 1,
created_by_id: 1,
)
Observer::Transaction.commit
ticket3 = Ticket.lookup(id: ticket3.id)
assert_equal('some <b>title</b> äöüß3', ticket3.title, 'ticket3.title verify')
assert_equal('Users', ticket3.group.name, 'ticket3.group verify')
assert_equal('new', ticket3.state.name, 'ticket3.state verify')
assert_equal('3 high', ticket3.priority.name, 'ticket3.priority verify')
assert_equal(4, ticket3.articles.count, 'ticket3.articles verify')
assert_equal(%w(aa kk abc article_create_trigger), Tag.tag_list(object: 'Ticket', o_id: ticket3.id))
Ticket::Article.create(
ticket_id: ticket3.id,
from: 'some_sender@example.com',
to: 'some_recipient@example.com',
subject: 'some subject 1234',
message_id: 'some@id',
content_type: 'text/html',
body: 'some message <b>note</b><br>new line',
internal: false,
sender: Ticket::Article::Sender.find_by(name: 'Agent'),
type: Ticket::Article::Type.find_by(name: 'note'),
updated_by_id: 1,
created_by_id: 1,
)
Observer::Transaction.commit
ticket3 = Ticket.lookup(id: ticket3.id)
assert_equal('some <b>title</b> äöüß3', ticket3.title, 'ticket3.title verify')
assert_equal('Users', ticket3.group.name, 'ticket3.group verify')
assert_equal('new', ticket3.state.name, 'ticket3.state verify')
assert_equal('3 high', ticket3.priority.name, 'ticket3.priority verify')
assert_equal(5, ticket3.articles.count, 'ticket3.articles verify')
assert_equal(%w(aa kk abc article_create_trigger), Tag.tag_list(object: 'Ticket', o_id: ticket3.id))
Trigger.destroy_all Trigger.destroy_all
end end