diff --git a/src/applications/differential/field/DifferentialTestPlanCommitMessageField.php b/src/applications/differential/field/DifferentialTestPlanCommitMessageField.php index 178e51d985..a477a9036e 100644 --- a/src/applications/differential/field/DifferentialTestPlanCommitMessageField.php +++ b/src/applications/differential/field/DifferentialTestPlanCommitMessageField.php @@ -1,60 +1,53 @@ isCustomFieldEnabled('differential:test-plan'); } public function validateFieldValue($value) { $is_required = PhabricatorEnv::getEnvConfig( 'differential.require-test-plan-field'); if ($is_required && !strlen($value)) { $this->raiseValidationException( pht( 'You must provide a test plan. Describe the actions you performed '. 'to verify the behavior of this change.')); } } public function readFieldValueFromObject(DifferentialRevision $revision) { return $revision->getTestPlan(); } public function getFieldTransactions($value) { return array( array( 'type' => DifferentialRevisionTestPlanTransaction::EDITKEY, 'value' => $value, ), ); } - public function validateTransactions($object, array $xactions) { - return $this->validateCommitMessageCorpusTransactions( - $object, - $xactions, - pht('Test Plan')); - } - } diff --git a/src/applications/differential/xaction/DifferentialRevisionTestPlanTransaction.php b/src/applications/differential/xaction/DifferentialRevisionTestPlanTransaction.php index bf2beab3d8..c7c77fbcff 100644 --- a/src/applications/differential/xaction/DifferentialRevisionTestPlanTransaction.php +++ b/src/applications/differential/xaction/DifferentialRevisionTestPlanTransaction.php @@ -1,75 +1,78 @@ getTestPlan(); } public function applyInternalEffects($object, $value) { $object->setTestPlan($value); } public function getTitle() { return pht( '%s edited the test plan for this revision.', $this->renderAuthor()); } public function getTitleForFeed() { return pht( '%s updated the test plan for %s.', $this->renderAuthor(), $this->renderObject()); } public function hasChangeDetailView() { return true; } public function getMailDiffSectionHeader() { return pht('CHANGES TO TEST PLAN'); } public function newChangeDetailView() { $viewer = $this->getViewer(); return id(new PhabricatorApplicationTransactionTextDiffDetailView()) ->setViewer($viewer) ->setOldText($this->getOldValue()) ->setNewText($this->getNewValue()); } public function newRemarkupChanges() { $changes = array(); $changes[] = $this->newRemarkupChange() ->setOldValue($this->getOldValue()) ->setNewValue($this->getNewValue()); return $changes; } public function validateTransactions($object, array $xactions) { - $errors = array(); + $errors = $this->validateCommitMessageCorpusTransactions( + $object, + $xactions, + pht('Test Plan')); $is_required = PhabricatorEnv::getEnvConfig( 'differential.require-test-plan-field'); if ($is_required) { if ($this->isEmptyTextTransaction($object->getTestPlan(), $xactions)) { $errors[] = $this->newRequiredError( pht( 'You must provide a test plan. Describe the actions you '. 'performed to verify the behavior of this change.')); } } return $errors; } }