diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -333,7 +333,7 @@ 'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18', 'rsrc/js/application/calendar/behavior-day-view.js' => '5c46cff2', 'rsrc/js/application/calendar/behavior-event-all-day.js' => '38dcf3c8', - 'rsrc/js/application/calendar/behavior-recurring-edit.js' => '9c751e15', + 'rsrc/js/application/calendar/behavior-recurring-edit.js' => '5f1c4d5f', 'rsrc/js/application/config/behavior-reorder-fields.js' => 'b6993408', 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '01774ab2', 'rsrc/js/application/conpherence/behavior-drag-and-drop-photo.js' => 'cf86d16a', @@ -630,7 +630,7 @@ 'javelin-behavior-project-boards' => 'ba4fa35c', 'javelin-behavior-project-create' => '065227cc', 'javelin-behavior-quicksand-blacklist' => '7927a7d3', - 'javelin-behavior-recurring-edit' => '9c751e15', + 'javelin-behavior-recurring-edit' => '5f1c4d5f', 'javelin-behavior-refresh-csrf' => '7814b593', 'javelin-behavior-releeph-preview-branch' => 'b2b4fbaf', 'javelin-behavior-releeph-request-state-change' => 'a0b57eb8', diff --git a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php --- a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php +++ b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php @@ -95,12 +95,6 @@ foreach ($effects as $effect) { $action = $effect->getAction(); switch ($action) { - case self::ACTION_NOTHING: - $result[] = new HeraldApplyTranscript( - $effect, - true, - pht('Did nothing.')); - break; case self::ACTION_BLOCK: $result[] = new HeraldApplyTranscript( $effect, diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php --- a/src/applications/herald/adapter/HeraldAdapter.php +++ b/src/applications/herald/adapter/HeraldAdapter.php @@ -1559,6 +1559,8 @@ return $this->applyFlagEffect($effect); case self::ACTION_EMAIL: return $this->applyEmailEffect($effect); + case self::ACTION_NOTHING: + return $this->applyNothingEffect($effect); default: break; } @@ -1577,6 +1579,12 @@ return $result; } + private function applyNothingEffect(HeraldEffect $effect) { + return new HeraldApplyTranscript( + $effect, + true, + pht('Did nothing.')); + } /** * @task apply diff --git a/src/applications/herald/adapter/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php --- a/src/applications/herald/adapter/HeraldCommitAdapter.php +++ b/src/applications/herald/adapter/HeraldCommitAdapter.php @@ -491,12 +491,6 @@ foreach ($effects as $effect) { $action = $effect->getAction(); switch ($action) { - case self::ACTION_NOTHING: - $result[] = new HeraldApplyTranscript( - $effect, - true, - pht('Great success at doing nothing.')); - break; case self::ACTION_ADD_CC: foreach ($effect->getTarget() as $phid) { if (empty($this->addCCPHIDs[$phid])) { diff --git a/src/applications/herald/adapter/HeraldDifferentialDiffAdapter.php b/src/applications/herald/adapter/HeraldDifferentialDiffAdapter.php --- a/src/applications/herald/adapter/HeraldDifferentialDiffAdapter.php +++ b/src/applications/herald/adapter/HeraldDifferentialDiffAdapter.php @@ -77,7 +77,7 @@ public function getActionNameMap($rule_type) { return array( self::ACTION_BLOCK => pht('Block diff with message'), - ); + ) + parent::getActionNameMap($rule_type); } public function getHeraldField($field) { @@ -141,12 +141,6 @@ foreach ($effects as $effect) { $action = $effect->getAction(); switch ($action) { - case self::ACTION_NOTHING: - $result[] = new HeraldApplyTranscript( - $effect, - true, - pht('Did nothing.')); - break; case self::ACTION_BLOCK: $result[] = new HeraldApplyTranscript( $effect, @@ -154,10 +148,8 @@ pht('Blocked diff.')); break; default: - $result[] = new HeraldApplyTranscript( - $effect, - false, - pht('No rules to handle action "%s"!', $action)); + $result[] = $this->applyStandardEffect($effect); + break; } } diff --git a/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php b/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php --- a/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php +++ b/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php @@ -293,12 +293,6 @@ foreach ($effects as $effect) { $action = $effect->getAction(); switch ($action) { - case self::ACTION_NOTHING: - $result[] = new HeraldApplyTranscript( - $effect, - true, - pht('OK, did nothing.')); - break; case self::ACTION_ADD_CC: $base_target = $effect->getTarget(); $forbidden = array(); diff --git a/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php b/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php --- a/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php +++ b/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php @@ -148,12 +148,6 @@ foreach ($effects as $effect) { $action = $effect->getAction(); switch ($action) { - case self::ACTION_NOTHING: - $result[] = new HeraldApplyTranscript( - $effect, - true, - pht('Great success at doing nothing.')); - break; case self::ACTION_ADD_CC: foreach ($effect->getTarget() as $phid) { $this->ccPHIDs[] = $phid; diff --git a/src/applications/herald/adapter/HeraldPholioMockAdapter.php b/src/applications/herald/adapter/HeraldPholioMockAdapter.php --- a/src/applications/herald/adapter/HeraldPholioMockAdapter.php +++ b/src/applications/herald/adapter/HeraldPholioMockAdapter.php @@ -117,12 +117,6 @@ foreach ($effects as $effect) { $action = $effect->getAction(); switch ($action) { - case self::ACTION_NOTHING: - $result[] = new HeraldApplyTranscript( - $effect, - true, - pht('Great success at doing nothing.')); - break; case self::ACTION_ADD_CC: foreach ($effect->getTarget() as $phid) { $this->ccPHIDs[] = $phid; 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 @@ -118,12 +118,6 @@ foreach ($effects as $effect) { $action = $effect->getAction(); switch ($action) { - case self::ACTION_NOTHING: - $result[] = new HeraldApplyTranscript( - $effect, - true, - pht('Great success at doing nothing.')); - break; case self::ACTION_ADD_CC: foreach ($effect->getTarget() as $phid) { $this->ccPHIDs[] = $phid;