No OneTemporary
Actions

Size

67 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/view/DifferentialAddCommentView.php b/src/applications/differential/view/DifferentialAddCommentView.php
	index e61065c4ec..5524869a77 100644
	--- a/src/applications/differential/view/DifferentialAddCommentView.php
	+++ b/src/applications/differential/view/DifferentialAddCommentView.php
	@@ -1,196 +1,198 @@
	<?php

	final class DifferentialAddCommentView extends AphrontView {

	private $revision;
	private $actions;
	private $actionURI;
	private $draft;
	private $reviewers = array();
	private $ccs = array();
	private $errorView;

	public function setInfoView(PHUIInfoView $error_view) {
	$this->errorView = $error_view;
	return $this;
	}

	public function getErrorView() {
	return $this->errorView;
	}

	public function setRevision($revision) {
	$this->revision = $revision;
	return $this;
	}

	public function setActions(array $actions) {
	$this->actions = $actions;
	return $this;
	}

	public function setActionURI($uri) {
	$this->actionURI = $uri;
	return $this;
	}

	public function setDraft(PhabricatorDraft $draft = null) {
	$this->draft = $draft;
	return $this;
	}

	public function setReviewers(array $names) {
	$this->reviewers = $names;
	return $this;
	}

	public function setCCs(array $names) {
	$this->ccs = $names;
	return $this;
	}

	public function render() {

	$this->requireResource('differential-revision-add-comment-css');
	$revision = $this->revision;

	$action = null;
	if ($this->draft) {
	$action = idx($this->draft->getMetadata(), 'action');
	}

	$enable_reviewers = DifferentialAction::allowReviewers($action);
	$enable_ccs = ($action == DifferentialAction::ACTION_ADDCCS);
	$add_reviewers_labels = array(
	'add_reviewers' => pht('Add Reviewers'),
	'request_review' => pht('Add Reviewers'),
	'resign' => pht('Suggest Reviewers'),
	);

	+ $mailable_source = new PhabricatorMetaMTAMailableDatasource();
	+ $reviewer_source = new PhabricatorProjectOrUserDatasource();
	+
	$form = new AphrontFormView();
	$form
	->setWorkflow(true)
	->setUser($this->user)
	->setAction($this->actionURI)
	->addHiddenInput('revision_id', $revision->getID())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Action'))
	->setName('action')
	->setValue($action)
	->setID('comment-action')
	->setOptions($this->actions))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel($enable_reviewers ? $add_reviewers_labels[$action] :
	$add_reviewers_labels['add_reviewers'])
	->setName('reviewers')
	->setControlID('add-reviewers')
	->setControlStyle($enable_reviewers ? null : 'display: none')
	->setID('add-reviewers-tokenizer')
	- ->setDisableBehavior(true))
	+ ->setDisableBehavior(true)
	+ ->setDatasource($reviewer_source))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Add Subscribers'))
	->setName('ccs')
	->setControlID('add-ccs')
	->setControlStyle($enable_ccs ? null : 'display: none')
	->setID('add-ccs-tokenizer')
	- ->setDisableBehavior(true))
	+ ->setDisableBehavior(true)
	+ ->setDatasource($mailable_source))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setName('comment')
	->setID('comment-content')
	->setLabel(pht('Comment'))
	->setValue($this->draft ? $this->draft->getDraft() : null)
	->setUser($this->user))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Submit')));

	- $mailable_source = new PhabricatorMetaMTAMailableDatasource();
	- $reviewer_source = new PhabricatorProjectOrUserDatasource();
	-
	Javelin::initBehavior(
	'differential-add-reviewers-and-ccs',
	array(
	'dynamic' => array(
	'add-reviewers-tokenizer' => array(
	'actions' => array(
	'request_review' => 1,
	'add_reviewers' => 1,
	'resign' => 1,
	),
	'src' => $reviewer_source->getDatasourceURI(),
	'value' => $this->reviewers,
	'row' => 'add-reviewers',
	'labels' => $add_reviewers_labels,
	'placeholder' => $reviewer_source->getPlaceholderText(),
	),
	'add-ccs-tokenizer' => array(
	'actions' => array('add_ccs' => 1),
	'src' => $mailable_source->getDatasourceURI(),
	'value' => $this->ccs,
	'row' => 'add-ccs',
	'placeholder' => $mailable_source->getPlaceholderText(),
	),
	),
	'select' => 'comment-action',
	));

	$diff = $revision->loadActiveDiff();
	$rev_id = $revision->getID();

	Javelin::initBehavior(
	'differential-feedback-preview',
	array(
	'uri' => '/differential/comment/preview/'.$rev_id.'/',
	'preview' => 'comment-preview',
	'action' => 'comment-action',
	'content' => 'comment-content',
	'previewTokenizers' => array(
	'reviewers' => 'add-reviewers-tokenizer',
	'ccs' => 'add-ccs-tokenizer',
	),

	'inlineuri' => '/differential/comment/inline/preview/'.$rev_id.'/',
	'inline' => 'inline-comment-preview',
	));

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$header_text = $is_serious
	? pht('Add Comment')
	: pht('Leap Into Action');

	$header = id(new PHUIHeaderView())
	->setHeader($header_text);

	$anchor = id(new PhabricatorAnchorView())
	->setAnchorName('comment')
	->setNavigationMarker(true);

	$loading = phutil_tag(
	'span',
	array('class' => 'aphront-panel-preview-loading-text'),
	pht('Loading comment preview...'));

	$preview = phutil_tag_div(
	'aphront-panel-preview aphront-panel-flush',
	array(
	phutil_tag('div', array('id' => 'comment-preview'), $loading),
	phutil_tag('div', array('id' => 'inline-comment-preview')),
	));


	$comment_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($anchor)
	->appendChild($form);

	if ($this->errorView) {
	$comment_box->setInfoView($this->errorView);
	}

	return array($comment_box, $preview);
	}
	}
	diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
	index 96d10a77b8..1126cb659d 100644
	--- a/src/applications/diffusion/controller/DiffusionCommitController.php
	+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
	@@ -1,1080 +1,1082 @@
	<?php

	final class DiffusionCommitController extends DiffusionController {

	const CHANGES_LIMIT = 100;

	private $auditAuthorityPHIDs;
	private $highlightedAudits;

	public function shouldAllowPublic() {
	return true;
	}

	protected function shouldLoadDiffusionRequest() {
	return false;
	}

	protected function processDiffusionRequest(AphrontRequest $request) {
	$user = $request->getUser();
	// This controller doesn't use blob/path stuff, just pass the dictionary
	// in directly instead of using the AphrontRequest parsing mechanism.
	$data = $request->getURIMap();
	$data['user'] = $user;
	$drequest = DiffusionRequest::newFromDictionary($data);
	$this->diffusionRequest = $drequest;

	if ($request->getStr('diff')) {
	return $this->buildRawDiffResponse($drequest);
	}

	$repository = $drequest->getRepository();
	$callsign = $repository->getCallsign();

	$content = array();
	$commit = id(new DiffusionCommitQuery())
	->setViewer($request->getUser())
	->withRepository($repository)
	->withIdentifiers(array($drequest->getCommit()))
	->needCommitData(true)
	->needAuditRequests(true)
	->executeOne();

	$crumbs = $this->buildCrumbs(array(
	'commit' => true,
	));

	if (!$commit) {
	$exists = $this->callConduitWithDiffusionRequest(
	'diffusion.existsquery',
	array('commit' => $drequest->getCommit()));
	if (!$exists) {
	return new Aphront404Response();
	}

	$error = id(new PHUIInfoView())
	->setTitle(pht('Commit Still Parsing'))
	->appendChild(
	pht(
	'Failed to load the commit because the commit has not been '.
	'parsed yet.'));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$error,
	),
	array(
	'title' => pht('Commit Still Parsing'),
	));
	}

	$audit_requests = $commit->getAudits();
	$this->auditAuthorityPHIDs =
	PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);

	$commit_data = $commit->getCommitData();
	$is_foreign = $commit_data->getCommitDetail('foreign-svn-stub');
	$changesets = null;
	if ($is_foreign) {
	$subpath = $commit_data->getCommitDetail('svn-subpath');

	$error_panel = new PHUIInfoView();
	$error_panel->setTitle(pht('Commit Not Tracked'));
	$error_panel->setSeverity(PHUIInfoView::SEVERITY_WARNING);
	$error_panel->appendChild(
	pht("This Diffusion repository is configured to track only one ".
	"subdirectory of the entire Subversion repository, and this commit ".
	"didn't affect the tracked subdirectory ('%s'), so no ".
	"information is available.", $subpath));
	$content[] = $error_panel;
	} else {
	$engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();
	$engine->setConfig('viewer', $user);

	require_celerity_resource('phabricator-remarkup-css');

	$parents = $this->callConduitWithDiffusionRequest(
	'diffusion.commitparentsquery',
	array('commit' => $drequest->getCommit()));

	if ($parents) {
	$parents = id(new DiffusionCommitQuery())
	->setViewer($user)
	->withRepository($repository)
	->withIdentifiers($parents)
	->execute();
	}

	$headsup_view = id(new PHUIHeaderView())
	->setHeader(nonempty($commit->getSummary(), pht('Commit Detail')));

	$headsup_actions = $this->renderHeadsupActionList($commit, $repository);

	$commit_properties = $this->loadCommitProperties(
	$commit,
	$commit_data,
	$parents,
	$audit_requests);
	$property_list = id(new PHUIPropertyListView())
	->setHasKeyboardShortcuts(true)
	->setUser($user)
	->setObject($commit);
	foreach ($commit_properties as $key => $value) {
	$property_list->addProperty($key, $value);
	}

	$message = $commit_data->getCommitMessage();

	$revision = $commit->getCommitIdentifier();
	$message = $this->linkBugtraq($message);

	$message = $engine->markupText($message);

	$property_list->invokeWillRenderEvent();
	$property_list->setActionList($headsup_actions);

	$detail_list = new PHUIPropertyListView();
	$detail_list->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$detail_list->addTextContent(
	phutil_tag(
	'div',
	array(
	'class' => 'diffusion-commit-message phabricator-remarkup',
	),
	$message));

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($headsup_view)
	->addPropertyList($property_list)
	->addPropertyList($detail_list);

	$content[] = $object_box;
	}

	$content[] = $this->buildComments($commit);

	$hard_limit = 1000;

	if ($commit->isImported()) {
	$change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
	$drequest);
	$change_query->setLimit($hard_limit + 1);
	$changes = $change_query->loadChanges();
	} else {
	$changes = array();
	}

	$was_limited = (count($changes) > $hard_limit);
	if ($was_limited) {
	$changes = array_slice($changes, 0, $hard_limit);
	}

	$content[] = $this->buildMergesTable($commit);

	$highlighted_audits = $commit->getAuthorityAudits(
	$user,
	$this->auditAuthorityPHIDs);

	$owners_paths = array();
	if ($highlighted_audits) {
	$packages = id(new PhabricatorOwnersPackage())->loadAllWhere(
	'phid IN (%Ls)',
	mpull($highlighted_audits, 'getAuditorPHID'));
	if ($packages) {
	$owners_paths = id(new PhabricatorOwnersPath())->loadAllWhere(
	'repositoryPHID = %s AND packageID IN (%Ld)',
	$repository->getPHID(),
	mpull($packages, 'getID'));
	}
	}

	$change_table = new DiffusionCommitChangeTableView();
	$change_table->setDiffusionRequest($drequest);
	$change_table->setPathChanges($changes);
	$change_table->setOwnersPaths($owners_paths);

	$count = count($changes);

	$bad_commit = null;
	if ($count == 0) {
	$bad_commit = queryfx_one(
	id(new PhabricatorRepository())->establishConnection('r'),
	'SELECT * FROM %T WHERE fullCommitName = %s',
	PhabricatorRepository::TABLE_BADCOMMIT,
	'r'.$callsign.$commit->getCommitIdentifier());
	}

	if ($bad_commit) {
	$content[] = $this->renderStatusMessage(
	pht('Bad Commit'),
	$bad_commit['description']);
	} else if ($is_foreign) {
	// Don't render anything else.
	} else if (!$commit->isImported()) {
	$content[] = $this->renderStatusMessage(
	pht('Still Importing...'),
	pht(
	'This commit is still importing. Changes will be visible once '.
	'the import finishes.'));
	} else if (!count($changes)) {
	$content[] = $this->renderStatusMessage(
	pht('Empty Commit'),
	pht(
	'This commit is empty and does not affect any paths.'));
	} else if ($was_limited) {
	$content[] = $this->renderStatusMessage(
	pht('Enormous Commit'),
	pht(
	'This commit is enormous, and affects more than %d files. '.
	'Changes are not shown.',
	$hard_limit));
	} else {
	// The user has clicked "Show All Changes", and we should show all the
	// changes inline even if there are more than the soft limit.
	$show_all_details = $request->getBool('show_all');

	$change_panel = new PHUIObjectBoxView();
	$header = new PHUIHeaderView();
	$header->setHeader('Changes ('.number_format($count).')');
	$change_panel->setID('toc');
	if ($count > self::CHANGES_LIMIT && !$show_all_details) {

	$icon = id(new PHUIIconView())
	->setIconFont('fa-files-o');

	$button = id(new PHUIButtonView())
	->setText(pht('Show All Changes'))
	->setHref('?show_all=true')
	->setTag('a')
	->setIcon($icon);

	$warning_view = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setTitle('Very Large Commit')
	->appendChild(
	pht('This commit is very large. Load each file individually.'));

	$change_panel->setInfoView($warning_view);
	$header->addActionLink($button);
	}

	$change_panel->appendChild($change_table);
	$change_panel->setHeader($header);

	$content[] = $change_panel;

	$changesets = DiffusionPathChange::convertToDifferentialChangesets(
	$user,
	$changes);

	$vcs = $repository->getVersionControlSystem();
	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$vcs_supports_directory_changes = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$vcs_supports_directory_changes = false;
	break;
	default:
	throw new Exception('Unknown VCS.');
	}

	$references = array();
	foreach ($changesets as $key => $changeset) {
	$file_type = $changeset->getFileType();
	if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
	if (!$vcs_supports_directory_changes) {
	unset($changesets[$key]);
	continue;
	}
	}

	$references[$key] = $drequest->generateURI(
	array(
	'action' => 'rendering-ref',
	'path' => $changeset->getFilename(),
	));
	}

	// TODO: Some parts of the views still rely on properties of the
	// DifferentialChangeset. Make the objects ephemeral to make sure we don't
	// accidentally save them, and then set their ID to the appropriate ID for
	// this application (the path IDs).
	$path_ids = array_flip(mpull($changes, 'getPath'));
	foreach ($changesets as $changeset) {
	$changeset->makeEphemeral();
	$changeset->setID($path_ids[$changeset->getFilename()]);
	}

	if ($count <= self::CHANGES_LIMIT \|\| $show_all_details) {
	$visible_changesets = $changesets;
	} else {
	$visible_changesets = array();
	$inlines = PhabricatorAuditInlineComment::loadDraftAndPublishedComments(
	$user,
	$commit->getPHID());
	$path_ids = mpull($inlines, null, 'getPathID');
	foreach ($changesets as $key => $changeset) {
	if (array_key_exists($changeset->getID(), $path_ids)) {
	$visible_changesets[$key] = $changeset;
	}
	}
	}

	$change_list_title = DiffusionView::nameCommit(
	$repository,
	$commit->getCommitIdentifier());
	$change_list = new DifferentialChangesetListView();
	$change_list->setTitle($change_list_title);
	$change_list->setChangesets($changesets);
	$change_list->setVisibleChangesets($visible_changesets);
	$change_list->setRenderingReferences($references);
	$change_list->setRenderURI('/diffusion/'.$callsign.'/diff/');
	$change_list->setRepository($repository);
	$change_list->setUser($user);

	// TODO: Try to setBranch() to something reasonable here?

	$change_list->setStandaloneURI(
	'/diffusion/'.$callsign.'/diff/');
	$change_list->setRawFileURIs(
	// TODO: Implement this, somewhat tricky if there's an octopus merge
	// or whatever?
	null,
	'/diffusion/'.$callsign.'/diff/?view=r');

	$change_list->setInlineCommentControllerURI(
	'/diffusion/inline/edit/'.phutil_escape_uri($commit->getPHID()).'/');

	$change_references = array();
	foreach ($changesets as $key => $changeset) {
	$change_references[$changeset->getID()] = $references[$key];
	}
	$change_table->setRenderingReferences($change_references);

	$content[] = $change_list->render();
	}

	$content[] = $this->renderAddCommentPanel($commit, $audit_requests);

	$commit_id = 'r'.$callsign.$commit->getCommitIdentifier();
	$short_name = DiffusionView::nameCommit(
	$repository,
	$commit->getCommitIdentifier());

	$prefs = $user->loadPreferences();
	$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
	$pref_collapse = PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED;
	$show_filetree = $prefs->getPreference($pref_filetree);
	$collapsed = $prefs->getPreference($pref_collapse);

	if ($changesets && $show_filetree) {
	$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
	->setTitle($short_name)
	->setBaseURI(new PhutilURI('/'.$commit_id))
	->build($changesets)
	->setCrumbs($crumbs)
	->setCollapsed((bool)$collapsed)
	->appendChild($content);
	$content = $nav;
	} else {
	$content = array($crumbs, $content);
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $commit_id,
	'pageObjects' => array($commit->getPHID()),
	));
	}

	private function loadCommitProperties(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepositoryCommitData $data,
	array $parents,
	array $audit_requests) {

	assert_instances_of($parents, 'PhabricatorRepositoryCommit');
	$viewer = $this->getRequest()->getUser();
	$commit_phid = $commit->getPHID();
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$edge_query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($commit_phid))
	->withEdgeTypes(array(
	DiffusionCommitHasTaskEdgeType::EDGECONST,
	DiffusionCommitHasRevisionEdgeType::EDGECONST,
	DiffusionCommitRevertsCommitEdgeType::EDGECONST,
	DiffusionCommitRevertedByCommitEdgeType::EDGECONST,
	));

	$edges = $edge_query->execute();

	$task_phids = array_keys(
	$edges[$commit_phid][DiffusionCommitHasTaskEdgeType::EDGECONST]);
	$revision_phid = key(
	$edges[$commit_phid][DiffusionCommitHasRevisionEdgeType::EDGECONST]);

	$reverts_phids = array_keys(
	$edges[$commit_phid][DiffusionCommitRevertsCommitEdgeType::EDGECONST]);
	$reverted_by_phids = array_keys(
	$edges[$commit_phid][DiffusionCommitRevertedByCommitEdgeType::EDGECONST]);

	$phids = $edge_query->getDestinationPHIDs(array($commit_phid));

	if ($data->getCommitDetail('authorPHID')) {
	$phids[] = $data->getCommitDetail('authorPHID');
	}
	if ($data->getCommitDetail('reviewerPHID')) {
	$phids[] = $data->getCommitDetail('reviewerPHID');
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[] = $data->getCommitDetail('committerPHID');
	}
	if ($parents) {
	foreach ($parents as $parent) {
	$phids[] = $parent->getPHID();
	}
	}

	// NOTE: We should never normally have more than a single push log, but
	// it can occur naturally if a commit is pushed, then the branch it was
	// on is deleted, then the commit is pushed again (or through other similar
	// chains of events). This should be rare, but does not indicate a bug
	// or data issue.

	// NOTE: We never query push logs in SVN because the commiter is always
	// the pusher and the commit time is always the push time; the push log
	// is redundant and we save a query by skipping it.

	$push_logs = array();
	if ($repository->isHosted() && !$repository->isSVN()) {
	$push_logs = id(new PhabricatorRepositoryPushLogQuery())
	->setViewer($viewer)
	->withRepositoryPHIDs(array($repository->getPHID()))
	->withNewRefs(array($commit->getCommitIdentifier()))
	->withRefTypes(array(PhabricatorRepositoryPushLog::REFTYPE_COMMIT))
	->execute();
	foreach ($push_logs as $log) {
	$phids[] = $log->getPusherPHID();
	}
	}

	$handles = array();
	if ($phids) {
	$handles = $this->loadViewerHandles($phids);
	}

	$props = array();

	if ($commit->getAuditStatus()) {
	$status = PhabricatorAuditCommitStatusConstants::getStatusName(
	$commit->getAuditStatus());
	$tag = id(new PHUITagView())
	->setType(PHUITagView::TYPE_STATE)
	->setName($status);

	switch ($commit->getAuditStatus()) {
	case PhabricatorAuditCommitStatusConstants::NEEDS_AUDIT:
	$tag->setBackgroundColor(PHUITagView::COLOR_ORANGE);
	break;
	case PhabricatorAuditCommitStatusConstants::CONCERN_RAISED:
	$tag->setBackgroundColor(PHUITagView::COLOR_RED);
	break;
	case PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED:
	$tag->setBackgroundColor(PHUITagView::COLOR_BLUE);
	break;
	case PhabricatorAuditCommitStatusConstants::FULLY_AUDITED:
	$tag->setBackgroundColor(PHUITagView::COLOR_GREEN);
	break;
	}

	$props['Status'] = $tag;
	}

	if ($audit_requests) {
	$user_requests = array();
	$other_requests = array();
	foreach ($audit_requests as $audit_request) {
	if ($audit_request->isUser()) {
	$user_requests[] = $audit_request;
	} else {
	$other_requests[] = $audit_request;
	}
	}

	if ($user_requests) {
	$props['Auditors'] = $this->renderAuditStatusView(
	$user_requests);
	}

	if ($other_requests) {
	$props['Project/Package Auditors'] = $this->renderAuditStatusView(
	$other_requests);
	}
	}

	$author_phid = $data->getCommitDetail('authorPHID');
	$author_name = $data->getAuthorName();

	if (!$repository->isSVN()) {
	$authored_info = id(new PHUIStatusItemView());
	// TODO: In Git, a distinct authorship date is available. When present,
	// we should show it here.

	if ($author_phid) {
	$authored_info->setTarget($handles[$author_phid]->renderLink());
	} else if (strlen($author_name)) {
	$authored_info->setTarget($author_name);
	}

	$props['Authored'] = id(new PHUIStatusListView())
	->addItem($authored_info);
	}

	$committed_info = id(new PHUIStatusItemView())
	->setNote(phabricator_datetime($commit->getEpoch(), $viewer));

	$committer_phid = $data->getCommitDetail('committerPHID');
	$committer_name = $data->getCommitDetail('committer');
	if ($committer_phid) {
	$committed_info->setTarget($handles[$committer_phid]->renderLink());
	} else if (strlen($committer_name)) {
	$committed_info->setTarget($committer_name);
	} else if ($author_phid) {
	$committed_info->setTarget($handles[$author_phid]->renderLink());
	} else if (strlen($author_name)) {
	$committed_info->setTarget($author_name);
	}

	$props['Committed'] = id(new PHUIStatusListView())
	->addItem($committed_info);

	if ($push_logs) {
	$pushed_list = new PHUIStatusListView();

	foreach ($push_logs as $push_log) {
	$pushed_item = id(new PHUIStatusItemView())
	->setTarget($handles[$push_log->getPusherPHID()]->renderLink())
	->setNote(phabricator_datetime($push_log->getEpoch(), $viewer));
	$pushed_list->addItem($pushed_item);
	}

	$props['Pushed'] = $pushed_list;
	}

	$reviewer_phid = $data->getCommitDetail('reviewerPHID');
	if ($reviewer_phid) {
	$props['Reviewer'] = $handles[$reviewer_phid]->renderLink();
	}

	if ($revision_phid) {
	$props['Differential Revision'] = $handles[$revision_phid]->renderLink();
	}

	if ($parents) {
	$parent_links = array();
	foreach ($parents as $parent) {
	$parent_links[] = $handles[$parent->getPHID()]->renderLink();
	}
	$props['Parents'] = phutil_implode_html(" \xC2\xB7 ", $parent_links);
	}

	$props['Branches'] = phutil_tag(
	'span',
	array(
	'id' => 'commit-branches',
	),
	pht('Unknown'));
	$props['Tags'] = phutil_tag(
	'span',
	array(
	'id' => 'commit-tags',
	),
	pht('Unknown'));

	$callsign = $repository->getCallsign();
	$root = '/diffusion/'.$callsign.'/commit/'.$commit->getCommitIdentifier();
	Javelin::initBehavior(
	'diffusion-commit-branches',
	array(
	$root.'/branches/' => 'commit-branches',
	$root.'/tags/' => 'commit-tags',
	));

	$refs = $this->buildRefs($drequest);
	if ($refs) {
	$props['References'] = $refs;
	}

	if ($reverts_phids) {
	$props[pht('Reverts')] = $viewer->renderHandleList($reverts_phids);
	}

	if ($reverted_by_phids) {
	$props[pht('Reverted By')] = $viewer->renderHandleList(
	$reverted_by_phids);
	}

	if ($task_phids) {
	$task_list = array();
	foreach ($task_phids as $phid) {
	$task_list[] = $handles[$phid]->renderLink();
	}
	$task_list = phutil_implode_html(phutil_tag('br'), $task_list);
	$props['Tasks'] = $task_list;
	}

	return $props;
	}

	private function buildComments(PhabricatorRepositoryCommit $commit) {
	$timeline = $this->buildTransactionTimeline(
	$commit,
	new PhabricatorAuditTransactionQuery());
	$commit->willRenderTimeline($timeline, $this->getRequest());
	return $timeline;
	}

	private function renderAddCommentPanel(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');

	$request = $this->getRequest();
	$user = $request->getUser();

	if (!$user->isLoggedIn()) {
	return id(new PhabricatorApplicationTransactionCommentView())
	->setUser($user)
	->setRequestURI($request->getRequestURI());
	}

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	$pane_id = celerity_generate_unique_node_id();
	Javelin::initBehavior(
	'differential-keyboard-navigation',
	array(
	'haunt' => $pane_id,
	));

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$user->getPHID(),
	'diffusion-audit-'.$commit->getID());
	if ($draft) {
	$draft = $draft->getDraft();
	} else {
	$draft = null;
	}

	$actions = $this->getAuditActions($commit, $audit_requests);

	+ $mailable_source = new PhabricatorMetaMTAMailableDatasource();
	+ $auditor_source = new DiffusionAuditorDatasource();
	+
	$form = id(new AphrontFormView())
	->setUser($user)
	->setAction('/audit/addcomment/')
	->addHiddenInput('commit', $commit->getPHID())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Action'))
	->setName('action')
	->setID('audit-action')
	->setOptions($actions))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Add Auditors'))
	->setName('auditors')
	->setControlID('add-auditors')
	->setControlStyle('display: none')
	->setID('add-auditors-tokenizer')
	- ->setDisableBehavior(true))
	+ ->setDisableBehavior(true)
	+ ->setDatasource($auditor_source))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Add CCs'))
	->setName('ccs')
	->setControlID('add-ccs')
	->setControlStyle('display: none')
	->setID('add-ccs-tokenizer')
	- ->setDisableBehavior(true))
	+ ->setDisableBehavior(true)
	+ ->setDatasource($mailable_source))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setLabel(pht('Comments'))
	->setName('content')
	->setValue($draft)
	->setID('audit-content')
	->setUser($user))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Submit')));

	$header = new PHUIHeaderView();
	$header->setHeader(
	$is_serious ? pht('Audit Commit') : pht('Creative Accounting'));

	- $mailable_source = new PhabricatorMetaMTAMailableDatasource();
	- $auditor_source = new DiffusionAuditorDatasource();
	-
	Javelin::initBehavior(
	'differential-add-reviewers-and-ccs',
	array(
	'dynamic' => array(
	'add-auditors-tokenizer' => array(
	'actions' => array('add_auditors' => 1),
	'src' => $auditor_source->getDatasourceURI(),
	'row' => 'add-auditors',
	'placeholder' => $auditor_source->getPlaceholderText(),
	),
	'add-ccs-tokenizer' => array(
	'actions' => array('add_ccs' => 1),
	'src' => $mailable_source->getDatasourceURI(),
	'row' => 'add-ccs',
	'placeholder' => $mailable_source->getPlaceholderText(),
	),
	),
	'select' => 'audit-action',
	));

	Javelin::initBehavior('differential-feedback-preview', array(
	'uri' => '/audit/preview/'.$commit->getID().'/',
	'preview' => 'audit-preview',
	'content' => 'audit-content',
	'action' => 'audit-action',
	'previewTokenizers' => array(
	'auditors' => 'add-auditors-tokenizer',
	'ccs' => 'add-ccs-tokenizer',
	),
	'inline' => 'inline-comment-preview',
	'inlineuri' => '/diffusion/inline/preview/'.$commit->getPHID().'/',
	));

	$loading = phutil_tag_div(
	'aphront-panel-preview-loading-text',
	pht('Loading preview...'));

	$preview_panel = phutil_tag_div(
	'aphront-panel-preview aphront-panel-flush',
	array(
	phutil_tag('div', array('id' => 'audit-preview'), $loading),
	phutil_tag('div', array('id' => 'inline-comment-preview')),
	));

	// TODO: This is pretty awkward, unify the CSS between Diffusion and
	// Differential better.
	require_celerity_resource('differential-core-view-css');

	$anchor = id(new PhabricatorAnchorView())
	->setAnchorName('comment')
	->setNavigationMarker(true)
	->render();

	$comment_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->appendChild($form);

	return phutil_tag(
	'div',
	array(
	'id' => $pane_id,
	),
	phutil_tag_div(
	'differential-add-comment-panel',
	array($anchor, $comment_box, $preview_panel)));
	}

	/**
	* Return a map of available audit actions for rendering into a <select />.
	* This shows the user valid actions, and does not show nonsense/invalid
	* actions (like closing an already-closed commit, or resigning from a commit
	* you have no association with).
	*/
	private function getAuditActions(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$user = $this->getRequest()->getUser();

	$user_is_author = ($commit->getAuthorPHID() == $user->getPHID());

	$user_request = null;
	foreach ($audit_requests as $audit_request) {
	if ($audit_request->getAuditorPHID() == $user->getPHID()) {
	$user_request = $audit_request;
	break;
	}
	}

	$actions = array();
	$actions[PhabricatorAuditActionConstants::COMMENT] = true;
	$actions[PhabricatorAuditActionConstants::ADD_CCS] = true;
	$actions[PhabricatorAuditActionConstants::ADD_AUDITORS] = true;

	// We allow you to accept your own commits. A use case here is that you
	// notice an issue with your own commit and "Raise Concern" as an indicator
	// to other auditors that you're on top of the issue, then later resolve it
	// and "Accept". You can not accept on behalf of projects or packages,
	// however.
	$actions[PhabricatorAuditActionConstants::ACCEPT] = true;
	$actions[PhabricatorAuditActionConstants::CONCERN] = true;


	// To resign, a user must have authority on some request and not be the
	// commit's author.
	if (!$user_is_author) {
	$may_resign = false;

	$authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);
	foreach ($audit_requests as $request) {
	if (empty($authority_map[$request->getAuditorPHID()])) {
	continue;
	}
	$may_resign = true;
	break;
	}

	// If the user has already resigned, don't show "Resign...".
	$status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
	if ($user_request) {
	if ($user_request->getAuditStatus() == $status_resigned) {
	$may_resign = false;
	}
	}

	if ($may_resign) {
	$actions[PhabricatorAuditActionConstants::RESIGN] = true;
	}
	}

	$status_concern = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
	$concern_raised = ($commit->getAuditStatus() == $status_concern);
	$can_close_option = PhabricatorEnv::getEnvConfig(
	'audit.can-author-close-audit');
	if ($can_close_option && $user_is_author && $concern_raised) {
	$actions[PhabricatorAuditActionConstants::CLOSE] = true;
	}

	foreach ($actions as $constant => $ignored) {
	$actions[$constant] =
	PhabricatorAuditActionConstants::getActionName($constant);
	}

	return $actions;
	}

	private function buildMergesTable(PhabricatorRepositoryCommit $commit) {
	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();

	$vcs = $repository->getVersionControlSystem();
	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	// These aren't supported under SVN.
	return null;
	}

	$limit = 50;

	$merges = $this->callConduitWithDiffusionRequest(
	'diffusion.mergedcommitsquery',
	array(
	'commit' => $drequest->getCommit(),
	'limit' => $limit + 1,
	));

	if (!$merges) {
	return null;
	}
	$merges = DiffusionPathChange::newFromConduit($merges);

	$caption = null;
	if (count($merges) > $limit) {
	$merges = array_slice($merges, 0, $limit);
	$caption = new PHUIInfoView();
	$caption->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$caption->appendChild(
	pht(
	'This commit merges a very large number of changes. Only the first '.
	'%s are shown.',
	new PhutilNumber($limit)));
	}

	$history_table = new DiffusionHistoryTableView();
	$history_table->setUser($this->getRequest()->getUser());
	$history_table->setDiffusionRequest($drequest);
	$history_table->setHistory($merges);
	$history_table->loadRevisions();

	$phids = $history_table->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$history_table->setHandles($handles);

	$panel = new PHUIObjectBoxView();
	$panel->setHeaderText(pht('Merged Changes'));
	$panel->appendChild($history_table);
	if ($caption) {
	$panel->setInfoView($caption);
	}

	return $panel;
	}

	private function renderHeadsupActionList(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepository $repository) {

	$request = $this->getRequest();
	$user = $request->getUser();

	$actions = id(new PhabricatorActionListView())
	->setUser($user)
	->setObject($commit)
	->setObjectURI($request->getRequestURI());

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$user,
	$commit,
	PhabricatorPolicyCapability::CAN_EDIT);

	$uri = '/diffusion/'.$repository->getCallsign().'/commit/'.
	$commit->getCommitIdentifier().'/edit/';

	$action = id(new PhabricatorActionView())
	->setName(pht('Edit Commit'))
	->setHref($uri)
	->setIcon('fa-pencil')
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);
	$actions->addAction($action);

	require_celerity_resource('phabricator-object-selector-css');
	require_celerity_resource('javelin-behavior-phabricator-object-selector');

	$maniphest = 'PhabricatorManiphestApplication';
	if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$action = id(new PhabricatorActionView())
	->setName(pht('Edit Maniphest Tasks'))
	->setIcon('fa-anchor')
	->setHref('/search/attach/'.$commit->getPHID().'/TASK/edge/')
	->setWorkflow(true)
	->setDisabled(!$can_edit);
	$actions->addAction($action);
	}

	$action = id(new PhabricatorActionView())
	->setName(pht('Download Raw Diff'))
	->setHref($request->getRequestURI()->alter('diff', true))
	->setIcon('fa-download');
	$actions->addAction($action);

	return $actions;
	}

	private function buildRefs(DiffusionRequest $request) {
	// this is git-only, so save a conduit round trip and just get out of
	// here if the repository isn't git
	$type_git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
	$repository = $request->getRepository();
	if ($repository->getVersionControlSystem() != $type_git) {
	return null;
	}

	$results = $this->callConduitWithDiffusionRequest(
	'diffusion.refsquery',
	array('commit' => $request->getCommit()));
	$ref_links = array();
	foreach ($results as $ref_data) {
	$ref_links[] = phutil_tag('a',
	array('href' => $ref_data['href']),
	$ref_data['ref']);
	}
	return phutil_implode_html(', ', $ref_links);
	}

	private function buildRawDiffResponse(DiffusionRequest $drequest) {
	$raw_diff = $this->callConduitWithDiffusionRequest(
	'diffusion.rawdiffquery',
	array(
	'commit' => $drequest->getCommit(),
	'path' => $drequest->getPath(),
	));

	$file = PhabricatorFile::buildFromFileDataOrHash(
	$raw_diff,
	array(
	'name' => $drequest->getCommit().'.diff',
	'ttl' => (60 * 60 * 24),
	'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
	));

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$file->attachToObject($drequest->getRepository()->getPHID());
	unset($unguarded);

	return $file->getRedirectResponse();
	}

	private function renderAuditStatusView(array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$viewer = $this->getViewer();

	$authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);

	$view = new PHUIStatusListView();
	foreach ($audit_requests as $request) {
	$code = $request->getAuditStatus();
	$item = new PHUIStatusItemView();
	$item->setIcon(
	PhabricatorAuditStatusConstants::getStatusIcon($code),
	PhabricatorAuditStatusConstants::getStatusColor($code),
	PhabricatorAuditStatusConstants::getStatusName($code));

	$note = array();
	foreach ($request->getAuditReasons() as $reason) {
	$note[] = phutil_tag('div', array(), $reason);
	}
	$item->setNote($note);

	$auditor_phid = $request->getAuditorPHID();
	$target = $viewer->renderHandle($auditor_phid);
	$item->setTarget($target);

	if (isset($authority_map[$auditor_phid])) {
	$item->setHighlighted(true);
	}

	$view->addItem($item);
	}

	return $view;
	}

	private function linkBugtraq($corpus) {
	$url = PhabricatorEnv::getEnvConfig('bugtraq.url');
	if (!strlen($url)) {
	return $corpus;
	}

	$regexes = PhabricatorEnv::getEnvConfig('bugtraq.logregex');
	if (!$regexes) {
	return $corpus;
	}

	$parser = id(new PhutilBugtraqParser())
	->setBugtraqPattern("[[ {$url} \| %BUGID% ]]")
	->setBugtraqCaptureExpression(array_shift($regexes));

	$select = array_shift($regexes);
	if ($select) {
	$parser->setBugtraqSelectExpression($select);
	}

	return $parser->processCorpus($corpus);
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	index 24c98ba24f..0806f38aaa 100644
	--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	@@ -1,588 +1,591 @@
	<?php

	final class ManiphestTaskDetailController extends ManiphestController {

	private $id;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$this->id = $data['id'];
	}

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$e_title = null;

	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();

	$task = id(new ManiphestTaskQuery())
	->setViewer($user)
	->withIDs(array($this->id))
	->needSubscriberPHIDs(true)
	->executeOne();
	if (!$task) {
	return new Aphront404Response();
	}

	$workflow = $request->getStr('workflow');
	$parent_task = null;
	if ($workflow && is_numeric($workflow)) {
	$parent_task = id(new ManiphestTaskQuery())
	->setViewer($user)
	->withIDs(array($workflow))
	->executeOne();
	}

	$field_list = PhabricatorCustomField::getObjectFields(
	$task,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list
	->setViewer($user)
	->readFieldsFromStorage($task);

	$e_commit = ManiphestTaskHasCommitEdgeType::EDGECONST;
	$e_dep_on = ManiphestTaskDependsOnTaskEdgeType::EDGECONST;
	$e_dep_by = ManiphestTaskDependedOnByTaskEdgeType::EDGECONST;
	$e_rev = ManiphestTaskHasRevisionEdgeType::EDGECONST;
	$e_mock = ManiphestTaskHasMockEdgeType::EDGECONST;

	$phid = $task->getPHID();

	$query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs(array($phid))
	->withEdgeTypes(
	array(
	$e_commit,
	$e_dep_on,
	$e_dep_by,
	$e_rev,
	$e_mock,
	));
	$edges = idx($query->execute(), $phid);
	$phids = array_fill_keys($query->getDestinationPHIDs(), true);

	if ($task->getOwnerPHID()) {
	$phids[$task->getOwnerPHID()] = true;
	}
	$phids[$task->getAuthorPHID()] = true;

	$attached = $task->getAttached();
	foreach ($attached as $type => $list) {
	foreach ($list as $phid => $info) {
	$phids[$phid] = true;
	}
	}

	if ($parent_task) {
	$phids[$parent_task->getPHID()] = true;
	}

	$phids = array_keys($phids);
	$handles = $user->loadHandles($phids);

	$info_view = null;
	if ($parent_task) {
	$info_view = new PHUIInfoView();
	$info_view->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$info_view->addButton(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref('/maniphest/task/create/?parent='.$parent_task->getID())
	->setText(pht('Create Another Subtask')));

	$info_view->appendChild(hsprintf(
	'Created a subtask of <strong>%s</strong>.',
	$handles->renderHandle($parent_task->getPHID())));
	} else if ($workflow == 'create') {
	$info_view = new PHUIInfoView();
	$info_view->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	$info_view->addButton(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref('/maniphest/task/create/?template='.$task->getID())
	->setText(pht('Similar Task')));
	$info_view->addButton(
	id(new PHUIButtonView())
	->setTag('a')
	->setHref('/maniphest/task/create/')
	->setText(pht('Empty Task')));
	$info_view->appendChild(pht('New task created. Create another?'));
	}

	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($user);
	$engine->setContextObject($task);
	$engine->addObject($task, ManiphestTask::MARKUP_FIELD_DESCRIPTION);

	$timeline = $this->buildTransactionTimeline(
	$task,
	new ManiphestTransactionQuery(),
	$engine);

	$resolution_types = ManiphestTaskStatus::getTaskStatusMap();

	$transaction_types = array(
	PhabricatorTransactions::TYPE_COMMENT => pht('Comment'),
	ManiphestTransaction::TYPE_STATUS => pht('Change Status'),
	ManiphestTransaction::TYPE_OWNER => pht('Reassign / Claim'),
	PhabricatorTransactions::TYPE_SUBSCRIBERS => pht('Add CCs'),
	ManiphestTransaction::TYPE_PRIORITY => pht('Change Priority'),
	PhabricatorTransactions::TYPE_EDGE => pht('Associate Projects'),
	);

	// Remove actions the user doesn't have permission to take.

	$requires = array(
	ManiphestTransaction::TYPE_OWNER =>
	ManiphestEditAssignCapability::CAPABILITY,
	ManiphestTransaction::TYPE_PRIORITY =>
	ManiphestEditPriorityCapability::CAPABILITY,
	PhabricatorTransactions::TYPE_EDGE =>
	ManiphestEditProjectsCapability::CAPABILITY,
	ManiphestTransaction::TYPE_STATUS =>
	ManiphestEditStatusCapability::CAPABILITY,
	);

	foreach ($transaction_types as $type => $name) {
	if (isset($requires[$type])) {
	if (!$this->hasApplicationCapability($requires[$type])) {
	unset($transaction_types[$type]);
	}
	}
	}

	// Don't show an option to change to the current status, or to change to
	// the duplicate status explicitly.
	unset($resolution_types[$task->getStatus()]);
	unset($resolution_types[ManiphestTaskStatus::getDuplicateStatus()]);

	// Don't show owner/priority changes for closed tasks, as they don't make
	// much sense.
	if ($task->isClosed()) {
	unset($transaction_types[ManiphestTransaction::TYPE_PRIORITY]);
	unset($transaction_types[ManiphestTransaction::TYPE_OWNER]);
	}

	$default_claim = array(
	$user->getPHID() => $user->getUsername().' ('.$user->getRealName().')',
	);

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$user->getPHID(),
	$task->getPHID());
	if ($draft) {
	$draft_text = $draft->getDraft();
	} else {
	$draft_text = null;
	}

	+ $projects_source = new PhabricatorProjectDatasource();
	+ $users_source = new PhabricatorPeopleDatasource();
	+ $mailable_source = new PhabricatorMetaMTAMailableDatasource();
	+
	$comment_form = new AphrontFormView();
	$comment_form
	->setUser($user)
	->setWorkflow(true)
	->setAction('/maniphest/transaction/save/')
	->setEncType('multipart/form-data')
	->addHiddenInput('taskID', $task->getID())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Action'))
	->setName('action')
	->setOptions($transaction_types)
	->setID('transaction-action'))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Status'))
	->setName('resolution')
	->setControlID('resolution')
	->setControlStyle('display: none')
	->setOptions($resolution_types))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Assign To'))
	->setName('assign_to')
	->setControlID('assign_to')
	->setControlStyle('display: none')
	->setID('assign-tokenizer')
	- ->setDisableBehavior(true))
	+ ->setDisableBehavior(true)
	+ ->setDatasource($users_source))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('CCs'))
	->setName('ccs')
	->setControlID('ccs')
	->setControlStyle('display: none')
	->setID('cc-tokenizer')
	- ->setDisableBehavior(true))
	+ ->setDisableBehavior(true)
	+ ->setDatasource($mailable_source))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Priority'))
	->setName('priority')
	->setOptions($priority_map)
	->setControlID('priority')
	->setControlStyle('display: none')
	->setValue($task->getPriority()))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setControlID('projects')
	->setControlStyle('display: none')
	->setID('projects-tokenizer')
	- ->setDisableBehavior(true))
	+ ->setDisableBehavior(true)
	+ ->setDatasource($projects_source))
	->appendChild(
	id(new AphrontFormFileControl())
	->setLabel(pht('File'))
	->setName('file')
	->setControlID('file')
	->setControlStyle('display: none'))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setUser($user)
	->setLabel(pht('Comments'))
	->setName('comments')
	->setValue($draft_text)
	->setID('transaction-comments')
	->setUser($user))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Submit')));

	$control_map = array(
	ManiphestTransaction::TYPE_STATUS => 'resolution',
	ManiphestTransaction::TYPE_OWNER => 'assign_to',
	PhabricatorTransactions::TYPE_SUBSCRIBERS => 'ccs',
	ManiphestTransaction::TYPE_PRIORITY => 'priority',
	PhabricatorTransactions::TYPE_EDGE => 'projects',
	);

	- $projects_source = new PhabricatorProjectDatasource();
	- $users_source = new PhabricatorPeopleDatasource();
	- $mailable_source = new PhabricatorMetaMTAMailableDatasource();
	-
	$tokenizer_map = array(
	PhabricatorTransactions::TYPE_EDGE => array(
	'id' => 'projects-tokenizer',
	'src' => $projects_source->getDatasourceURI(),
	'placeholder' => $projects_source->getPlaceholderText(),
	),
	ManiphestTransaction::TYPE_OWNER => array(
	'id' => 'assign-tokenizer',
	'src' => $users_source->getDatasourceURI(),
	'value' => $default_claim,
	'limit' => 1,
	'placeholder' => $users_source->getPlaceholderText(),
	),
	PhabricatorTransactions::TYPE_SUBSCRIBERS => array(
	'id' => 'cc-tokenizer',
	'src' => $mailable_source->getDatasourceURI(),
	'placeholder' => $mailable_source->getPlaceholderText(),
	),
	);

	// TODO: Initializing these behaviors for logged out users fatals things.
	if ($user->isLoggedIn()) {
	Javelin::initBehavior('maniphest-transaction-controls', array(
	'select' => 'transaction-action',
	'controlMap' => $control_map,
	'tokenizers' => $tokenizer_map,
	));

	Javelin::initBehavior('maniphest-transaction-preview', array(
	'uri' => '/maniphest/transaction/preview/'.$task->getID().'/',
	'preview' => 'transaction-preview',
	'comments' => 'transaction-comments',
	'action' => 'transaction-action',
	'map' => $control_map,
	'tokenizers' => $tokenizer_map,
	));
	}

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$comment_header = $is_serious
	? pht('Add Comment')
	: pht('Weigh In');

	$preview_panel = phutil_tag_div(
	'aphront-panel-preview',
	phutil_tag(
	'div',
	array('id' => 'transaction-preview'),
	phutil_tag_div(
	'aphront-panel-preview-loading-text',
	pht('Loading preview...'))));

	$object_name = 'T'.$task->getID();
	$actions = $this->buildActionView($task);

	$crumbs = $this->buildApplicationCrumbs()
	->addTextCrumb($object_name, '/'.$object_name);

	$header = $this->buildHeaderView($task);
	$properties = $this->buildPropertyView(
	$task, $field_list, $edges, $actions, $handles);
	$description = $this->buildDescriptionView($task, $engine);

	if (!$user->isLoggedIn()) {
	// TODO: Eventually, everything should run through this. For now, we're
	// only using it to get a consistent "Login to Comment" button.
	$comment_box = id(new PhabricatorApplicationTransactionCommentView())
	->setUser($user)
	->setRequestURI($request->getRequestURI());
	$preview_panel = null;
	} else {
	$comment_box = id(new PHUIObjectBoxView())
	->setFlush(true)
	->setHeaderText($comment_header)
	->appendChild($comment_form);
	$timeline->setQuoteTargetID('transaction-comments');
	$timeline->setQuoteRef($object_name);
	}

	$object_box = id(new PHUIObjectBoxView())
	->setHeader($header)
	->addPropertyList($properties);

	if ($info_view) {
	$object_box->setInfoView($info_view);
	}

	if ($description) {
	$object_box->addPropertyList($description);
	}

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$object_box,
	$timeline,
	$comment_box,
	$preview_panel,
	),
	array(
	'title' => 'T'.$task->getID().' '.$task->getTitle(),
	'pageObjects' => array($task->getPHID()),
	));
	}

	private function buildHeaderView(ManiphestTask $task) {
	$view = id(new PHUIHeaderView())
	->setHeader($task->getTitle())
	->setUser($this->getRequest()->getUser())
	->setPolicyObject($task);

	$status = $task->getStatus();
	$status_name = ManiphestTaskStatus::renderFullDescription($status);

	$view->addProperty(PHUIHeaderView::PROPERTY_STATUS, $status_name);

	return $view;
	}


	private function buildActionView(ManiphestTask $task) {
	$viewer = $this->getRequest()->getUser();
	$viewer_phid = $viewer->getPHID();

	$id = $task->getID();
	$phid = $task->getPHID();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$task,
	PhabricatorPolicyCapability::CAN_EDIT);

	$view = id(new PhabricatorActionListView())
	->setUser($viewer)
	->setObject($task)
	->setObjectURI($this->getRequest()->getRequestURI());

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Task'))
	->setIcon('fa-pencil')
	->setHref($this->getApplicationURI("/task/edit/{$id}/"))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Merge Duplicates In'))
	->setHref("/search/attach/{$phid}/TASK/merge/")
	->setWorkflow(true)
	->setIcon('fa-compress')
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Create Subtask'))
	->setHref($this->getApplicationURI("/task/create/?parent={$id}"))
	->setIcon('fa-level-down'));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Edit Blocking Tasks'))
	->setHref("/search/attach/{$phid}/TASK/blocks/")
	->setWorkflow(true)
	->setIcon('fa-link')
	->setDisabled(!$can_edit)
	->setWorkflow(true));

	return $view;
	}

	private function buildPropertyView(
	ManiphestTask $task,
	PhabricatorCustomFieldList $field_list,
	array $edges,
	PhabricatorActionListView $actions,
	$handles) {

	$viewer = $this->getRequest()->getUser();

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setObject($task)
	->setActionList($actions);

	$view->addProperty(
	pht('Assigned To'),
	$task->getOwnerPHID()
	? $handles->renderHandle($task->getOwnerPHID())
	: phutil_tag('em', array(), pht('None')));

	$view->addProperty(
	pht('Priority'),
	ManiphestTaskPriority::getTaskPriorityName($task->getPriority()));

	$view->addProperty(
	pht('Author'),
	$handles->renderHandle($task->getAuthorPHID()));

	$source = $task->getOriginalEmailSource();
	if ($source) {
	$subject = '[T'.$task->getID().'] '.$task->getTitle();
	$view->addProperty(
	pht('From Email'),
	phutil_tag(
	'a',
	array(
	'href' => 'mailto:'.$source.'?subject='.$subject,
	),
	$source));
	}

	$edge_types = array(
	ManiphestTaskDependedOnByTaskEdgeType::EDGECONST
	=> pht('Blocks'),
	ManiphestTaskDependsOnTaskEdgeType::EDGECONST
	=> pht('Blocked By'),
	ManiphestTaskHasRevisionEdgeType::EDGECONST
	=> pht('Differential Revisions'),
	ManiphestTaskHasMockEdgeType::EDGECONST
	=> pht('Pholio Mocks'),
	);

	$revisions_commits = array();

	$commit_phids = array_keys(
	$edges[ManiphestTaskHasCommitEdgeType::EDGECONST]);
	if ($commit_phids) {
	$commit_drev = DiffusionCommitHasRevisionEdgeType::EDGECONST;
	$drev_edges = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs($commit_phids)
	->withEdgeTypes(array($commit_drev))
	->execute();

	foreach ($commit_phids as $phid) {
	$revisions_commits[$phid] = $handles->renderHandle($phid);
	$revision_phid = key($drev_edges[$phid][$commit_drev]);
	$revision_handle = $handles->getHandleIfExists($revision_phid);
	if ($revision_handle) {
	$task_drev = ManiphestTaskHasRevisionEdgeType::EDGECONST;
	unset($edges[$task_drev][$revision_phid]);
	$revisions_commits[$phid] = hsprintf(
	'%s / %s',
	$revision_handle->renderLink($revision_handle->getName()),
	$revisions_commits[$phid]);
	}
	}
	}

	foreach ($edge_types as $edge_type => $edge_name) {
	if ($edges[$edge_type]) {
	$edge_handles = $viewer->loadHandles(array_keys($edges[$edge_type]));
	$view->addProperty(
	$edge_name,
	$edge_handles->renderList());
	}
	}

	if ($revisions_commits) {
	$view->addProperty(
	pht('Commits'),
	phutil_implode_html(phutil_tag('br'), $revisions_commits));
	}

	$attached = $task->getAttached();
	if (!is_array($attached)) {
	$attached = array();
	}

	$file_infos = idx($attached, PhabricatorFileFilePHIDType::TYPECONST);
	if ($file_infos) {
	$file_phids = array_keys($file_infos);

	// TODO: These should probably be handles or something; clean this up
	// as we sort out file attachments.
	$files = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs($file_phids)
	->execute();

	$file_view = new PhabricatorFileLinkListView();
	$file_view->setFiles($files);

	$view->addProperty(
	pht('Files'),
	$file_view->render());
	}

	$view->invokeWillRenderEvent();

	$field_list->appendFieldsToPropertyList(
	$task,
	$viewer,
	$view);

	return $view;
	}

	private function buildDescriptionView(
	ManiphestTask $task,
	PhabricatorMarkupEngine $engine) {

	$section = null;
	if (strlen($task->getDescription())) {
	$section = new PHUIPropertyListView();
	$section->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);
	$section->addTextContent(
	phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$engine->getOutput($task, ManiphestTask::MARKUP_FIELD_DESCRIPTION)));
	}

	return $section;
	}

	}
	diff --git a/src/view/form/control/AphrontFormTokenizerControl.php b/src/view/form/control/AphrontFormTokenizerControl.php
	index 13fcd6b143..2e37c3838d 100644
	--- a/src/view/form/control/AphrontFormTokenizerControl.php
	+++ b/src/view/form/control/AphrontFormTokenizerControl.php
	@@ -1,164 +1,154 @@
	<?php

	final class AphrontFormTokenizerControl extends AphrontFormControl {

	private $datasource;
	private $disableBehavior;
	private $limit;
	private $placeholder;
	private $handles;

	public function setDatasource(PhabricatorTypeaheadDatasource $datasource) {
	$this->datasource = $datasource;
	return $this;
	}

	public function setDisableBehavior($disable) {
	$this->disableBehavior = $disable;
	return $this;
	}

	protected function getCustomControlClass() {
	return 'aphront-form-control-tokenizer';
	}

	public function setLimit($limit) {
	$this->limit = $limit;
	return $this;
	}

	public function setPlaceholder($placeholder) {
	$this->placeholder = $placeholder;
	return $this;
	}

	public function willRender() {
	// Load the handles now so we'll get a bulk load later on when we actually
	// render them.
	$this->loadHandles();
	}

	protected function renderInput() {
	$name = $this->getName();

	$handles = $this->loadHandles();
	$handles = iterator_to_array($handles);

	if ($this->getID()) {
	$id = $this->getID();
	} else {
	$id = celerity_generate_unique_node_id();
	}

	$datasource = $this->datasource;
	- if ($datasource) {
	- $datasource->setViewer($this->getUser());
	+ if (!$datasource) {
	+ throw new Exception(
	+ pht('You must set a datasource to use a TokenizerControl.'));
	}
	+ $datasource->setViewer($this->getUser());

	$placeholder = null;
	if (!strlen($this->placeholder)) {
	- if ($datasource) {
	- $placeholder = $datasource->getPlaceholderText();
	- }
	- } else {
	- $placeholder = $this->placeholder;
	+ $placeholder = $datasource->getPlaceholderText();
	}

	$tokens = array();
	$values = nonempty($this->getValue(), array());
	foreach ($values as $value) {
	if (isset($handles[$value])) {
	$token = PhabricatorTypeaheadTokenView::newFromHandle($handles[$value]);
	} else {
	$token = null;
	- if ($datasource) {
	- $function = $datasource->parseFunction($value);
	- if ($function) {
	- $token_list = $datasource->renderFunctionTokens(
	- $function['name'],
	- array($function['argv']));
	- $token = head($token_list);
	- }
	+
	+ $function = $datasource->parseFunction($value);
	+ if ($function) {
	+ $token_list = $datasource->renderFunctionTokens(
	+ $function['name'],
	+ array($function['argv']));
	+ $token = head($token_list);
	}

	if (!$token) {
	$name = pht('Invalid Function: %s', $value);
	$token = $datasource->newInvalidToken($name);
	}

	$type = $token->getTokenType();
	if ($type == PhabricatorTypeaheadTokenView::TYPE_INVALID) {
	$token->setKey($value);
	}
	}
	$token->setInputName($this->getName());
	$tokens[] = $token;
	}

	$template = new AphrontTokenizerTemplateView();
	$template->setName($name);
	$template->setID($id);
	$template->setValue($tokens);

	$username = null;
	if ($this->user) {
	$username = $this->user->getUsername();
	}

	- $datasource_uri = null;
	- $browse_uri = null;
	- if ($datasource) {
	- $datasource->setViewer($this->getUser());
	-
	- $datasource_uri = $datasource->getDatasourceURI();
	-
	- $browse_uri = $datasource->getBrowseURI();
	- if ($browse_uri) {
	- $template->setBrowseURI($browse_uri);
	- }
	+ $datasource_uri = $datasource->getDatasourceURI();
	+ $browse_uri = $datasource->getBrowseURI();
	+ if ($browse_uri) {
	+ $template->setBrowseURI($browse_uri);
	}

	if (!$this->disableBehavior) {
	Javelin::initBehavior('aphront-basic-tokenizer', array(
	'id' => $id,
	'src' => $datasource_uri,
	'value' => mpull($tokens, 'getValue', 'getKey'),
	'icons' => mpull($tokens, 'getIcon', 'getKey'),
	'types' => mpull($tokens, 'getTokenType', 'getKey'),
	'colors' => mpull($tokens, 'getColor', 'getKey'),
	'limit' => $this->limit,
	'username' => $username,
	'placeholder' => $placeholder,
	'browseURI' => $browse_uri,
	));
	}

	return $template->render();
	}

	private function loadHandles() {
	if ($this->handles === null) {
	$viewer = $this->getUser();
	if (!$viewer) {
	throw new Exception(
	pht(
	'Call setUser() before rendering tokenizers. Use appendControl() '.
	'on AphrontFormView to do this easily.'));
	}

	$values = nonempty($this->getValue(), array());

	$phids = array();
	foreach ($values as $value) {
	if (!PhabricatorTypeaheadDatasource::isFunctionToken($value)) {
	$phids[] = $value;
	}
	}

	$this->handles = $viewer->loadHandles($phids);
	}

	return $this->handles;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 14:54 (3 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1125702
Default Alt Text: (67 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions