View Options

	diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
	index 37008db6d3..3a73a982e0 100644
	--- a/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
	+++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
	@@ -1,149 +1,147 @@
	<?php

	final class PhabricatorApplicationTransactionValueController
	extends PhabricatorApplicationTransactionController {

	- private $value;
	- private $phid;
	-
	- public function willProcessRequest(array $data) {
	- $this->phid = $data['phid'];
	- $this->value = $data['value'];
	+ public function shouldAllowPublic() {
	+ return true;
	}

	- public function processRequest() {
	+ public function handleRequest(AphrontRequest $request) {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	+ $phid = $request->getURIData('phid');
	+ $type = $request->getURIData('value');
	+
	$xaction = id(new PhabricatorObjectQuery())
	->setViewer($viewer)
	- ->withPHIDs(array($this->phid))
	+ ->withPHIDs(array($phid))
	->executeOne();
	if (!$xaction) {
	return new Aphront404Response();
	}

	// For now, this pathway only supports policy transactions
	// to show the details of custom policies. If / when this pathway
	// supports more transaction types, rendering coding should be moved
	// into PhabricatorTransactions e.g. feed rendering code.

	// TODO: This should be some kind of "hey do you support this?" thing on
	// the transactions themselves.

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	case PhabricatorRepositoryTransaction::TYPE_PUSH_POLICY:
	break;
	default:
	return new Aphront404Response();
	break;
	}

	- if ($this->value == 'old') {
	+ if ($type == 'old') {
	$value = $xaction->getOldValue();
	} else {
	$value = $xaction->getNewValue();
	}
	+
	$policy = id(new PhabricatorPolicyQuery())
	->setViewer($viewer)
	->withPHIDs(array($value))
	->executeOne();
	if (!$policy) {
	return new Aphront404Response();
	}
	+
	if ($policy->getType() != PhabricatorPolicyType::TYPE_CUSTOM) {
	return new Aphront404Response();
	}

	$rule_objects = array();
	foreach ($policy->getCustomRuleClasses() as $class) {
	$rule_objects[$class] = newv($class, array());
	}
	$policy->attachRuleObjects($rule_objects);

	$this->requireResource('policy-transaction-detail-css');
	$cancel_uri = $this->guessCancelURI($viewer, $xaction);
	- $dialog = id(new AphrontDialogView())
	- ->setUser($viewer)
	+
	+ return $this->newDialog()
	->setTitle($policy->getFullName())
	->setWidth(AphrontDialogView::WIDTH_FORM)
	- ->appendChild(
	- $this->renderPolicyDetails($policy, $rule_objects))
	+ ->appendChild($this->renderPolicyDetails($policy, $rule_objects))
	->addCancelButton($cancel_uri, pht('Close'));
	-
	- return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	private function extractPHIDs(
	PhabricatorPolicy $policy,
	array $rule_objects) {

	$phids = array();
	foreach ($policy->getRules() as $rule) {
	$rule_object = $rule_objects[$rule['rule']];
	$phids[] =
	$rule_object->getRequiredHandlePHIDsForSummary($rule['value']);
	}
	return array_filter(array_mergev($phids));
	}

	private function renderPolicyDetails(
	PhabricatorPolicy $policy,
	array $rule_objects) {
	$details = array();
	$details[] = phutil_tag(
	'p',
	array(
	'class' => 'policy-transaction-detail-intro',
	),
	pht('These rules are processed in order:'));

	foreach ($policy->getRules() as $index => $rule) {
	$rule_object = $rule_objects[$rule['rule']];
	if ($rule['action'] == 'allow') {
	$icon = 'fa-check-circle green';
	} else {
	$icon = 'fa-minus-circle red';
	}
	$icon = id(new PHUIIconView())
	->setIconFont($icon)
	->setText(
	ucfirst($rule['action']).' '.$rule_object->getRuleDescription());

	$handle_phids = $rule_object->getRequiredHandlePHIDsForSummary(
	$rule['value']);
	if ($handle_phids) {
	$value = $this->getViewer()
	->renderHandleList($handle_phids)
	->setAsInline(true);
	} else {
	$value = $rule['value'];
	}

	$details[] = phutil_tag('div',
	array(
	'class' => 'policy-transaction-detail-row',
	),
	array(
	$icon,
	$value,
	));
	}

	$details[] = phutil_tag(
	'p',
	array(
	'class' => 'policy-transaction-detail-end',
	),
	pht(
	'If no rules match, %s all other users.',
	phutil_tag('b',
	array(),
	$policy->getDefaultAction())));
	return $details;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 19:50 (1 w, 4 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1128161
Default Alt Text: (5 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions