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

Fixed not shown initial ticket customer avatar.

Browse source
This commit is contained in:
Martin Edenhofer 2016-03-01 12:02:32 +01:00
parent 6ea24bf8a0
commit 02f760a627
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/assets/javascripts/app/controllers/ticket_zoom.coffee
View file

@ -351,7 +351,7 @@ class App.TicketZoom extends App.Controller
# rerender whole sidebar if customer or organization has changed # rerender whole sidebar if customer or organization has changed
if @ticketLastAttributes.customer_id isnt @ticket.customer_id || @ticketLastAttributes.organization_id isnt @ticket.organization_id if @ticketLastAttributes.customer_id isnt @ticket.customer_id || @ticketLastAttributes.organization_id isnt @ticket.organization_id
new App.WidgetAvatar( new App.WidgetAvatar(
el: @$('.ticketZoom-header .js-avatar') el: elLocal.find('.ticketZoom-header .js-avatar')
user_id: @ticket.customer_id user_id: @ticket.customer_id
size: 50 size: 50
) )
@ -381,12 +381,12 @@ class App.TicketZoom extends App.Controller
) )
# 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
offset = offset - 45 offset = offset - 45
scrollTo = -> scrollTo = ->
@scrollTo( 0, offset ) @scrollTo(0, offset)
@delay( scrollTo, 100, false ) @delay(scrollTo, 100, false)
@ticketLastAttributes = @ticket.attributes() @ticketLastAttributes = @ticket.attributes()
@ -476,8 +476,8 @@ class App.TicketZoom extends App.Controller
resetButton = @$('.js-reset') resetButton = @$('.js-reset')
params = {} params = {}
params.ticket = @formParam( ticketForm ) params.ticket = @formParam(ticketForm)
params.article = @formParam( articleForm ) params.article = @formParam(articleForm)
#console.log('markFormDiff', diff, params) #console.log('markFormDiff', diff, params)
# clear all changes # clear all changes
@ -731,6 +731,6 @@ class TicketZoomRouter extends App.ControllerPermanent
show: true show: true
) )
App.Config.set( 'ticket/zoom/:ticket_id', TicketZoomRouter, 'Routes' ) App.Config.set('ticket/zoom/:ticket_id', TicketZoomRouter, 'Routes')
App.Config.set( 'ticket/zoom/:ticket_id/nav/:nav', TicketZoomRouter, 'Routes' ) App.Config.set('ticket/zoom/:ticket_id/nav/:nav', TicketZoomRouter, 'Routes')
App.Config.set( 'ticket/zoom/:ticket_id/:article_id', TicketZoomRouter, 'Routes' ) App.Config.set('ticket/zoom/:ticket_id/:article_id', TicketZoomRouter, 'Routes')