From 00bf47f973c85827ecc3bcd9d6568e4fbdf754c6 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 21 Oct 2013 16:58:56 -0700 Subject: [PATCH] Fix "Manage herald rules" link by removing it Summary: Fixes T4001. I broke this some time ago and no one has complained. I don't think it gets much use, and we haven't added it for the newer apps. Just get rid of it rather than adapt the URIs for ApplicationSearch. Test Plan: Unit tests, sent myself some email. Reviewers: zeeg, btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T4001 Differential Revision: https://secure.phabricator.com/D7355 --- conf/default.conf.php | 4 ---- .../config/option/PhabricatorMetaMTAConfigOptions.php | 6 +++--- src/applications/differential/mail/DifferentialMail.php | 3 +-- .../metamta/view/PhabricatorMetaMTAMailBody.php | 6 +----- .../view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php | 8 +------- .../worker/PhabricatorRepositoryCommitHeraldWorker.php | 3 +-- 6 files changed, 7 insertions(+), 23 deletions(-) diff --git a/conf/default.conf.php b/conf/default.conf.php index c2c5921bfd..1163e6e07e 100644 --- a/conf/default.conf.php +++ b/conf/default.conf.php @@ -515,10 +515,6 @@ return array( // address will be stored in an 'From Email' field on the task. 'metamta.maniphest.default-public-author' => null, - // You can disable the Herald hints in email if users prefer smaller messages. - // These are the links under the headers "MANAGE HERALD RULES" and - // "WHY DID I GET THIS EMAIL?". If you set this to true, they will not appear - // in any mail. Users can still navigate to the links via the web interface. 'metamta.herald.show-hints' => true, // You can disable the hints under "REPLY HANDLER ACTIONS" if users prefer diff --git a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php index c39272edee..afd7738e27 100644 --- a/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php +++ b/src/applications/config/option/PhabricatorMetaMTAConfigOptions.php @@ -72,9 +72,9 @@ EODOC $herald_hints_description = $this->deformat(pht(<<addReplySection($reply_handler->getReplyHandlerInstructions()); if ($this->getHeraldTranscriptURI() && $this->isFirstMailToRecipients()) { - $manage_uri = '/herald/view/differential/'; $xscript_uri = $this->getHeraldTranscriptURI(); - $body->addHeraldSection($manage_uri, $xscript_uri); + $body->addHeraldSection($xscript_uri); } return $body->render(); diff --git a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php index 3cc23d35db..df843b0466 100644 --- a/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php +++ b/src/applications/metamta/view/PhabricatorMetaMTAMailBody.php @@ -50,19 +50,15 @@ final class PhabricatorMetaMTAMailBody { /** * Add a Herald section with a rule management URI and a transcript URI. * - * @param string URI to rule management. * @param string URI to rule transcripts. * @return this * @task compose */ - public function addHeraldSection($rules_uri, $xscript_uri) { + public function addHeraldSection($xscript_uri) { if (!PhabricatorEnv::getEnvConfig('metamta.herald.show-hints')) { return $this; } - $this->addTextSection( - pht('MANAGE HERALD RULES'), - PhabricatorEnv::getProductionURI($rules_uri)); $this->addTextSection( pht('WHY DID I GET THIS EMAIL?'), PhabricatorEnv::getProductionURI($xscript_uri)); diff --git a/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php b/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php index e09a7737a5..1d5b1e047a 100644 --- a/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php +++ b/src/applications/metamta/view/__tests__/PhabricatorMetaMTAMailBodyTestCase.php @@ -14,9 +14,6 @@ HEADER bass trout -MANAGE HERALD RULES - http://test.com/rules/ - WHY DID I GET THIS EMAIL? http://test.com/xscript/ @@ -54,9 +51,6 @@ HEADER bass trout -MANAGE HERALD RULES - http://test.com/rules/ - WHY DID I GET THIS EMAIL? http://test.com/xscript/ @@ -74,7 +68,7 @@ EOTEXT; $body = new PhabricatorMetaMTAMailBody(); $body->addRawSection("salmon"); $body->addTextSection("HEADER", "bass\ntrout\n"); - $body->addHeraldSection("/rules/", "/xscript/"); + $body->addHeraldSection("/xscript/"); $body->addReplySection("pike"); $this->assertEqual($expect, $body->render()); diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php index 2bd77e38fe..e896536ef4 100644 --- a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php +++ b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php @@ -119,7 +119,6 @@ final class PhabricatorRepositoryCommitHeraldWorker $xscript_id = $xscript->getID(); - $manage_uri = '/herald/view/commits/'; $why_uri = '/herald/transcript/'.$xscript_id.'/'; $reply_handler = PhabricatorAuditCommentEditor::newReplyHandlerForCommit( @@ -135,7 +134,7 @@ final class PhabricatorRepositoryCommitHeraldWorker $body->addTextSection(pht('DIFFERENTIAL REVISION'), $differential); $body->addTextSection(pht('AFFECTED FILES'), $files); $body->addReplySection($reply_handler->getReplyHandlerInstructions()); - $body->addHeraldSection($manage_uri, $why_uri); + $body->addHeraldSection($why_uri); $body->addRawSection($inline_patch_text); $body = $body->render();