Browse Source

Fixed broken markup in popover for users tickets.

Martin Edenhofer 10 years ago
parent
commit
6cffb8c576

+ 9 - 3
app/assets/javascripts/app/controllers/_application_controller.js.coffee

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

+ 4 - 1
app/assets/javascripts/app/views/popover/user_ticket_list.jst.eco

@@ -1,5 +1,8 @@
 <ul>
 <% 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 %>
 <ul>