Merge pull request #42 from hwang36/master

T341 Add a 'description' field to Phriction for annotating edits

resources/sql/patches/066.phrictioncontent.sql

@@ -0,0 +1,2 @@
+alter table phabricator_phriction.phriction_content
+  add description varchar(512);

src/applications/phriction/controller/diff/PhrictionDiffController.php

@@ -239,7 +239,7 @@ class PhrictionDiffController
         phabricator_time($c->getDateCreated(), $user),
         phutil_escape_html('Version '.$c->getVersion()),
         $handles[$c->getAuthorPHID()]->renderLink(),
-        '',
+        phutil_escape_html($c->getDescription()),
       );
     }
 

src/applications/phriction/controller/edit/PhrictionEditController.php

@@ -96,10 +96,10 @@ class PhrictionEditController
           $is_new = true;
           $document->save();
         }
-
         $new_content = new PhrictionContent();
         $new_content->setSlug($document->getSlug());
         $new_content->setTitle($title);
+        $new_content->setDescription($request->getStr('description'));
         $new_content->setContent($request->getStr('content'));
 
         $new_content->setDocumentID($document->getID());
@@ -176,6 +176,12 @@ class PhrictionEditController
           ->setValue($content->getTitle())
           ->setError($e_title)
           ->setName('title'))
+      ->appendChild(
+        id(new AphrontFormTextControl())
+          ->setLabel('Description')
+          ->setValue($content->getDescription())
+          ->setError(null)
+          ->setName('description'))
       ->appendChild(
         id(new AphrontFormStaticControl())
           ->setLabel('URI')

src/applications/phriction/controller/history/PhrictionHistoryController.php

@@ -100,7 +100,7 @@ class PhrictionHistoryController
           ),
           'Version '.$version),
         $handles[$content->getAuthorPHID()]->renderLink(),
-        '',
+        phutil_escape_html($content->getDescription()),
         $vs_previous,
         $vs_head,
       );

src/applications/phriction/storage/content/PhrictionContent.php

@@ -26,5 +26,6 @@ class PhrictionContent extends PhrictionDAO {
   protected $title;
   protected $slug;
   protected $content;
+  protected $description;
 
 }