From f0ac8d47f4cc7233f66374fe04977b45a6216bc0 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 3 May 2016 08:19:44 +0200 Subject: [PATCH] Fixed sla overview. --- .../app/controllers/_ui_element/ticket_selector.coffee | 6 +++--- test/unit/ticket_trigger_test.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee index 18a0e6f2e..08c447960 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee @@ -1,6 +1,6 @@ # coffeelint: disable=camel_case_classes class App.UiElement.ticket_selector - @defaults: (attribute) -> + @defaults: (attribute = {}) -> defaults = ['ticket.state_id'] groups = @@ -38,8 +38,8 @@ class App.UiElement.ticket_selector tag: 'select' null: false options: - create: 'created' - update: 'updated' + create: 'Created' + update: 'Updated' operator: ['is', 'is not'] for groupKey, groupMeta of groups diff --git a/test/unit/ticket_trigger_test.rb b/test/unit/ticket_trigger_test.rb index c1e0209eb..cb55bc8ec 100644 --- a/test/unit/ticket_trigger_test.rb +++ b/test/unit/ticket_trigger_test.rb @@ -15,7 +15,7 @@ class TicketTriggerTest < ActiveSupport::TestCase 'notification.email' => { 'body' => 'some text
#{ticket.customer.lastname}
#{ticket.title}', 'recipient' => 'ticket_customer', - 'subject' => 'Thanks for your inquery (#{ticket.title})!', + 'subject' => 'Thanks for your inquiry (#{ticket.title})!', }, 'ticket.priority_id' => { '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(%w(aa kk), Tag.tag_list(object: 'Ticket', o_id: ticket1.id)) article1 = ticket1.articles.last - assert_match('Thanks for your inquery (some title äöüß)!', article1.subject) + assert_match('Thanks for your inquiry (some title äöüß)!', article1.subject) assert_match('Braun
some <b>title</b>', article1.body) assert_equal('text/html', article1.content_type)