Page MenuHomePhabricator

D13180.id31918.diff
No OneTemporary

D13180.id31918.diff

diff --git a/src/applications/phriction/editor/PhrictionTransactionEditor.php b/src/applications/phriction/editor/PhrictionTransactionEditor.php
--- a/src/applications/phriction/editor/PhrictionTransactionEditor.php
+++ b/src/applications/phriction/editor/PhrictionTransactionEditor.php
@@ -776,24 +776,6 @@
->setDocument($object);
}
- protected function didApplyHeraldRules(
- PhabricatorLiskDAO $object,
- HeraldAdapter $adapter,
- HeraldTranscript $transcript) {
-
- $xactions = array();
-
- $cc_phids = $adapter->getCcPHIDs();
- if ($cc_phids) {
- $value = array_fuse($cc_phids);
- $xactions[] = id(new PhrictionTransaction())
- ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
- ->setNewValue(array('+' => $value));
- }
-
- return $xactions;
- }
-
private function buildNewContentTemplate(
PhrictionDocument $document) {
diff --git a/src/applications/phriction/herald/PhrictionDocumentHeraldAdapter.php b/src/applications/phriction/herald/PhrictionDocumentHeraldAdapter.php
--- a/src/applications/phriction/herald/PhrictionDocumentHeraldAdapter.php
+++ b/src/applications/phriction/herald/PhrictionDocumentHeraldAdapter.php
@@ -3,7 +3,6 @@
final class PhrictionDocumentHeraldAdapter extends HeraldAdapter {
private $document;
- private $ccPHIDs = array();
public function getAdapterApplicationClass() {
return 'PhabricatorPhrictionApplication';
@@ -25,19 +24,11 @@
$this->document = $document;
return $this;
}
+
public function getDocument() {
return $this->document;
}
- private function setCcPHIDs(array $cc_phids) {
- $this->ccPHIDs = $cc_phids;
- return $this;
- }
-
- public function getCcPHIDs() {
- return $this->ccPHIDs;
- }
-
public function getAdapterContentName() {
return pht('Phriction Documents');
}
@@ -72,6 +63,7 @@
return array_merge(
array(
self::ACTION_ADD_CC,
+ self::ACTION_REMOVE_CC,
self::ACTION_EMAIL,
self::ACTION_NOTHING,
),
@@ -80,6 +72,7 @@
return array_merge(
array(
self::ACTION_ADD_CC,
+ self::ACTION_REMOVE_CC,
self::ACTION_EMAIL,
self::ACTION_FLAG,
self::ACTION_NOTHING,
@@ -116,22 +109,9 @@
$result = array();
foreach ($effects as $effect) {
- $action = $effect->getAction();
- switch ($action) {
- case self::ACTION_ADD_CC:
- foreach ($effect->getTarget() as $phid) {
- $this->ccPHIDs[] = $phid;
- }
- $result[] = new HeraldApplyTranscript(
- $effect,
- true,
- pht('Added address to cc list.'));
- break;
- default:
- $result[] = $this->applyStandardEffect($effect);
- break;
- }
+ $result[] = $this->applyStandardEffect($effect);
}
+
return $result;
}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 10, 9:17 AM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6718151
Default Alt Text
D13180.id31918.diff (2 KB)

Event Timeline