Merge branch 'master' of github.com:martini/zammad

app/assets/javascripts/app/controllers/agent_ticket_history.js.coffee

@@ -1,4 +1,9 @@
 class App.TicketHistory extends App.ControllerModal
+  
+  events:
+    'click [data-type=sortorder]': 'sortorder',
+    'click .close': 'close',
+
   constructor: ->
     super
     @fetch(@ticket_id)
@@ -49,3 +54,33 @@ class App.TicketHistory extends App.ControllerModal
 
     # show frontend times
     @delay( @frontendTimeUpdate, 200 )
+
+  sortorder: ->
+    isSorted = @el.find('.sorted')
+    @log 'is sorted?', isSorted
+    if isSorted.length
+      @sortstate = 'notsorted'
+      @html App.view('agent_ticket_history')(
+        objects: App.Collection.all( type: 'History' ),
+        state: @sortstate
+      )
+    else
+      @sortstate = 'sorted'
+      @html App.view('agent_ticket_history')(
+        objects: App.Collection.all( type: 'History' ).reverse(),
+        state: @sortstate
+      )
+
+
+    @modalShow()
+
+    # enable user popups
+    @userPopups()
+
+    # show frontend times
+    @delay( @frontendTimeUpdate, 200 )
+
+  close: ->
+    # close modal
+    @modalHide()
+

app/assets/javascripts/app/views/agent_ticket_history.jst.eco

@@ -1,6 +1,7 @@
 <div class="modal-header">
   <a href="#" class="close">&times;</a>
   <h2><%- @T( 'History' ) %></h2>
+  <a href="#" data-type="sortorder" id="sortorder" class="<%= @state %>"><%- @T( 'Change order' ) %></a>
 </div>
 <div class="modal-body">