canned: Fixup canned response insertion by staff

include/class.canned.php

@@ -104,6 +104,16 @@ class Canned {
         return $this->_filters;
     }
 
+    function getAttachedFiles($inlines=false) {
+        return AttachmentFile::objects()
+            ->filter(array(
+                'attachments__type'=>'C',
+                'attachments__object_id'=>$this->getId(),
+                'attachments__inline' => $inlines,
+            ))
+            ->all();
+    }
+
     function getNumFilters() {
         return count($this->getFilters());
     }
@@ -148,11 +158,18 @@ class Canned {
                 if ($cb && is_callable($cb))
                     $resp = $cb($resp);
 
-                $resp['files'] = $this->attachments->getSeparates();
+                $resp['files'] = array();
+                foreach ($this->getAttachedFiles(!$html) as $file) {
+                    $resp['files'][] = array(
+                        'id' => $file->id,
+                        'name' => $file->name,
+                        'size' => $file->size,
+                        'download_url' => $file->getDownloadUrl(),
+                    );
+                }
                 // strip html
                 if (!$html) {
                     $resp['response'] = Format::html2text($resp['response'], 90);
-                    $resp['files'] += $this->attachments->getInlines();
                 }
                 return Format::json_encode($resp);
                 break;

include/staff/cannedresponse.inc.php

@@ -93,10 +93,10 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 </div>
                 <?php
                 $attachments = $canned_form->getField('attachments');
-                if ($canned && ($files=$canned->attachments->getSeparates())) {
+                if ($canned && ($files=$canned->getAttachedFiles())) {
                     $ids = array();
                     foreach ($files as $f)
-                        $ids[] = $f['id'];
+                        $ids[] = $f->id;
                     $attachments->value = $ids;
                 }
                 print $attachments->render(); ?>

scp/js/scp.js

@@ -221,12 +221,12 @@ var scp_prep = function() {
                         redactor = box.data('redactor');
                     if(canned.response) {
                         if (redactor)
-                            redactor.insertHtml(canned.response);
+                            redactor.insert.html(canned.response);
                         else
                             box.val(box.val() + canned.response);
 
                         if (redactor)
-                            redactor.observeStart();
+                            redactor.observe.load();
                     }
                     //Canned attachments.
                     var ca = $('.attachments', fObj);