Merge pull request #3122 from protich/issue/collab-update

collabs: Thread Collaborators Update

include/ajax.thread.php

@@ -230,9 +230,13 @@ class ThreadAjaxAPI extends AjaxController {
 
         $errors = $info = array();
         if ($thread->updateCollaborators($_POST, $errors))
-            Http::response(201, sprintf('Recipients (%d of %d)',
-                        $thread->getNumActiveCollaborators(),
-                        $thread->getNumCollaborators()));
+            Http::response(201, $this->json_encode(array(
+                            'id' => $thread->getId(),
+                            'text' => sprintf('Recipients (%d of %d)',
+                                $thread->getNumActiveCollaborators(),
+                                $thread->getNumCollaborators())
+                            )
+                        ));
 
         if($errors && $errors['err'])
             $info +=array('error' => $errors['err']);

include/class.thread.php

@@ -197,15 +197,13 @@ class Thread extends VerySimpleModel {
             ));
         }
 
-        if ($cids) {
-            $this->collaborators->filter(array(
-                'thread_id' => $this->getId(),
-                Q::not(array('id__in' => $cids))
-            ))->update(array(
-                'updated' => SqlFunction::NOW(),
-                'isactive' => 0,
-            ));
-        }
+        $this->collaborators->filter(array(
+            'thread_id' => $this->getId(),
+            Q::not(array('id__in' => $cids ?: array(0)))
+        ))->update(array(
+            'updated' => SqlFunction::NOW(),
+            'isactive' => 0,
+        ));
 
         unset($this->ht['active_collaborators']);
         $this->_collaborators = null;

include/staff/ticket-view.inc.php

@@ -583,7 +583,8 @@ if ($errors['err'] && isset($_POST['a'])) {
                     <label><strong><?php echo __('Collaborators'); ?>:</strong></label>
                 </td>
                 <td>
-                    <input type='checkbox' value='1' name="emailcollab" id="emailcollab"
+                    <input type='checkbox' value='1' name="emailcollab"
+                    id="t<?php echo $ticket->getThreadId(); ?>-emailcollab"
                         <?php echo ((!$info['emailcollab'] && !$errors) || isset($info['emailcollab']))?'checked="checked"':''; ?>
                         style="display:<?php echo $ticket->getThread()->getNumCollaborators() ? 'inline-block': 'none'; ?>;"
                         >

scp/js/scp.js

@@ -987,8 +987,9 @@ $(document).on('click', 'a.collaborator, a.collaborators', function(e) {
     e.preventDefault();
     var url = 'ajax.php/'+$(this).attr('href').substr(1);
     $.dialog(url, 201, function (xhr) {
-       $('input#emailcollab').show();
-       $('#recipients').text(xhr.responseText);
+       var resp = $.parseJSON(xhr.responseText);
+       $('input#t'+resp.id+'-emailcollab').show();
+       $('#t'+resp.id+'-recipients').text(resp.text);
        $('.tip_box').remove();
     }, {
         onshow: function() { $('#user-search').focus(); }