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

Fixed broken markup in popover for users tickets.

Browse source
This commit is contained in:
Martin Edenhofer 2015-02-10 13:27:52 +01:00
parent 4e3d2b5306
commit 6cffb8c576
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/app/controllers/_application_controller.js.coffee
View file

@ -386,7 +386,7 @@ class App.Controller extends Spine.Controller
@userTicketPopupsDestroy() @userTicketPopupsDestroy()
# show user popup # show user popup
controller = @ ui = @
@userTicketPopupsList = @el.find(data.selector).popover( @userTicketPopupsList = @el.find(data.selector).popover(
trigger: 'hover' trigger: 'hover'
container: 'body' container: 'body'
@ -405,9 +405,15 @@ class App.Controller extends Spine.Controller
tickets.push App.Ticket.fullLocal( ticket_id ) tickets.push App.Ticket.fullLocal( ticket_id )
# insert data # insert data
App.view('popover/user_ticket_list')( html = App.view('popover/user_ticket_list')(
tickets: tickets, tickets: tickets
) )
html = $( html )
html.find('.humanTimeFromNow').each( ->
item = $(this)
ui.frontendTimeUpdateItem(item)
)
html
) )
fetch = (params) => fetch = (params) =>

5
app/assets/javascripts/app/views/popover/user_ticket_list.jst.eco
View file

@ -1,5 +1,8 @@
<ul> <ul>
<% for ticket in @tickets: %> <% for ticket in @tickets: %>
<li><a href="#ticket/zoom/<%= ticket.id %>" title="<%= ticket.title %>">T:<%= ticket.number %></a> <span title="<%- @P( ticket, 'created_at') %>"><%- @P( ticket, 'created_at') %></span><br/><%= ticket.title %></li> <li>
<a href="#ticket/zoom/<%= ticket.id %>" title="<%= ticket.title %>">T:<%= ticket.number %></a> <%- @P( ticket, 'title') %><br/>
<%- @T('Created') %> <%- @P( ticket, 'created_at') %>
</li>
<% end %> <% end %>
<ul> <ul>