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

Fixed not working text modules.

Browse source
This commit is contained in:
Martin Edenhofer 2013-06-19 10:21:48 +02:00
parent 0ebd0346b7
commit 040b0581fb
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/agent_ticket_create.js.coffee
View file

@ -217,7 +217,7 @@ class App.TicketCreate extends App.Controller
# show text module UI # show text module UI
new App.TextModuleUI( new App.TextModuleUI(
el: @el.find('[data-id="text_module"]'), el: @el,
) )
@formDefault = @formParam( @el.find('.ticket-create') ) @formDefault = @formParam( @el.find('.ticket-create') )

3
app/assets/javascripts/app/controllers/text_module_widget.js.coffee
View file

@ -26,8 +26,7 @@ class App.TextModuleUI extends App.Controller
.find('small') .find('small')
.text("(" + e.keywords + ")").end() .text("(" + e.keywords + ")").end()
element.append(template) element.append(template)
$('textarea').sew({values: values, token: '::', elementFactory: elementFactory }) @el.find('textarea').sew({values: values, token: '::', elementFactory: elementFactory })
class App.TextModuleUIOld extends App.Controller class App.TextModuleUIOld extends App.Controller
events: events:

18
app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
View file

@ -147,8 +147,7 @@ class App.TicketZoom extends App.Controller
render: (force) => render: (force) =>
# get data # get data
if !@ticket @ticket = App.Collection.find( 'Ticket', @ticket_id )
@ticket = App.Collection.find( 'Ticket', @ticket_id )
# update taskbar with new meta data # update taskbar with new meta data
App.Event.trigger 'task:render' App.Event.trigger 'task:render'
@ -173,6 +172,14 @@ class App.TicketZoom extends App.Controller
@editDone = true @editDone = true
@Edit() @Edit()
# show text module UI
if !@isRole('Customer')
new App.TextModuleUI(
el: @el
data:
ticket: @ticket
)
# scroll to article if given # scroll to article if given
if @article_id && document.getElementById( 'article-' + @article_id ) if @article_id && document.getElementById( 'article-' + @article_id )
offset = document.getElementById( 'article-' + @article_id ).offsetTop offset = document.getElementById( 'article-' + @article_id ).offsetTop
@ -309,13 +316,6 @@ class TicketAction extends App.Controller
object: @ticket object: @ticket
) )
# show text module UI
if !@isRole('Customer')
new App.TextModuleUI(
el: @el.find('.text_module')
data:
ticket: @ticket
)
class Edit extends App.Controller class Edit extends App.Controller

1
app/assets/javascripts/app/views/ticket_zoom/ticket_action.jst.eco
View file

@ -2,4 +2,3 @@
<div class="action_info"></div> <div class="action_info"></div>
<div class="tag_info"></div> <div class="tag_info"></div>
<div class="link_info"></div> <div class="link_info"></div>
<div class="text_module"></div>