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

Fixed sla overview.

Browse source
This commit is contained in:
Martin Edenhofer 2016-05-03 08:19:44 +02:00
parent 778c1cdfc1
commit f0ac8d47f4
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee
View file

@ -1,6 +1,6 @@
# coffeelint: disable=camel_case_classes # coffeelint: disable=camel_case_classes
class App.UiElement.ticket_selector class App.UiElement.ticket_selector
@defaults: (attribute) -> @defaults: (attribute = {}) ->
defaults = ['ticket.state_id'] defaults = ['ticket.state_id']
groups = groups =
@ -38,8 +38,8 @@ class App.UiElement.ticket_selector
tag: 'select' tag: 'select'
null: false null: false
options: options:
create: 'created' create: 'Created'
update: 'updated' update: 'Updated'
operator: ['is', 'is not'] operator: ['is', 'is not']
for groupKey, groupMeta of groups for groupKey, groupMeta of groups

4
test/unit/ticket_trigger_test.rb
View file

@ -15,7 +15,7 @@ class TicketTriggerTest < ActiveSupport::TestCase
'notification.email' => { 'notification.email' => {
'body' => 'some text<br>#{ticket.customer.lastname}<br>#{ticket.title}', 'body' => 'some text<br>#{ticket.customer.lastname}<br>#{ticket.title}',
'recipient' => 'ticket_customer', 'recipient' => 'ticket_customer',
'subject' => 'Thanks for your inquery (#{ticket.title})!', 'subject' => 'Thanks for your inquiry (#{ticket.title})!',
}, },
'ticket.priority_id' => { 'ticket.priority_id' => {
'value' => Ticket::Priority.lookup(name: '3 high').id.to_s, 'value' => Ticket::Priority.lookup(name: '3 high').id.to_s,
@ -78,7 +78,7 @@ class TicketTriggerTest < ActiveSupport::TestCase
assert_equal(1, ticket1.articles.count, 'ticket1.articles verify') assert_equal(1, 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), Tag.tag_list(object: 'Ticket', o_id: ticket1.id))
article1 = ticket1.articles.last article1 = ticket1.articles.last
assert_match('Thanks for your inquery (some <b>title</b> äöüß)!', article1.subject) 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_match('Braun<br>some &lt;b&gt;title&lt;/b&gt;', article1.body)
assert_equal('text/html', article1.content_type) assert_equal('text/html', article1.content_type)