revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-17 09:18:44 +01:00
Code Issues Releases Wiki Activity

Displaying links instead of dumping raw remarkup in Phriction mails

Browse source 
Summary:
Fixes T2900 - Display link to document version and diff for edited Phriction Documents.

Also display the target document for moved pages.

Test Plan: Edited/Moved some pages, verified that the links are linking to the correct versions.

Reviewers: epriestley

Reviewed By: epriestley

CC: adityar7, aran, Korvin

Maniphest Tasks: T2900

Differential Revision: https://secure.phabricator.com/D5615
This commit is contained in:
Anh Nhan Nguyen 2013-04-08 11:54:49 -07:00 • committed by epriestley
parent 18c76b8a46
commit 73c49775c1
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/applications/phriction/editor/PhrictionDocumentEditor.php
View file

@ -294,12 +294,19 @@ final class PhrictionDocumentEditor extends PhabricatorEditor {
$author_phid = $this->getActor()->getPHID(); $author_phid = $this->getActor()->getPHID();
$document = $this->document; $document = $this->document;
$content = $document->getContent(); $content = $document->getContent();
$slug_uri = PhrictionDocument::getSlugURI($document->getSlug());
$diff_uri = new PhutilURI('/phriction/diff/'.$document->getID().'/');
$prod_uri = PhabricatorEnv::getProductionURI('');
$vs_head = $diff_uri
->alter('l', $old_content->getVersion())
->alter('r', $content->getVersion());
$old_title = $old_content->getTitle(); $old_title = $old_content->getTitle();
$title = $content->getTitle(); $title = $content->getTitle();
// TODO: Currently, this produces something like // TODO: Currently, this produces something like
// Phrictioh Document Xyz was Edit // Phriction Document Xyz was Edit
// I'm too lazy to build my own action string everywhere // I'm too lazy to build my own action string everywhere
// Plus, it does not have pht() anyway // Plus, it does not have pht() anyway
$action = PhrictionChangeType::getChangeTypeLabel( $action = PhrictionChangeType::getChangeTypeLabel(
@ -315,9 +322,17 @@ final class PhrictionDocumentEditor extends PhabricatorEditor {
$old_title, $title); $old_title, $title);
} }
// The Remarkup text renderer comes in handy $body[] = pht("Link to new version:\n%s",
// TODO: Consider sending a diff instead? $prod_uri.$slug_uri.'?v='.$content->getVersion());
$body[] = pht("Content was changed to \n%s", $content->getContent());
$body[] = pht("Link to diff:\n%s", $prod_uri.$vs_head);
} else if ($content->getChangeType() ==
PhrictionChangeType::CHANGE_MOVE_AWAY) {
$target_document = id(new PhrictionDocument())
->load($content->getChangeRef());
$slug_uri = PhrictionDocument::getSlugURI($target_document->getSlug());
$body[] = pht("Link to destination document:\n%s", $prod_uri.$slug_uri);
} }
$body = implode("\n\n", $body); $body = implode("\n\n", $body);