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

Fixed url and object name.

Browse source
This commit is contained in:
Martin Edenhofer 2013-08-19 08:35:24 +02:00
parent ddc99ca406
commit d6b498a20a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/controllers/_dashboard/activity_stream.js.coffee
View file

@ -42,17 +42,17 @@ class App.DashboardActivityStream extends App.Controller
for item in items for item in items
if item.history_object is 'Ticket' if item.history_object is 'Ticket'
ticket = App.Ticket.find( item.o_id ) ticket = App.Ticket.find( item.o_id )
item.link = '#ticket_zoom/' + ticket.id item.link = '#ticket/zoom/' + ticket.id
item.title = ticket.title item.title = ticket.title
item.type = item.history_object item.type = 'Ticket'
item.updated_by_id = ticket.updated_by_id item.updated_by_id = ticket.updated_by_id
item.updated_by = App.User.find( ticket.updated_by_id ) item.updated_by = App.User.find( ticket.updated_by_id )
else if item.history_object is 'Ticket::Article' else if item.history_object is 'Ticket::Article'
article = App.TicketArticle.find( item.o_id ) article = App.TicketArticle.find( item.o_id )
ticket = App.Ticket.find( article.ticket_id ) ticket = App.Ticket.find( article.ticket_id )
item.link = '#ticket_zoom/' + ticket.id + '/' + article.od item.link = '#ticket/zoom/' + ticket.id + '/' + article.id
item.title = article.subject || ticket.title item.title = article.subject || ticket.title
item.type = item.history_object item.type = 'Article'
item.updated_by_id = article.updated_by_id item.updated_by_id = article.updated_by_id
item.updated_by = App.User.find( article.updated_by_id ) item.updated_by = App.User.find( article.updated_by_id )