diff --git a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee index 1acc0b452..93498db1a 100644 --- a/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee +++ b/app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee @@ -211,9 +211,8 @@ class App.TicketCreate extends App.Controller # update text module UI callback = (user) => @textModule.reload( - data: - ticket: - customer: user + ticket: + customer: user ) @userInfo( diff --git a/app/assets/javascripts/app/controllers/text_module_widget.js.coffee b/app/assets/javascripts/app/controllers/text_module_widget.js.coffee index 4af73778a..fdd23daf0 100644 --- a/app/assets/javascripts/app/controllers/text_module_widget.js.coffee +++ b/app/assets/javascripts/app/controllers/text_module_widget.js.coffee @@ -2,6 +2,7 @@ class App.TextModuleUI extends App.Controller constructor: -> super + @lastData = {} customItemTemplate = "
 
" elementFactory = (element, e) -> template = $(customItemTemplate).find('span') @@ -23,7 +24,7 @@ class App.TextModuleUI extends App.Controller reload: (data = false) => if data - @lastData = data + @lastData['data'] = data @update() update: => @@ -35,10 +36,12 @@ class App.TextModuleUI extends App.Controller contentNew = item.content.replace( /<%=\s{0,2}(.+?)\s{0,2}%>/g, ( all, key ) -> key = key.replace( /@/g, 'ui.data.' ) varString = "#{key}" + '' +# console.log( "tag replacement env: ", ui.data) try +# console.log( "tag replacement: " + key, varString ) key = eval (varString) catch error - #console.log( "tag replacement: " + error ) +# console.log( "tag replacement error: " + error ) key = '' return key ) diff --git a/test/browser/text_module_test.rb b/test/browser/text_module_test.rb index 8bd889832..94264c9c9 100644 --- a/test/browser/text_module_test.rb +++ b/test/browser/text_module_test.rb @@ -361,6 +361,68 @@ class TextModuleTest < TestCase }, ], }, + { + :name => 'verify zoom', + :action => [ + + # create ticket + { + :where => :instance2, + :execute => 'create_ticket', + :group => 'Users', + :subject => 'some subject 123äöü', + :body => 'some body 123äöü', + }, + + # check ticket + { + :where => :instance2, + :execute => 'match', + :css => '.active div.article', + :value => 'some body 123äöü', + :match_result => true, + }, + + # check ticket zoom + { + :execute => 'wait', + :value => 4, + }, + { + :where => :instance2, + :execute => 'set', + :css => '.active textarea[name=body]', + :value => '::' + random, + }, + { + :execute => 'wait', + :value => 1, + }, + { + :where => :instance2, + :execute => 'match', + :css => 'body', + :value => random, + :match_result => true, + }, + { + :where => :instance2, + :execute => 'click', + :css => '.-sew-list-item.selected', + }, + { + :execute => 'wait', + :value => 1, + }, + { + :where => :instance2, + :execute => 'match', + :css => '.active textarea[name=body]', + :value => 'some content' + random, + :match_result => true, + }, + ], + }, ] browser_double_test(tests) end