Comment attachment editing nits.

- Allow attaching on first edit. - Saving an empty comment != deleting.
kohler · Aug 22, 2018 · e36722c · e36722c
1 parent 0b2d5c8
commit e36722c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 39 deletions.
diff --git a/comment.php b/comment.php
@@ -68,7 +68,7 @@ function save_comment($qreq, $text, $is_response, $roundnum) {
             "text" => $text,
             "tags" => $qreq->commenttags,
             "blind" => $qreq->blind,
-            "docs" => $crow->attachments()];
+            "docs" => $crow ? $crow->attachments() : []];
     $ok = true;
     $msg = false;
 
@@ -181,7 +181,7 @@ function handle_response($qreq) {
     if (($whyNot = $Me->perm_submit_comment($prow, $crow)))
         Conf::msg_error(whyNotText($whyNot));
     else
-        save_comment($Qreq, "", ($crow->commentType & COMMENTTYPE_RESPONSE) != 0, $crow->commentRound);
+        save_comment($Qreq, false, ($crow->commentType & COMMENTTYPE_RESPONSE) != 0, $crow->commentRound);
     if ($Qreq->ajax)
         json_exit(["ok" => false]);
 } else if ($Qreq->cancel && $crow)

diff --git a/doc.php b/doc.php
@@ -224,7 +224,6 @@ function document_download($qreq) {
             $doc_crow = $cmtid = null;
             if ($dr->linkid[0] === "x" || $dr->linkid[0] === "X")
                 $cmtid = (int) substr($dr->linkid, 1);
-            error_log("got cmtid $dr->linkid");
             foreach ($prow->viewable_comment_skeletons($Me) as $crow)
                 if ($crow->unparse_html_id() === $dr->linkid
                     || $crow->commentId === $cmtid) {
@@ -233,7 +232,7 @@ function document_download($qreq) {
                 }
             if (!$doc_crow)
                 document_error("404 Not Found", "No such document “" . htmlspecialchars($dr->req_filename) . "”.");
-            foreach ($prow->comment_linked_documents($doc_crow) as $xdoc)
+            foreach ($doc_crow->attachments() as $xdoc)
                 if ($xdoc->unique_filename === $dr->attachment) {
                     $request_docid = $want_docid = $xdoc->paperStorageId;
                     break;

diff --git a/scripts/script.js b/scripts/script.js
@@ -3412,9 +3412,9 @@ function activate_editing($c, cj) {
     if (cj.response && resp_rounds[cj.response].words > 0)
         make_update_words($c, resp_rounds[cj.response].words);
 
-    $c.find("form").on("submit", submit_editor);
-    $c.on("click", "button", buttonclick_editor);
-    hiliter_children($c);
+    var $f = $c.find("form");
+    $f.on("submit", submit_editor).on("click", "button", buttonclick_editor);
+    hiliter_children($f);
     $c.find(".need-tooltip").each(tooltip);
 }
 

diff --git a/src/commentinfo.php b/src/commentinfo.php
@@ -245,8 +245,7 @@ function has_tag($tag) {
 
     function attachments() {
         return $this->commentType & COMMENTTYPE_HASDOC
-            ? $this->prow->comment_linked_documents($this)
-            : [];
+            ? $this->prow->linked_documents($this->commentId, 0, 1024) : [];
     }
 
     function unparse_json(Contact $contact) {
@@ -456,10 +455,10 @@ function save($req, Contact $contact) {
                    && !$contact->act_author_view($this->prow)) {
             $tagger = new Tagger($contact);
             $ctags = array();
-            foreach ($m[0] as $text)
-                if (($text = $tagger->check($text, Tagger::NOVALUE))
-                    && !stri_ends_with($text, "response"))
-                    $ctags[strtolower($text)] = $text;
+            foreach ($m[0] as $tt)
+                if (($tt = $tagger->check($tt, Tagger::NOVALUE))
+                    && !stri_ends_with($tt, "response"))
+                    $ctags[strtolower($tt)] = $tt;
             $tagger->sort($ctags);
             $ctags = count($ctags) ? " " . join(" ", $ctags) . " " : null;
         } else
@@ -478,13 +477,15 @@ function save($req, Contact $contact) {
         $displayed = !($ctype & COMMENTTYPE_DRAFT);
 
         // query
-        $text = get_s($req, "text");
+        if (($text = get($req, "text")) !== false)
+            $text = (string) $text;
         $q = "";
         $qv = array();
-        if ($text === "" && $this->commentId) {
+        if ($text === false && $this->commentId) {
             $change = true;
             $q = "delete from $Table where commentId=$this->commentId";
-        } else if ($text === "")
+            $docids = [];
+        } else if ($text === false)
             /* do nothing */;
         else if (!$this->commentId) {
             $change = true;
@@ -542,34 +543,20 @@ function save($req, Contact $contact) {
         $result = $this->conf->qe_apply($q, $qv);
         if (!$result)
             return false;
+
         $cmtid = $this->commentId ? : $result->insert_id;
         if (!$cmtid)
             return false;
 
-        // document links
-        if ($docids !== $old_docids) {
-            if ($old_docids)
-                $this->conf->qe("delete from DocumentLink where paperId=? and linkId=? and linkType>=? and linkType<?", $this->prow->paperId, $this->commentId, 0, 1024);
-            if ($docids) {
-                $qv = [];
-                foreach ($docids as $i => $did)
-                    $qv[] = [$this->prow->paperId, $this->commentId, $i, $did];
-                $this->conf->qe("insert into DocumentLink (paperId,linkId,linkType,documentId) values ?v", $qv);
-            }
-            if ($old_docids)
-                $this->prow->mark_inactive_linked_documents();
-            $this->prow->invalidate_linked_documents();
-        }
-
         // log
-        $contact->log_activity("Comment $cmtid " . ($text !== "" ? "saved" : "deleted"), $this->prow->$LinkColumn);
+        $contact->log_activity("Comment $cmtid " . ($text !== false ? "saved" : "deleted"), $this->prow->$LinkColumn);
 
         // ordinal
-        if ($text !== "" && $this->ordinal_missing($ctype))
+        if ($text !== false && $this->ordinal_missing($ctype))
             $this->save_ordinal($cmtid, $ctype, $Table, $LinkTable, $LinkColumn);
 
         // reload
-        if ($text !== "") {
+        if ($text !== false) {
             $comments = $this->prow->fetch_comments("commentId=$cmtid");
             $this->merge($comments[$cmtid], $this->prow);
             if ($this->timeNotified == $this->timeModified)
@@ -580,6 +567,21 @@ function save($req, Contact $contact) {
             $this->commentTags = null;
         }
 
+        // document links
+        if ($docids !== $old_docids) {
+            if ($old_docids)
+                $this->conf->qe("delete from DocumentLink where paperId=? and linkId=? and linkType>=? and linkType<?", $this->prow->paperId, $this->commentId, 0, 1024);
+            if ($docids) {
+                $qv = [];
+                foreach ($docids as $i => $did)
+                    $qv[] = [$this->prow->paperId, $this->commentId, $i, $did];
+                $this->conf->qe("insert into DocumentLink (paperId,linkId,linkType,documentId) values ?v", $qv);
+            }
+            if ($old_docids)
+                $this->prow->mark_inactive_linked_documents();
+            $this->prow->invalidate_linked_documents();
+        }
+
         return true;
     }
 

diff --git a/src/paperinfo.php b/src/paperinfo.php
@@ -1185,18 +1185,15 @@ private function doclink_array() {
         }
         return $this->_doclink_array;
     }
-    private function linked_documents($linkid, $min) {
+    function linked_documents($linkid, $min, $max) {
         $docs = [];
         foreach (get($this->doclink_array(), $linkid, []) as $lt => $docid)
-            if ($lt >= $min && $lt < $min + 1024)
+            if ($lt >= $min && $lt < $max)
                 $docs[] = $this->document(-2, $docid);
         if (!empty($docs))
             DocumentInfo::assign_unique_filenames($docs);
         return $docs;
     }
-    function comment_linked_documents(CommentInfo $cinfo) {
-        return $this->linked_documents($cinfo->commentId, 0);
-    }
     function invalidate_linked_documents() {
         $this->_doclink_array = null;
     }