Patch: Make embedded reply recipients include current owner_id

Author: xaviqv

src/Controllers/TicketsController.php

@@ -1214,12 +1214,13 @@ public function edit($id, $parameters = null)
 
         // Default notification recipients
         $all_c = clone $all_comments;
-        $a_reply = [(!is_null($ticket->owner) ? $ticket->owner->id : $ticket->user_id)];
-        $a_note = [];
+        $a_reply = $a_note = [];
+        
         foreach($all_c->get() as $comm){
             if ($comm->type == 'reply'){
                 $a_reply = array_merge($a_reply, $comm->notifications->pluck('member_id')->toArray());
-            }elseif($comm->type == 'note'){
+			
+			}elseif($comm->type == 'note'){
                 $a_note = array_merge($a_note, $comm->notifications->pluck('member_id')->toArray());
             }
         }

src/Views/tickets/createedit/form.blade.php

@@ -46,7 +46,7 @@
             <label for="owner_id" class="{{ $u->currentLevel()==1 ? 'col-lg-2' : 'col-lg-3' }} level_class col-form-label tooltip-info" data-level-1-class="col-lg-2" data-level-2-class="col-lg-3" title="{{ trans('panichd::lang.create-ticket-owner-help') }}"> *{{trans('panichd::lang.owner')}}{{trans('panichd::lang.colon')}} <span class="fa fa-question-circle" style="color: #bbb"></span></label>
 
             <div class="{{ $u->currentLevel()==1 ? 'col-lg-10' : 'col-lg-9' }} level_class" data-level-1-class="col-lg-10" data-level-2-class="col-lg-9">
-                <select name="owner_id" class="generate_default_select2 form-control" style="display: none; width: 100%">
+                <select id="owner_id" name="owner_id" class="generate_default_select2 form-control" style="display: none; width: 100%">
                 @foreach ($c_members as $owner)
                     <option value="{{ $owner->id }}" {{ $owner->id == $a_current['owner_id'] ? 'selected="selected"' : '' }}>{{ $owner->name . ($owner->email == "" ? ' ' . trans('panichd::lang.ticket-owner-no-email') : ' - ' . $owner->email) }}
                     @if ($setting->grab('departments_notices_feature'))

src/Views/tickets/partials/comments/embedded_form.blade.php

@@ -43,7 +43,7 @@
                     </select>
                     <select class="form-control reply_recipients" name="comment_x_recipients[]" class="form-control" multiple="multiple" style="display: none; width: 100%" disabled="disabled">
                         @foreach ($c_members->filter(function($q)use($u){ return $q->id != $u->id; }) as $member)
-                            <option value="{{ $member->id }}" {{ in_array($member->id, $a_notifications['reply']) ? 'selected="selected"' : '' }}>{{ $member->name . ($member->email == "" ? ' ' . trans('panichd::lang.ticket-owner-no-email') : ' - ' . $member->email) }}
+                            <option value="{{ $member->id }}">{{ $member->name . ($member->email == "" ? ' ' . trans('panichd::lang.ticket-owner-no-email') : ' - ' . $member->email) }}
                             @if ($setting->grab('departments_notices_feature'))
                                 @if ($member->ticketit_department == '0')
                                     {{ ' - ' . trans('panichd::lang.create-ticket-notices') . ' ' . trans('panichd::lang.all-depts')}}

src/Views/tickets/partials/comments/embedded_scripts.blade.php

@@ -6,6 +6,7 @@
 
        // Notification members
        var a_notifications_note = [{{ implode(',', $a_notifications['note']) }}];
+       var a_notifications_reply = [{{ implode(',', $a_notifications['reply']) }}];
 
        var _cloned = $('#comment_template').clone();
        var _num = $('#comments .comment_block').length + 1;
@@ -19,6 +20,13 @@
             });
             // Add current agent id
             _cloned.find('.note_recipients option[value=' + $('#agent_id').val() + ']').prop('selected', true);
+            
+            $(a_notifications_reply).each(function(i,v){
+                // Add other reply recipients
+                _cloned.find('.reply_recipients option[value=' + v + ']').prop('selected', true);
+            });
+            // Add current owner
+            _cloned.find('.reply_recipients option[value=' + $('#owner_id').val() + ']').prop('selected', true);
 
             // Activate notification recipients selects
             _cloned.find('.note_recipients').prop('disabled', false).attr('name', 'comment_' + _num + '_recipients[]');