Fixed not assigned group at group -> user assignment.

sirius248 · Feb 13, 2017 · bc60edd · bc60edd
1 parent dd75a20
commit bc60edd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/assets/javascripts/app/controllers/ticket_overview.coffee b/app/assets/javascripts/app/controllers/ticket_overview.coffee
@@ -126,11 +126,12 @@ class App.TicketOverview extends App.Controller
               # clean scale
               action = @hoveredBatchEntry.attr('data-action')
               id = @hoveredBatchEntry.attr('data-id')
+              groupId = @hoveredBatchEntry.attr('data-group-id')
               items = @el.find('[name="bulk"]:checked')
               @hoveredBatchEntry.removeAttr('style')
               @cleanUpDrag(true)
 
-              @performBatchAction items, action, id
+              @performBatchAction items, action, id, groupId
     @batchDragger.velocity
       properties:
         scale: 0
@@ -172,7 +173,7 @@ class App.TicketOverview extends App.Controller
         easing: 'ease-in-out'
         duration: 300
 
-  performBatchAction: (items, action, id) ->
+  performBatchAction: (items, action, id, groupId) ->
     if action is 'macro'
       @batchCount = items.length
       @batchCountIndex = 0
@@ -201,6 +202,8 @@ class App.TicketOverview extends App.Controller
         #console.log "perform action #{action} with id #{id} on ", $(item).val()
         ticket = App.Ticket.find($(item).val())
         ticket.owner_id = id
+        if !_.isEmpty(groupId)
+          ticket.group_id = groupId
         ticket.save(
           done: (r) =>
             @batchCountIndex++
@@ -411,6 +414,7 @@ class App.TicketOverview extends App.Controller
     @batchAssignGroupInner.html $(App.view('ticket_overview/batch_overlay_user_group')(
       users: users
       groups: []
+      groupId: groupId
     ))
 
     # then adjust the size of the group that it almost overlaps the batch-assign box

diff --git a/app/assets/javascripts/app/views/ticket_overview/batch_overlay_user_group.jst.eco b/app/assets/javascripts/app/views/ticket_overview/batch_overlay_user_group.jst.eco
@@ -1,5 +1,5 @@
 <% for user in @users: %>
-<div class="batch-overlay-assign-entry js-batch-overlay-entry" data-action="user_assign" data-id="<%= user.id %>">
+<div class="batch-overlay-assign-entry js-batch-overlay-entry" data-action="user_assign" data-id="<%= user.id %>" data-group-id="<%= @groupId %>">
   <div class="js-batch-hover-target"><%- user.avatar(80) %></div>
   <div class="batch-overlay-assign-entry-name"><%- user.displayName() %></div>
 </div>