Hallo #{recipient.firstname.text2html},
@@ -309,7 +309,7 @@ Ticket (#{ticket.title.text2html}) wurde von "#{ticket.updated_by.fullname.te
'
else
- subject = 'Updated Ticket (#{ticket.title.text2html})'
+ subject = 'Updated Ticket (#{ticket.title})'
body = 'Hi #{recipient.firstname.text2html},
diff --git a/app/models/ticket/screen_options.rb b/app/models/ticket/screen_options.rb
index fb435ebab..008cf8289 100644
--- a/app/models/ticket/screen_options.rb
+++ b/app/models/ticket/screen_options.rb
@@ -32,12 +32,12 @@ list attributes
returns
result = {
- :type_id => type_ids,
- :state_id => state_ids,
- :priority_id => priority_ids,
- :owner_id => owner_ids,
- :group_id => group_ids,
- :group_id__owner_id => groups_users,
+ :type_id => type_ids,
+ :state_id => state_ids,
+ :priority_id => priority_ids,
+ :owner_id => owner_ids,
+ :group_id => group_ids,
+ :group_id__owner_id => groups_users,
}
=end
@@ -103,7 +103,7 @@ returns
agents[ user.id ] = 1
}
- dependencies = { :group_id => { '' => [] } }
+ dependencies = { :group_id => { '' => { :owner_id => [] } } }
Group.where( :active => true ).each { |group|
assets = group.assets(assets)
dependencies[:group_id][group.id] = { :owner_id => [] }
@@ -115,9 +115,9 @@ returns
}
return {
- :assets => assets,
- :filter => filter,
- :dependencies => dependencies,
+ :assets => assets,
+ :filter => filter,
+ :dependencies => dependencies,
}
end
@@ -126,8 +126,8 @@ returns
list tickets by customer groupd in state categroie open and closed
result = Ticket::ScreenOptions.list_by_customer(
- :customer_id => 123,
- :limit => 15, # optional, default 15
+ :customer_id => 123,
+ :limit => 15, # optional, default 15
)
returns
@@ -147,13 +147,13 @@ returns
# get tickets
tickets_open = Ticket.where(
- :customer_id => data[:customer_id],
- :state_id => state_list_open
+ :customer_id => data[:customer_id],
+ :state_id => state_list_open
).limit( data[:limit] || 15 ).order('created_at DESC')
tickets_closed = Ticket.where(
- :customer_id => data[:customer_id],
- :state_id => state_list_closed
+ :customer_id => data[:customer_id],
+ :state_id => state_list_closed
).limit( data[:limit] || 15 ).order('created_at DESC')
return {
@@ -162,4 +162,4 @@ returns
}
end
-end
+end
\ No newline at end of file
diff --git a/public/assets/images/sprite.svg b/public/assets/images/sprite.svg
index dae98acea..1afd254df 100644
--- a/public/assets/images/sprite.svg
+++ b/public/assets/images/sprite.svg
@@ -1,26 +1,46 @@
-
+
- Slice 2
+ Slice 1
Created with Sketch.
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
',
+ :body => 'Unit Test 123',
+ :internal => false
+ },
+ },
+ :update => {
+ :ticket => {
+ :title => 'Unit Test 1 (äöüß) - update!',
+ :state_id => Ticket::State.lookup( :name => 'open' ).id,
+ :priority_id => Ticket::Priority.lookup( :name => '1 low' ).id,
+ :updated_by_id => customer_user.id,
+ },
+ },
+ :check => [
+ {
+ :type => 'create',
+ :object => 'Ticket',
+ :created_by_id => agent_user1.id,
+ },
+ {
+ :type => 'update',
+ :object => 'Ticket',
+ :created_by_id => customer_user.id,
+ },
+ ]
+ },
+ ]
+ tickets = []
+ tests.each { |test|
+
+ ticket = Ticket.create( test[:create][:ticket] )
+ test[:check][0][:o_id] = ticket.id
+ test[:check][1][:o_id] = ticket.id
+
+ test[:create][:article][:ticket_id] = ticket.id
+ article = Ticket::Article.create( test[:create][:article] )
+
+ assert_equal( ticket.class.to_s, 'Ticket' )
+
+ # execute ticket events
+ Observer::Ticket::Notification.transaction
+ #puts Delayed::Job.all.inspect
+ Delayed::Worker.new.work_off
+
+ # update ticket
+ if test[:update][:ticket]
+ ticket.update_attributes( test[:update][:ticket] )
+ end
+
+ # execute ticket events
+ Observer::Ticket::Notification.transaction
+ #puts Delayed::Job.all.inspect
+ Delayed::Worker.new.work_off
+
+ # remember ticket
+ tickets.push ticket
+
+ # check online notifications
+ notification_check( OnlineNotification.list(agent_user2, 10), test[:check] )
+ }
+
+ # delete tickets
+ tickets.each { |ticket|
+ ticket_id = ticket.id
+ ticket.destroy
+ found = Ticket.where( :id => ticket_id ).first
+ assert( !found, "Ticket destroyed")
+ }
+ end
+
+ def notification_check( onine_notifications, checks )
+ checks.each { |check_item|
+ hit = false
+ onine_notifications.each {|onine_notification|
+ if onine_notification['o_id'] == check_item[:o_id]
+ if onine_notification['object'] == check_item[:object]
+ if onine_notification['type'] == check_item[:type]
+ if onine_notification['created_by_id'] == check_item[:created_by_id]
+ hit = true
+ end
+ end
+ end
+ end
+ }
+ assert( hit, "online notification exists #{ check_item.inspect }" )
+ }
+ end
+
+end
\ No newline at end of file
diff --git a/test/unit/ticket_notification_test.rb b/test/unit/ticket_notification_test.rb
index 27018e0f2..ad3134599 100644
--- a/test/unit/ticket_notification_test.rb
+++ b/test/unit/ticket_notification_test.rb
@@ -364,7 +364,7 @@ class TicketNotificationTest < ActiveSupport::TestCase
# create ticket in group
ticket1 = Ticket.create(
- :title => 'some notification template test 1',
+ :title => 'some notification template test 1 Bobs\'s resumé',
:group => Group.lookup( :name => 'Users'),
:customer => customer,
:state => Ticket::State.lookup( :name => 'new' ),
@@ -413,6 +413,16 @@ class TicketNotificationTest < ActiveSupport::TestCase
assert_match( /updated/i, template[:subject] )
# en notification
+ subject = NotificationFactory.build(
+ :locale => agent2.preferences[:locale],
+ :string => template[:subject],
+ :objects => {
+ :ticket => ticket1,
+ :article => article,
+ :recipient => agent2,
+ }
+ )
+ assert_match( /Bobs's resumé/, subject )
body = NotificationFactory.build(
:locale => agent2.preferences[:locale],
:string => template[:body],
@@ -437,6 +447,16 @@ class TicketNotificationTest < ActiveSupport::TestCase
assert_match( /aktualis/, template[:subject] )
# de notification
+ subject = NotificationFactory.build(
+ :locale => agent1.preferences[:locale],
+ :string => template[:subject],
+ :objects => {
+ :ticket => ticket1,
+ :article => article,
+ :recipient => agent2,
+ }
+ )
+ assert_match( /Bobs's resumé/, subject )
body = NotificationFactory.build(
:locale => agent1.preferences[:locale],
:string => template[:body],