No OneTemporary
Actions

Size

90 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/maniphest/controller/ManiphestExportController.php b/src/applications/maniphest/controller/ManiphestExportController.php
	index 6db04a6e32..88e6849afb 100644
	--- a/src/applications/maniphest/controller/ManiphestExportController.php
	+++ b/src/applications/maniphest/controller/ManiphestExportController.php
	@@ -1,141 +1,133 @@
	<?php

	final class ManiphestExportController extends ManiphestController {

	- private $key;
	-
	- public function willProcessRequest(array $data) {
	- $this->key = $data['key'];
	- return $this;
	- }
	-
	/**
	* @phutil-external-symbol class PHPExcel
	* @phutil-external-symbol class PHPExcel_IOFactory
	* @phutil-external-symbol class PHPExcel_Style_NumberFormat
	* @phutil-external-symbol class PHPExcel_Cell_DataType
	*/
	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $key = $request->getURIData('key');

	$ok = @include_once 'PHPExcel.php';
	if (!$ok) {
	- $dialog = new AphrontDialogView();
	- $dialog->setUser($user);
	+ $dialog = $this->newDialog();

	$inst1 = pht(
	'This system does not have PHPExcel installed. This software '.
	'component is required to export tasks to Excel. Have your system '.
	'administrator install it from:');

	$inst2 = pht(
	'Your PHP "%s" needs to be updated to include the '.
	'PHPExcel Classes directory.',
	'include_path');

	$dialog->setTitle(pht('Excel Export Not Configured'));
	$dialog->appendChild(hsprintf(
	'<p>%s</p>'.
	'<br />'.
	'<p>'.
	'<a href="http://www.phpexcel.net/">http://www.phpexcel.net/</a>'.
	'</p>'.
	'<br />'.
	'<p>%s</p>',
	$inst1,
	$inst2));

	$dialog->addCancelButton('/maniphest/');
	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	// TODO: PHPExcel has a dependency on the PHP zip extension. We should test
	// for that here, since it fatals if we don't have the ZipArchive class.

	$saved = id(new PhabricatorSavedQueryQuery())
	- ->setViewer($user)
	- ->withQueryKeys(array($this->key))
	+ ->setViewer($viewer)
	+ ->withQueryKeys(array($key))
	->executeOne();
	if (!$saved) {
	$engine = id(new ManiphestTaskSearchEngine())
	- ->setViewer($user);
	- if ($engine->isBuiltinQuery($this->key)) {
	- $saved = $engine->buildSavedQueryFromBuiltin($this->key);
	+ ->setViewer($viewer);
	+ if ($engine->isBuiltinQuery($key)) {
	+ $saved = $engine->buildSavedQueryFromBuiltin($key);
	}
	if (!$saved) {
	return new Aphront404Response();
	}
	}

	$formats = ManiphestExcelFormat::loadAllFormats();
	$export_formats = array();
	foreach ($formats as $format_class => $format_object) {
	$export_formats[$format_class] = $format_object->getName();
	}

	if (!$request->isDialogFormPost()) {
	$dialog = new AphrontDialogView();
	- $dialog->setUser($user);
	+ $dialog->setUser($viewer);

	$dialog->setTitle(pht('Export Tasks to Excel'));
	$dialog->appendChild(
	phutil_tag(
	'p',
	array(),
	pht('Do you want to export the query results to Excel?')));

	$form = id(new PHUIFormLayoutView())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Format:'))
	->setName('excel-format')
	->setOptions($export_formats));

	$dialog->appendChild($form);

	$dialog->addCancelButton('/maniphest/');
	$dialog->addSubmitButton(pht('Export to Excel'));
	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	$format = idx($formats, $request->getStr('excel-format'));
	if ($format === null) {
	throw new Exception(pht('Excel format object not found.'));
	}

	$saved->makeEphemeral();
	$saved->setParameter('limit', PHP_INT_MAX);

	$engine = id(new ManiphestTaskSearchEngine())
	- ->setViewer($user);
	+ ->setViewer($viewer);

	$query = $engine->buildQueryFromSavedQuery($saved);
	- $query->setViewer($user);
	+ $query->setViewer($viewer);
	$tasks = $query->execute();

	$all_projects = array_mergev(mpull($tasks, 'getProjectPHIDs'));
	$all_assigned = mpull($tasks, 'getOwnerPHID');

	$handles = id(new PhabricatorHandleQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withPHIDs(array_merge($all_projects, $all_assigned))
	->execute();

	$workbook = new PHPExcel();
	- $format->buildWorkbook($workbook, $tasks, $handles, $user);
	+ $format->buildWorkbook($workbook, $tasks, $handles, $viewer);
	$writer = PHPExcel_IOFactory::createWriter($workbook, 'Excel2007');

	ob_start();
	$writer->save('php://output');
	$data = ob_get_clean();

	$mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';

	return id(new AphrontFileResponse())
	->setMimeType($mime)
	->setDownload($format->getFileName().'.xlsx')
	->setContent($data);
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
	index bdf446150e..6c2ce9fec3 100644
	--- a/src/applications/maniphest/controller/ManiphestReportController.php
	+++ b/src/applications/maniphest/controller/ManiphestReportController.php
	@@ -1,794 +1,790 @@
	<?php

	final class ManiphestReportController extends ManiphestController {

	private $view;

	- public function willProcessRequest(array $data) {
	- $this->view = idx($data, 'view');
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $this->view = $request->getURIData('view');

	if ($request->isFormPost()) {
	$uri = $request->getRequestURI();

	$project = head($request->getArr('set_project'));
	$project = nonempty($project, null);
	$uri = $uri->alter('project', $project);

	$window = $request->getStr('set_window');
	$uri = $uri->alter('window', $window);

	return id(new AphrontRedirectResponse())->setURI($uri);
	}

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI('/maniphest/report/'));
	$nav->addLabel(pht('Open Tasks'));
	$nav->addFilter('user', pht('By User'));
	$nav->addFilter('project', pht('By Project'));
	$nav->addLabel(pht('Burnup'));
	$nav->addFilter('burn', pht('Burnup Rate'));

	$this->view = $nav->selectFilter($this->view, 'user');

	require_celerity_resource('maniphest-report-css');

	switch ($this->view) {
	case 'burn':
	$core = $this->renderBurn();
	break;
	case 'user':
	case 'project':
	$core = $this->renderOpenTasks();
	break;
	default:
	return new Aphront404Response();
	}

	$nav->appendChild($core);
	$nav->setCrumbs(
	$this->buildApplicationCrumbs()
	->addTextCrumb(pht('Reports')));

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => pht('Maniphest Reports'),
	'device' => false,
	));
	}

	public function renderBurn() {
	$request = $this->getRequest();
	- $user = $request->getUser();
	+ $viewer = $request->getUser();

	$handle = null;

	$project_phid = $request->getStr('project');
	if ($project_phid) {
	$phids = array($project_phid);
	$handles = $this->loadViewerHandles($phids);
	$handle = $handles[$project_phid];
	}

	$table = new ManiphestTransaction();
	$conn = $table->establishConnection('r');

	$joins = '';
	if ($project_phid) {
	$joins = qsprintf(
	$conn,
	'JOIN %T t ON x.objectPHID = t.phid
	JOIN %T p ON p.src = t.phid AND p.type = %d AND p.dst = %s',
	id(new ManiphestTask())->getTableName(),
	PhabricatorEdgeConfig::TABLE_NAME_EDGE,
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	$project_phid);
	}

	$data = queryfx_all(
	$conn,
	'SELECT x.oldValue, x.newValue, x.dateCreated FROM %T x %Q
	WHERE transactionType = %s
	ORDER BY x.dateCreated ASC',
	$table->getTableName(),
	$joins,
	ManiphestTransaction::TYPE_STATUS);

	$stats = array();
	$day_buckets = array();

	$open_tasks = array();

	foreach ($data as $key => $row) {

	// NOTE: Hack to avoid json_decode().
	$oldv = trim($row['oldValue'], '"');
	$newv = trim($row['newValue'], '"');

	if ($oldv == 'null') {
	$old_is_open = false;
	} else {
	$old_is_open = ManiphestTaskStatus::isOpenStatus($oldv);
	}

	$new_is_open = ManiphestTaskStatus::isOpenStatus($newv);

	$is_open = ($new_is_open && !$old_is_open);
	$is_close = ($old_is_open && !$new_is_open);

	$data[$key]['_is_open'] = $is_open;
	$data[$key]['_is_close'] = $is_close;

	if (!$is_open && !$is_close) {
	// This is either some kind of bogus event, or a resolution change
	// (e.g., resolved -> invalid). Just skip it.
	continue;
	}

	$day_bucket = phabricator_format_local_time(
	$row['dateCreated'],
	- $user,
	+ $viewer,
	'Yz');
	$day_buckets[$day_bucket] = $row['dateCreated'];
	if (empty($stats[$day_bucket])) {
	$stats[$day_bucket] = array(
	'open' => 0,
	'close' => 0,
	);
	}
	$stats[$day_bucket][$is_close ? 'close' : 'open']++;
	}

	$template = array(
	'open' => 0,
	'close' => 0,
	);

	$rows = array();
	$rowc = array();
	$last_month = null;
	$last_month_epoch = null;
	$last_week = null;
	$last_week_epoch = null;
	$week = null;
	$month = null;

	$last = last_key($stats) - 1;
	$period = $template;

	foreach ($stats as $bucket => $info) {
	$epoch = $day_buckets[$bucket];

	$week_bucket = phabricator_format_local_time(
	$epoch,
	- $user,
	+ $viewer,
	'YW');
	if ($week_bucket != $last_week) {
	if ($week) {
	$rows[] = $this->formatBurnRow(
	- pht('Week of %s', phabricator_date($last_week_epoch, $user)),
	+ pht('Week of %s', phabricator_date($last_week_epoch, $viewer)),
	$week);
	$rowc[] = 'week';
	}
	$week = $template;
	$last_week = $week_bucket;
	$last_week_epoch = $epoch;
	}

	$month_bucket = phabricator_format_local_time(
	$epoch,
	- $user,
	+ $viewer,
	'Ym');
	if ($month_bucket != $last_month) {
	if ($month) {
	$rows[] = $this->formatBurnRow(
	- phabricator_format_local_time($last_month_epoch, $user, 'F, Y'),
	+ phabricator_format_local_time($last_month_epoch, $viewer, 'F, Y'),
	$month);
	$rowc[] = 'month';
	}
	$month = $template;
	$last_month = $month_bucket;
	$last_month_epoch = $epoch;
	}

	- $rows[] = $this->formatBurnRow(phabricator_date($epoch, $user), $info);
	+ $rows[] = $this->formatBurnRow(phabricator_date($epoch, $viewer), $info);
	$rowc[] = null;
	$week['open'] += $info['open'];
	$week['close'] += $info['close'];
	$month['open'] += $info['open'];
	$month['close'] += $info['close'];
	$period['open'] += $info['open'];
	$period['close'] += $info['close'];
	}

	if ($week) {
	$rows[] = $this->formatBurnRow(
	pht('Week To Date'),
	$week);
	$rowc[] = 'week';
	}

	if ($month) {
	$rows[] = $this->formatBurnRow(
	pht('Month To Date'),
	$month);
	$rowc[] = 'month';
	}

	$rows[] = $this->formatBurnRow(
	pht('All Time'),
	$period);
	$rowc[] = 'aggregate';

	$rows = array_reverse($rows);
	$rowc = array_reverse($rowc);

	$table = new AphrontTableView($rows);
	$table->setRowClasses($rowc);
	$table->setHeaders(
	array(
	pht('Period'),
	pht('Opened'),
	pht('Closed'),
	pht('Change'),
	));
	$table->setColumnClasses(
	array(
	'right wide',
	'n',
	'n',
	'n',
	));

	if ($handle) {
	$inst = pht(
	'NOTE: This table reflects tasks currently in '.
	'the project. If a task was opened in the past but added to '.
	'the project recently, it is counted on the day it was '.
	'opened, not the day it was categorized. If a task was part '.
	'of this project in the past but no longer is, it is not '.
	'counted at all.');
	$header = pht('Task Burn Rate for Project %s', $handle->renderLink());
	$caption = phutil_tag('p', array(), $inst);
	} else {
	$header = pht('Task Burn Rate for All Tasks');
	$caption = null;
	}

	if ($caption) {
	$caption = id(new PHUIInfoView())
	->appendChild($caption)
	->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
	}

	$panel = new PHUIObjectBoxView();
	$panel->setHeaderText($header);
	if ($caption) {
	$panel->setInfoView($caption);
	}
	$panel->setTable($table);

	$tokens = array();
	if ($handle) {
	$tokens = array($handle);
	}

	$filter = $this->renderReportFilters($tokens, $has_window = false);

	$id = celerity_generate_unique_node_id();
	$chart = phutil_tag(
	'div',
	array(
	'id' => $id,
	'style' => 'border: 1px solid #BFCFDA; '.
	'background-color: #fff; '.
	'margin: 8px 16px; '.
	'height: 400px; ',
	),
	'');

	list($burn_x, $burn_y) = $this->buildSeries($data);

	require_celerity_resource('raphael-core');
	require_celerity_resource('raphael-g');
	require_celerity_resource('raphael-g-line');

	Javelin::initBehavior('line-chart', array(
	'hardpoint' => $id,
	'x' => array(
	$burn_x,
	),
	'y' => array(
	$burn_y,
	),
	'xformat' => 'epoch',
	'yformat' => 'int',
	));

	return array($filter, $chart, $panel);
	}

	private function renderReportFilters(array $tokens, $has_window) {
	$request = $this->getRequest();
	- $user = $request->getUser();
	+ $viewer = $request->getUser();

	$form = id(new AphrontFormView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setDatasource(new PhabricatorProjectDatasource())
	->setLabel(pht('Project'))
	->setLimit(1)
	->setName('set_project')
	// TODO: This is silly, but this is Maniphest reports.
	->setValue(mpull($tokens, 'getPHID')));

	if ($has_window) {
	list($window_str, $ignored, $window_error) = $this->getWindow();
	$form
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Recently Means'))
	->setName('set_window')
	->setCaption(
	pht('Configure the cutoff for the "Recently Closed" column.'))
	->setValue($window_str)
	->setError($window_error));
	}

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Filter By Project')));

	$filter = new AphrontListFilterView();
	$filter->appendChild($form);

	return $filter;
	}

	private function buildSeries(array $data) {
	$out = array();

	$counter = 0;
	foreach ($data as $row) {
	$t = (int)$row['dateCreated'];
	if ($row['_is_close']) {
	--$counter;
	$out[$t] = $counter;
	} else if ($row['_is_open']) {
	++$counter;
	$out[$t] = $counter;
	}
	}

	return array(array_keys($out), array_values($out));
	}

	private function formatBurnRow($label, $info) {
	$delta = $info['open'] - $info['close'];
	$fmt = number_format($delta);
	if ($delta > 0) {
	$fmt = '+'.$fmt;
	$fmt = phutil_tag('span', array('class' => 'red'), $fmt);
	} else {
	$fmt = phutil_tag('span', array('class' => 'green'), $fmt);
	}

	return array(
	$label,
	number_format($info['open']),
	number_format($info['close']),
	$fmt,
	);
	}

	public function renderOpenTasks() {
	$request = $this->getRequest();
	- $user = $request->getUser();
	+ $viewer = $request->getUser();


	$query = id(new ManiphestTaskQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withStatuses(ManiphestTaskStatus::getOpenStatusConstants());

	switch ($this->view) {
	case 'project':
	$query->needProjectPHIDs(true);
	break;
	}

	$project_phid = $request->getStr('project');
	$project_handle = null;
	if ($project_phid) {
	$phids = array($project_phid);
	$handles = $this->loadViewerHandles($phids);
	$project_handle = $handles[$project_phid];

	$query->withEdgeLogicPHIDs(
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
	PhabricatorQueryConstraint::OPERATOR_OR,
	$phids);
	}

	$tasks = $query->execute();

	$recently_closed = $this->loadRecentlyClosedTasks();

	- $date = phabricator_date(time(), $user);
	+ $date = phabricator_date(time(), $viewer);

	switch ($this->view) {
	case 'user':
	$result = mgroup($tasks, 'getOwnerPHID');
	$leftover = idx($result, '', array());
	unset($result['']);

	$result_closed = mgroup($recently_closed, 'getOwnerPHID');
	$leftover_closed = idx($result_closed, '', array());
	unset($result_closed['']);

	$base_link = '/maniphest/?assigned=';
	$leftover_name = phutil_tag('em', array(), pht('(Up For Grabs)'));
	$col_header = pht('User');
	$header = pht('Open Tasks by User and Priority (%s)', $date);
	break;
	case 'project':
	$result = array();
	$leftover = array();
	foreach ($tasks as $task) {
	$phids = $task->getProjectPHIDs();
	if ($phids) {
	foreach ($phids as $project_phid) {
	$result[$project_phid][] = $task;
	}
	} else {
	$leftover[] = $task;
	}
	}

	$result_closed = array();
	$leftover_closed = array();
	foreach ($recently_closed as $task) {
	$phids = $task->getProjectPHIDs();
	if ($phids) {
	foreach ($phids as $project_phid) {
	$result_closed[$project_phid][] = $task;
	}
	} else {
	$leftover_closed[] = $task;
	}
	}

	$base_link = '/maniphest/?projects=';
	$leftover_name = phutil_tag('em', array(), pht('(No Project)'));
	$col_header = pht('Project');
	$header = pht('Open Tasks by Project and Priority (%s)', $date);
	break;
	}

	$phids = array_keys($result);
	$handles = $this->loadViewerHandles($phids);
	$handles = msort($handles, 'getName');

	$order = $request->getStr('order', 'name');
	list($order, $reverse) = AphrontTableView::parseSort($order);

	require_celerity_resource('aphront-tooltip-css');
	Javelin::initBehavior('phabricator-tooltips', array());

	$rows = array();
	$pri_total = array();
	foreach (array_merge($handles, array(null)) as $handle) {
	if ($handle) {
	if (($project_handle) &&
	($project_handle->getPHID() == $handle->getPHID())) {
	// If filtering by, e.g., "bugs", don't show a "bugs" group.
	continue;
	}

	$tasks = idx($result, $handle->getPHID(), array());
	$name = phutil_tag(
	'a',
	array(
	'href' => $base_link.$handle->getPHID(),
	),
	$handle->getName());
	$closed = idx($result_closed, $handle->getPHID(), array());
	} else {
	$tasks = $leftover;
	$name = $leftover_name;
	$closed = $leftover_closed;
	}

	$taskv = $tasks;
	$tasks = mgroup($tasks, 'getPriority');

	$row = array();
	$row[] = $name;
	$total = 0;
	foreach (ManiphestTaskPriority::getTaskPriorityMap() as $pri => $label) {
	$n = count(idx($tasks, $pri, array()));
	if ($n == 0) {
	$row[] = '-';
	} else {
	$row[] = number_format($n);
	}
	$total += $n;
	}
	$row[] = number_format($total);

	list($link, $oldest_all) = $this->renderOldest($taskv);
	$row[] = $link;

	$normal_or_better = array();
	foreach ($taskv as $id => $task) {
	// TODO: This is sort of a hard-code for the default "normal" status.
	// When reports are more powerful, this should be made more general.
	if ($task->getPriority() < 50) {
	continue;
	}
	$normal_or_better[$id] = $task;
	}

	list($link, $oldest_pri) = $this->renderOldest($normal_or_better);
	$row[] = $link;

	if ($closed) {
	$task_ids = implode(',', mpull($closed, 'getID'));
	$row[] = phutil_tag(
	'a',
	array(
	'href' => '/maniphest/?ids='.$task_ids,
	'target' => '_blank',
	),
	number_format(count($closed)));
	} else {
	$row[] = '-';
	}

	switch ($order) {
	case 'total':
	$row['sort'] = $total;
	break;
	case 'oldest-all':
	$row['sort'] = $oldest_all;
	break;
	case 'oldest-pri':
	$row['sort'] = $oldest_pri;
	break;
	case 'closed':
	$row['sort'] = count($closed);
	break;
	case 'name':
	default:
	$row['sort'] = $handle ? $handle->getName() : '~';
	break;
	}

	$rows[] = $row;
	}

	$rows = isort($rows, 'sort');
	foreach ($rows as $k => $row) {
	unset($rows[$k]['sort']);
	}
	if ($reverse) {
	$rows = array_reverse($rows);
	}

	$cname = array($col_header);
	$cclass = array('pri right wide');
	$pri_map = ManiphestTaskPriority::getShortNameMap();
	foreach ($pri_map as $pri => $label) {
	$cname[] = $label;
	$cclass[] = 'n';
	}
	$cname[] = pht('Total');
	$cclass[] = 'n';
	$cname[] = javelin_tag(
	'span',
	array(
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => pht('Oldest open task.'),
	'size' => 200,
	),
	),
	pht('Oldest (All)'));
	$cclass[] = 'n';
	$cname[] = javelin_tag(
	'span',
	array(
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => pht(
	'Oldest open task, excluding those with Low or Wishlist priority.'),
	'size' => 200,
	),
	),
	pht('Oldest (Pri)'));
	$cclass[] = 'n';

	list($ignored, $window_epoch) = $this->getWindow();
	- $edate = phabricator_datetime($window_epoch, $user);
	+ $edate = phabricator_datetime($window_epoch, $viewer);
	$cname[] = javelin_tag(
	'span',
	array(
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => pht('Closed after %s', $edate),
	'size' => 260,
	),
	),
	pht('Recently Closed'));
	$cclass[] = 'n';

	$table = new AphrontTableView($rows);
	$table->setHeaders($cname);
	$table->setColumnClasses($cclass);
	$table->makeSortable(
	$request->getRequestURI(),
	'order',
	$order,
	$reverse,
	array(
	'name',
	null,
	null,
	null,
	null,
	null,
	null,
	'total',
	'oldest-all',
	'oldest-pri',
	'closed',
	));

	$panel = new PHUIObjectBoxView();
	$panel->setHeaderText($header);
	$panel->setTable($table);

	$tokens = array();
	if ($project_handle) {
	$tokens = array($project_handle);
	}
	$filter = $this->renderReportFilters($tokens, $has_window = true);

	return array($filter, $panel);
	}


	/**
	* Load all the tasks that have been recently closed.
	*/
	private function loadRecentlyClosedTasks() {
	list($ignored, $window_epoch) = $this->getWindow();

	$table = new ManiphestTask();
	$xtable = new ManiphestTransaction();
	$conn_r = $table->establishConnection('r');

	// TODO: Gross. This table is not meant to be queried like this. Build
	// real stats tables.

	$open_status_list = array();
	foreach (ManiphestTaskStatus::getOpenStatusConstants() as $constant) {
	$open_status_list[] = json_encode((string)$constant);
	}

	$rows = queryfx_all(
	$conn_r,
	'SELECT t.id FROM %T t JOIN %T x ON x.objectPHID = t.phid
	WHERE t.status NOT IN (%Ls)
	AND x.oldValue IN (null, %Ls)
	AND x.newValue NOT IN (%Ls)
	AND t.dateModified >= %d
	AND x.dateCreated >= %d',
	$table->getTableName(),
	$xtable->getTableName(),
	ManiphestTaskStatus::getOpenStatusConstants(),
	$open_status_list,
	$open_status_list,
	$window_epoch,
	$window_epoch);

	if (!$rows) {
	return array();
	}

	$ids = ipull($rows, 'id');

	$query = id(new ManiphestTaskQuery())
	->setViewer($this->getRequest()->getUser())
	->withIDs($ids);

	switch ($this->view) {
	case 'project':
	$query->needProjectPHIDs(true);
	break;
	}

	return $query->execute();
	}

	/**
	* Parse the "Recently Means" filter into:
	*
	* - A string representation, like "12 AM 7 days ago" (default);
	* - a locale-aware epoch representation; and
	* - a possible error.
	*/
	private function getWindow() {
	$request = $this->getRequest();
	- $user = $request->getUser();
	+ $viewer = $request->getUser();

	$window_str = $this->getRequest()->getStr('window', '12 AM 7 days ago');

	$error = null;
	$window_epoch = null;

	// Do locale-aware parsing so that the user's timezone is assumed for
	// time windows like "3 PM", rather than assuming the server timezone.

	- $window_epoch = PhabricatorTime::parseLocalTime($window_str, $user);
	+ $window_epoch = PhabricatorTime::parseLocalTime($window_str, $viewer);
	if (!$window_epoch) {
	$error = 'Invalid';
	$window_epoch = time() - (60 * 60 * 24 * 7);
	}

	// If the time ends up in the future, convert it to the corresponding time
	// and equal distance in the past. This is so users can type "6 days" (which
	// means "6 days from now") and get the behavior of "6 days ago", rather
	// than no results (because the window epoch is in the future). This might
	// be a little confusing because it casues "tomorrow" to mean "yesterday"
	// and "2022" (or whatever) to mean "ten years ago", but these inputs are
	// nonsense anyway.

	if ($window_epoch > time()) {
	$window_epoch = time() - ($window_epoch - time());
	}

	return array($window_str, $window_epoch, $error);
	}

	private function renderOldest(array $tasks) {
	assert_instances_of($tasks, 'ManiphestTask');
	$oldest = null;
	foreach ($tasks as $id => $task) {
	if (($oldest === null) \|\|
	($task->getDateCreated() < $tasks[$oldest]->getDateCreated())) {
	$oldest = $id;
	}
	}

	if ($oldest === null) {
	return array('-', 0);
	}

	$oldest = $tasks[$oldest];

	$raw_age = (time() - $oldest->getDateCreated());
	$age = number_format($raw_age / (24 * 60 * 60)).' d';

	$link = javelin_tag(
	'a',
	array(
	'href' => '/T'.$oldest->getID(),
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => 'T'.$oldest->getID().': '.$oldest->getTitle(),
	),
	'target' => '_blank',
	),
	$age);

	return array($link, $raw_age);
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestSubpriorityController.php b/src/applications/maniphest/controller/ManiphestSubpriorityController.php
	index 44b13955fb..25920212c8 100644
	--- a/src/applications/maniphest/controller/ManiphestSubpriorityController.php
	+++ b/src/applications/maniphest/controller/ManiphestSubpriorityController.php
	@@ -1,68 +1,67 @@
	<?php

	final class ManiphestSubpriorityController extends ManiphestController {

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

	if (!$request->validateCSRF()) {
	return new Aphront403Response();
	}

	$task = id(new ManiphestTaskQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withIDs(array($request->getInt('task')))
	->needProjectPHIDs(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$task) {
	return new Aphront404Response();
	}

	if ($request->getInt('after')) {
	$after_task = id(new ManiphestTaskQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withIDs(array($request->getInt('after')))
	->executeOne();
	if (!$after_task) {
	return new Aphront404Response();
	}
	list($pri, $sub) = ManiphestTransactionEditor::getAdjacentSubpriority(
	$after_task,
	$is_after = true);
	} else {
	list($pri, $sub) = ManiphestTransactionEditor::getEdgeSubpriority(
	$request->getInt('priority'),
	$is_end = false);
	}

	$xactions = array();

	$xactions[] = id(new ManiphestTransaction())
	->setTransactionType(ManiphestTransaction::TYPE_PRIORITY)
	->setNewValue($pri);

	$xactions[] = id(new ManiphestTransaction())
	->setTransactionType(ManiphestTransaction::TYPE_SUBPRIORITY)
	->setNewValue($sub);

	$editor = id(new ManiphestTransactionEditor())
	- ->setActor($user)
	+ ->setActor($viewer)
	->setContinueOnMissingFields(true)
	->setContinueOnNoEffect(true)
	->setContentSourceFromRequest($request);

	$editor->applyTransactions($task, $xactions);

	return id(new AphrontAjaxResponse())->setContent(
	array(
	'tasks' => $this->renderSingleTask($task),
	));
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	index 0d4fa74398..8619987201 100644
	--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	@@ -1,588 +1,583 @@
	<?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();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $id = $request->getURIData('id');

	$e_title = null;

	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();

	$task = id(new ManiphestTaskQuery())
	- ->setViewer($user)
	- ->withIDs(array($this->id))
	+ ->setViewer($viewer)
	+ ->withIDs(array($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)
	+ ->setViewer($viewer)
	->withIDs(array($workflow))
	->executeOne();
	}

	$field_list = PhabricatorCustomField::getObjectFields(
	$task,
	PhabricatorCustomField::ROLE_VIEW);
	$field_list
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->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);
	+ $handles = $viewer->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->setViewer($viewer);
	$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().')',
	+ $viewer->getPHID() => $viewer->getUsername().
	+ ' ('.$viewer->getRealName().')',
	);

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	- $user->getPHID(),
	+ $viewer->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)
	+ ->setUser($viewer)
	->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)
	->setDatasource($users_source))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('CCs'))
	->setName('ccs')
	->setControlID('ccs')
	->setControlStyle('display: none')
	->setID('cc-tokenizer')
	->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)
	->setDatasource($projects_source))
	->appendChild(
	id(new AphrontFormFileControl())
	->setLabel(pht('File'))
	->setName('file')
	->setControlID('file')
	->setControlStyle('display: none'))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setLabel(pht('Comments'))
	->setName('comments')
	->setValue($draft_text)
	->setID('transaction-comments')
	- ->setUser($user))
	+ ->setUser($viewer))
	->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',
	);

	$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()) {
	+ if ($viewer->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()) {
	+ if (!$viewer->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)
	+ ->setUser($viewer)
	->setRequestURI($request->getRequestURI());
	$preview_panel = null;
	} else {
	$comment_box = id(new PHUIObjectBoxView())
	->setFlush(true)
	->setHeaderText($comment_header)
	->setForm($comment_form);
	$timeline->setQuoteTargetID('transaction-comments');
	$timeline->setQuoteRef($object_name);
	}

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

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

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$info_view,
	$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/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	index 72b75c876f..703bb61768 100644
	--- a/src/applications/maniphest/controller/ManiphestTaskEditController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	@@ -1,761 +1,755 @@
	<?php

	final class ManiphestTaskEditController extends ManiphestController {

	- private $id;
	-
	- public function willProcessRequest(array $data) {
	- $this->id = idx($data, 'id');
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $id = $request->getURIData('id');

	$response_type = $request->getStr('responseType', 'task');
	$order = $request->getStr('order', PhabricatorProjectColumn::DEFAULT_ORDER);

	$can_edit_assign = $this->hasApplicationCapability(
	ManiphestEditAssignCapability::CAPABILITY);
	$can_edit_policies = $this->hasApplicationCapability(
	ManiphestEditPoliciesCapability::CAPABILITY);
	$can_edit_priority = $this->hasApplicationCapability(
	ManiphestEditPriorityCapability::CAPABILITY);
	$can_edit_projects = $this->hasApplicationCapability(
	ManiphestEditProjectsCapability::CAPABILITY);
	$can_edit_status = $this->hasApplicationCapability(
	ManiphestEditStatusCapability::CAPABILITY);
	$can_create_projects = PhabricatorPolicyFilter::hasCapability(
	- $user,
	+ $viewer,
	PhabricatorApplication::getByClass('PhabricatorProjectApplication'),
	ProjectCreateProjectsCapability::CAPABILITY);

	$parent_task = null;
	$template_id = null;

	- if ($this->id) {
	+ if ($id) {
	$task = id(new ManiphestTaskQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	- ->withIDs(array($this->id))
	+ ->withIDs(array($id))
	->needSubscriberPHIDs(true)
	->needProjectPHIDs(true)
	->executeOne();
	if (!$task) {
	return new Aphront404Response();
	}
	} else {
	- $task = ManiphestTask::initializeNewTask($user);
	+ $task = ManiphestTask::initializeNewTask($viewer);

	// We currently do not allow you to set the task status when creating
	// a new task, although now that statuses are custom it might make
	// sense.
	$can_edit_status = false;

	// These allow task creation with defaults.
	if (!$request->isFormPost()) {
	$task->setTitle($request->getStr('title'));

	if ($can_edit_projects) {
	$projects = $request->getStr('projects');
	if ($projects) {
	$tokens = $request->getStrList('projects');

	$type_project = PhabricatorProjectProjectPHIDType::TYPECONST;
	foreach ($tokens as $key => $token) {
	if (phid_get_type($token) == $type_project) {
	// If this is formatted like a PHID, leave it as-is.
	continue;
	}

	if (preg_match('/^#/', $token)) {
	// If this already has a "#", leave it as-is.
	continue;
	}

	// Add a "#" prefix.
	$tokens[$key] = '#'.$token;
	}

	$default_projects = id(new PhabricatorObjectQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withNames($tokens)
	->execute();
	$default_projects = mpull($default_projects, 'getPHID');

	if ($default_projects) {
	$task->attachProjectPHIDs($default_projects);
	}
	}
	}

	if ($can_edit_priority) {
	$priority = $request->getInt('priority');
	if ($priority !== null) {
	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();
	if (isset($priority_map[$priority])) {
	$task->setPriority($priority);
	}
	}
	}

	$task->setDescription($request->getStr('description'));

	if ($can_edit_assign) {
	$assign = $request->getStr('assign');
	if (strlen($assign)) {
	$assign_user = id(new PhabricatorPeopleQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withUsernames(array($assign))
	->executeOne();
	if (!$assign_user) {
	$assign_user = id(new PhabricatorPeopleQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withPHIDs(array($assign))
	->executeOne();
	}

	if ($assign_user) {
	$task->setOwnerPHID($assign_user->getPHID());
	}
	}
	}
	}

	$template_id = $request->getInt('template');

	// You can only have a parent task if you're creating a new task.
	$parent_id = $request->getInt('parent');
	if (strlen($parent_id)) {
	$parent_task = id(new ManiphestTaskQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withIDs(array($parent_id))
	->executeOne();
	if (!$parent_task) {
	return new Aphront404Response();
	}
	if (!$template_id) {
	$template_id = $parent_id;
	}
	}
	}

	$errors = array();
	$e_title = true;

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

	$aux_fields = $field_list->getFields();

	$v_space = $task->getSpacePHID();

	if ($request->isFormPost()) {
	$changes = array();

	$new_title = $request->getStr('title');
	$new_desc = $request->getStr('description');
	$new_status = $request->getStr('status');
	$v_space = $request->getStr('spacePHID');

	if (!$task->getID()) {
	$workflow = 'create';
	} else {
	$workflow = '';
	}

	$changes[ManiphestTransaction::TYPE_TITLE] = $new_title;
	$changes[ManiphestTransaction::TYPE_DESCRIPTION] = $new_desc;

	if ($can_edit_status) {
	$changes[ManiphestTransaction::TYPE_STATUS] = $new_status;
	} else if (!$task->getID()) {
	// Create an initial status transaction for the burndown chart.
	// TODO: We can probably remove this once Facts comes online.
	$changes[ManiphestTransaction::TYPE_STATUS] = $task->getStatus();
	}

	$owner_tokenizer = $request->getArr('assigned_to');
	$owner_phid = reset($owner_tokenizer);

	if (!strlen($new_title)) {
	$e_title = pht('Required');
	$errors[] = pht('Title is required.');
	}

	$old_values = array();
	foreach ($aux_fields as $aux_arr_key => $aux_field) {
	// TODO: This should be buildFieldTransactionsFromRequest() once we
	// switch to ApplicationTransactions properly.

	$aux_old_value = $aux_field->getOldValueForApplicationTransactions();
	$aux_field->readValueFromRequest($request);
	$aux_new_value = $aux_field->getNewValueForApplicationTransactions();

	// TODO: We're faking a call to the ApplicaitonTransaction validation
	// logic here. We need valid objects to pass, but they aren't used
	// in a meaningful way. For now, build User objects. Once the Maniphest
	// objects exist, this will switch over automatically. This is a big
	// hack but shouldn't be long for this world.
	$placeholder_editor = new PhabricatorUserProfileEditor();

	$field_errors = $aux_field->validateApplicationTransactions(
	$placeholder_editor,
	PhabricatorTransactions::TYPE_CUSTOMFIELD,
	array(
	id(new ManiphestTransaction())
	->setOldValue($aux_old_value)
	->setNewValue($aux_new_value),
	));

	foreach ($field_errors as $error) {
	$errors[] = $error->getMessage();
	}

	$old_values[$aux_field->getFieldKey()] = $aux_old_value;
	}

	if ($errors) {
	$task->setTitle($new_title);
	$task->setDescription($new_desc);
	$task->setPriority($request->getInt('priority'));
	$task->setOwnerPHID($owner_phid);
	$task->attachSubscriberPHIDs($request->getArr('cc'));
	$task->attachProjectPHIDs($request->getArr('projects'));
	} else {

	if ($can_edit_priority) {
	$changes[ManiphestTransaction::TYPE_PRIORITY] =
	$request->getInt('priority');
	}
	if ($can_edit_assign) {
	$changes[ManiphestTransaction::TYPE_OWNER] = $owner_phid;
	}

	$changes[PhabricatorTransactions::TYPE_SUBSCRIBERS] =
	array('=' => $request->getArr('cc'));

	if ($can_edit_projects) {
	$projects = $request->getArr('projects');
	$changes[PhabricatorTransactions::TYPE_EDGE] =
	$projects;
	$column_phid = $request->getStr('columnPHID');
	// allow for putting a task in a project column at creation -only-
	if (!$task->getID() && $column_phid && $projects) {
	$column = id(new PhabricatorProjectColumnQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withProjectPHIDs($projects)
	->withPHIDs(array($column_phid))
	->executeOne();
	if ($column) {
	$changes[ManiphestTransaction::TYPE_PROJECT_COLUMN] =
	array(
	'new' => array(
	'projectPHID' => $column->getProjectPHID(),
	'columnPHIDs' => array($column_phid),
	),
	'old' => array(
	'projectPHID' => $column->getProjectPHID(),
	'columnPHIDs' => array(),
	),
	);
	}
	}
	}

	if ($can_edit_policies) {
	$changes[PhabricatorTransactions::TYPE_SPACE] = $v_space;
	$changes[PhabricatorTransactions::TYPE_VIEW_POLICY] =
	$request->getStr('viewPolicy');
	$changes[PhabricatorTransactions::TYPE_EDIT_POLICY] =
	$request->getStr('editPolicy');
	}

	$template = new ManiphestTransaction();
	$transactions = array();

	foreach ($changes as $type => $value) {
	$transaction = clone $template;
	$transaction->setTransactionType($type);
	if ($type == ManiphestTransaction::TYPE_PROJECT_COLUMN) {
	$transaction->setNewValue($value['new']);
	$transaction->setOldValue($value['old']);
	} else if ($type == PhabricatorTransactions::TYPE_EDGE) {
	$project_type =
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$transaction
	->setMetadataValue('edge:type', $project_type)
	->setNewValue(
	array(
	'=' => array_fuse($value),
	));
	} else {
	$transaction->setNewValue($value);
	}
	$transactions[] = $transaction;
	}

	if ($aux_fields) {
	foreach ($aux_fields as $aux_field) {
	$transaction = clone $template;
	$transaction->setTransactionType(
	PhabricatorTransactions::TYPE_CUSTOMFIELD);
	$aux_key = $aux_field->getFieldKey();
	$transaction->setMetadataValue('customfield:key', $aux_key);
	$old = idx($old_values, $aux_key);
	$new = $aux_field->getNewValueForApplicationTransactions();

	$transaction->setOldValue($old);
	$transaction->setNewValue($new);

	$transactions[] = $transaction;
	}
	}

	if ($transactions) {
	$is_new = !$task->getID();

	$event = new PhabricatorEvent(
	PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK,
	array(
	'task' => $task,
	'new' => $is_new,
	'transactions' => $transactions,
	));
	- $event->setUser($user);
	+ $event->setUser($viewer);
	$event->setAphrontRequest($request);
	PhutilEventEngine::dispatchEvent($event);

	$task = $event->getValue('task');
	$transactions = $event->getValue('transactions');

	$editor = id(new ManiphestTransactionEditor())
	- ->setActor($user)
	+ ->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true)
	->applyTransactions($task, $transactions);

	$event = new PhabricatorEvent(
	PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
	array(
	'task' => $task,
	'new' => $is_new,
	'transactions' => $transactions,
	));
	- $event->setUser($user);
	+ $event->setUser($viewer);
	$event->setAphrontRequest($request);
	PhutilEventEngine::dispatchEvent($event);
	}


	if ($parent_task) {
	// TODO: This should be transactional now.
	id(new PhabricatorEdgeEditor())
	->addEdge(
	$parent_task->getPHID(),
	ManiphestTaskDependsOnTaskEdgeType::EDGECONST,
	$task->getPHID())
	->save();
	$workflow = $parent_task->getID();
	}

	if ($request->isAjax()) {
	switch ($response_type) {
	case 'card':
	$owner = null;
	if ($task->getOwnerPHID()) {
	$owner = id(new PhabricatorHandleQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withPHIDs(array($task->getOwnerPHID()))
	->executeOne();
	}
	$tasks = id(new ProjectBoardTaskCard())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->setTask($task)
	->setOwner($owner)
	->setCanEdit(true)
	->getItem();

	$column = id(new PhabricatorProjectColumnQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withPHIDs(array($request->getStr('columnPHID')))
	->executeOne();
	if (!$column) {
	return new Aphront404Response();
	}

	// re-load projects for accuracy as they are not re-loaded via
	// the editor
	$project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$task->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	$task->attachProjectPHIDs($project_phids);
	$remove_from_board = false;
	if (!in_array($column->getProjectPHID(), $project_phids)) {
	$remove_from_board = true;
	}

	$positions = id(new PhabricatorProjectColumnPositionQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withColumns(array($column))
	->execute();
	$task_phids = mpull($positions, 'getObjectPHID');

	$column_tasks = id(new ManiphestTaskQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withPHIDs($task_phids)
	->execute();

	if ($order == PhabricatorProjectColumn::ORDER_NATURAL) {
	// TODO: This is a little bit awkward, because PHP and JS use
	// slightly different sort order parameters to achieve the same
	// effect. It would be good to unify this a bit at some point.
	$sort_map = array();
	foreach ($positions as $position) {
	$sort_map[$position->getObjectPHID()] = array(
	-$position->getSequence(),
	$position->getID(),
	);
	}
	} else {
	$sort_map = mpull(
	$column_tasks,
	'getPrioritySortVector',
	'getPHID');
	}

	$data = array(
	'sortMap' => $sort_map,
	'removeFromBoard' => $remove_from_board,
	);
	break;
	case 'task':
	default:
	$tasks = $this->renderSingleTask($task);
	$data = array();
	break;
	}
	return id(new AphrontAjaxResponse())->setContent(
	array(
	'tasks' => $tasks,
	'data' => $data,
	));
	}

	$redirect_uri = '/T'.$task->getID();

	if ($workflow) {
	$redirect_uri .= '?workflow='.$workflow;
	}

	return id(new AphrontRedirectResponse())
	->setURI($redirect_uri);
	}
	} else {
	if (!$task->getID()) {
	$task->attachSubscriberPHIDs(array(
	- $user->getPHID(),
	+ $viewer->getPHID(),
	));
	if ($template_id) {
	$template_task = id(new ManiphestTaskQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withIDs(array($template_id))
	->needSubscriberPHIDs(true)
	->needProjectPHIDs(true)
	->executeOne();
	if ($template_task) {
	$cc_phids = array_unique(array_merge(
	$template_task->getSubscriberPHIDs(),
	- array($user->getPHID())));
	+ array($viewer->getPHID())));
	$task->attachSubscriberPHIDs($cc_phids);
	$task->attachProjectPHIDs($template_task->getProjectPHIDs());
	$task->setOwnerPHID($template_task->getOwnerPHID());
	$task->setPriority($template_task->getPriority());
	$task->setViewPolicy($template_task->getViewPolicy());
	$task->setEditPolicy($template_task->getEditPolicy());

	$v_space = $template_task->getSpacePHID();

	$template_fields = PhabricatorCustomField::getObjectFields(
	$template_task,
	PhabricatorCustomField::ROLE_EDIT);

	$fields = $template_fields->getFields();
	foreach ($fields as $key => $field) {
	if (!$field->shouldCopyWhenCreatingSimilarTask()) {
	unset($fields[$key]);
	}
	if (empty($aux_fields[$key])) {
	unset($fields[$key]);
	}
	}

	if ($fields) {
	id(new PhabricatorCustomFieldList($fields))
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->readFieldsFromStorage($template_task);

	foreach ($fields as $key => $field) {
	$aux_fields[$key]->setValueFromStorage(
	$field->getValueForStorage());
	}
	}
	}
	}
	}
	}

	$error_view = null;
	if ($errors) {
	$error_view = new PHUIInfoView();
	$error_view->setErrors($errors);
	}

	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();

	if ($task->getOwnerPHID()) {
	$assigned_value = array($task->getOwnerPHID());
	} else {
	$assigned_value = array();
	}

	if ($task->getSubscriberPHIDs()) {
	$cc_value = $task->getSubscriberPHIDs();
	} else {
	$cc_value = array();
	}

	if ($task->getProjectPHIDs()) {
	$projects_value = $task->getProjectPHIDs();
	} else {
	$projects_value = array();
	}

	$cancel_id = nonempty($task->getID(), $template_id);
	if ($cancel_id) {
	$cancel_uri = '/T'.$cancel_id;
	} else {
	$cancel_uri = '/maniphest/';
	}

	if ($task->getID()) {
	$button_name = pht('Save Task');
	$header_name = pht('Edit Task');
	} else if ($parent_task) {
	$cancel_uri = '/T'.$parent_task->getID();
	$button_name = pht('Create Task');
	$header_name = pht('Create New Subtask');
	} else {
	$button_name = pht('Create Task');
	$header_name = pht('Create New Task');
	}

	require_celerity_resource('maniphest-task-edit-css');

	$project_tokenizer_id = celerity_generate_unique_node_id();

	$form = new AphrontFormView();
	$form
	- ->setUser($user)
	+ ->setUser($viewer)
	->addHiddenInput('template', $template_id)
	->addHiddenInput('responseType', $response_type)
	->addHiddenInput('order', $order)
	->addHiddenInput('ungrippable', $request->getStr('ungrippable'))
	->addHiddenInput('columnPHID', $request->getStr('columnPHID'));

	if ($parent_task) {
	$form
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel(pht('Parent Task'))
	- ->setValue($user->renderHandle($parent_task->getPHID())))
	+ ->setValue($viewer->renderHandle($parent_task->getPHID())))
	->addHiddenInput('parent', $parent_task->getID());
	}

	$form
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel(pht('Title'))
	->setName('title')
	->setError($e_title)
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
	->setValue($task->getTitle()));

	if ($can_edit_status) {
	// See T4819.
	$status_map = ManiphestTaskStatus::getTaskStatusMap();
	$dup_status = ManiphestTaskStatus::getDuplicateStatus();

	if ($task->getStatus() != $dup_status) {
	unset($status_map[$dup_status]);
	}

	$form
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Status'))
	->setName('status')
	->setValue($task->getStatus())
	->setOptions($status_map));
	}

	$policies = id(new PhabricatorPolicyQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->setObject($task)
	->execute();

	if ($can_edit_assign) {
	$form->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Assigned To'))
	->setName('assigned_to')
	->setValue($assigned_value)
	- ->setUser($user)
	+ ->setUser($viewer)
	->setDatasource(new PhabricatorPeopleDatasource())
	->setLimit(1));
	}

	$form
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('CC'))
	->setName('cc')
	->setValue($cc_value)
	- ->setUser($user)
	+ ->setUser($viewer)
	->setDatasource(new PhabricatorMetaMTAMailableDatasource()));

	if ($can_edit_priority) {
	$form
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Priority'))
	->setName('priority')
	->setOptions($priority_map)
	->setValue($task->getPriority()));
	}

	if ($can_edit_policies) {
	$form
	->appendChild(
	id(new AphrontFormPolicyControl())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	->setPolicyObject($task)
	->setPolicies($policies)
	->setSpacePHID($v_space)
	->setName('viewPolicy'))
	->appendChild(
	id(new AphrontFormPolicyControl())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setPolicyObject($task)
	->setPolicies($policies)
	->setName('editPolicy'));
	}

	if ($can_edit_projects) {
	$caption = null;
	if ($can_create_projects) {
	$caption = javelin_tag(
	'a',
	array(
	'href' => '/project/create/',
	'mustcapture' => true,
	'sigil' => 'project-create',
	),
	pht('Create New Project'));
	}
	$form
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setValue($projects_value)
	->setID($project_tokenizer_id)
	->setCaption($caption)
	->setDatasource(new PhabricatorProjectDatasource()));
	}

	$field_list->appendFieldsToForm($form);

	require_celerity_resource('phui-info-view-css');

	Javelin::initBehavior('project-create', array(
	'tokenizerID' => $project_tokenizer_id,
	));

	$description_control = id(new PhabricatorRemarkupControl())
	->setLabel(pht('Description'))
	->setName('description')
	->setID('description-textarea')
	->setValue($task->getDescription())
	- ->setUser($user);
	+ ->setUser($viewer);

	$form
	->appendChild($description_control);

	if ($request->isAjax()) {
	$dialog = id(new AphrontDialogView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setWidth(AphrontDialogView::WIDTH_FULL)
	->setTitle($header_name)
	->appendChild(
	array(
	$error_view,
	$form->buildLayoutView(),
	))
	->addCancelButton($cancel_uri)
	->addSubmitButton($button_name);
	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($cancel_uri)
	->setValue($button_name));

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($header_name)
	->setFormErrors($errors)
	->setForm($form);

	$preview = id(new PHUIRemarkupPreviewPanel())
	->setHeader(pht('Description Preview'))
	->setControlID('description-textarea')
	->setPreviewURI($this->getApplicationURI('task/descriptionpreview/'));

	if ($task->getID()) {
	$page_objects = array($task->getPHID());
	} else {
	$page_objects = array();
	}

	$crumbs = $this->buildApplicationCrumbs();

	if ($task->getID()) {
	$crumbs->addTextCrumb('T'.$task->getID(), '/T'.$task->getID());
	}

	$crumbs->addTextCrumb($header_name);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$form_box,
	$preview,
	),
	array(
	'title' => $header_name,
	'pageObjects' => $page_objects,
	));
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestTaskListController.php b/src/applications/maniphest/controller/ManiphestTaskListController.php
	index 9d2fa33716..ddb2827e83 100644
	--- a/src/applications/maniphest/controller/ManiphestTaskListController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskListController.php
	@@ -1,27 +1,23 @@
	<?php

	final class ManiphestTaskListController
	extends ManiphestController {

	- private $queryKey;
	-
	public function shouldAllowPublic() {
	return true;
	}

	- public function willProcessRequest(array $data) {
	- $this->queryKey = idx($data, 'queryKey');
	- }
	+ public function handleRequest(AphrontRequest $request) {
	+ $querykey = $request->getURIData('queryKey');

	- public function processRequest() {
	$controller = id(new PhabricatorApplicationSearchController())
	- ->setQueryKey($this->queryKey)
	+ ->setQueryKey($querykey)
	->setSearchEngine(
	id(new ManiphestTaskSearchEngine())
	->setShowBatchControls(true))
	->setNavigation($this->buildSideNavView());

	return $this->delegateToController($controller);
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
	index 0d7988cd64..65756ca8e4 100644
	--- a/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
	+++ b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
	@@ -1,135 +1,128 @@
	<?php

	final class ManiphestTransactionPreviewController extends ManiphestController {

	- private $id;
	-
	- public function willProcessRequest(array $data) {
	- $this->id = $data['id'];
	- }
	-
	- public function processRequest() {
	-
	- $request = $this->getRequest();
	- $user = $request->getUser();
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $this->getViewer();
	+ $id = $request->getURIData('id');

	$comments = $request->getStr('comments');

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

	id(new PhabricatorDraft())
	- ->setAuthorPHID($user->getPHID())
	+ ->setAuthorPHID($viewer->getPHID())
	->setDraftKey($task->getPHID())
	->setDraft($comments)
	->replaceOrDelete();

	$action = $request->getStr('action');

	$transaction = new ManiphestTransaction();
	- $transaction->setAuthorPHID($user->getPHID());
	+ $transaction->setAuthorPHID($viewer->getPHID());
	$transaction->setTransactionType($action);

	// This should really be split into a separate transaction, but it should
	// all come out in the wash once we fully move to modern stuff.
	$transaction->attachComment(
	id(new ManiphestTransactionComment())
	->setContent($comments));

	$value = $request->getStr('value');
	// grab phids for handles and set transaction values based on action and
	// value (empty or control-specific format) coming in from the wire
	switch ($action) {
	case ManiphestTransaction::TYPE_PRIORITY:
	$transaction->setOldValue($task->getPriority());
	$transaction->setNewValue($value);
	break;
	case ManiphestTransaction::TYPE_OWNER:
	if ($value) {
	$value = current(json_decode($value));
	$phids = array($value);
	} else {
	$phids = array();
	}
	$transaction->setNewValue($value);
	break;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	if ($value) {
	$value = json_decode($value);
	}
	if (!$value) {
	$value = array();
	}
	$phids = array();
	foreach ($value as $cc_phid) {
	$phids[] = $cc_phid;
	}
	$transaction->setOldValue(array());
	$transaction->setNewValue($phids);
	break;
	case PhabricatorTransactions::TYPE_EDGE:
	if ($value) {
	$value = phutil_json_decode($value);
	}
	if (!$value) {
	$value = array();
	}

	$phids = array();
	$value = array_fuse($value);
	foreach ($value as $project_phid) {
	$phids[] = $project_phid;
	$value[$project_phid] = array('dst' => $project_phid);
	}

	$project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$transaction
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $project_type)
	->setOldValue(array())
	->setNewValue($value);
	break;
	case ManiphestTransaction::TYPE_STATUS:
	$phids = array();
	$transaction->setOldValue($task->getStatus());
	$transaction->setNewValue($value);
	break;
	default:
	$phids = array();
	$transaction->setNewValue($value);
	break;
	}
	- $phids[] = $user->getPHID();
	+ $phids[] = $viewer->getPHID();

	$handles = $this->loadViewerHandles($phids);

	$transactions = array();
	$transactions[] = $transaction;

	$engine = new PhabricatorMarkupEngine();
	- $engine->setViewer($user);
	+ $engine->setViewer($viewer);
	$engine->setContextObject($task);
	if ($transaction->hasComment()) {
	$engine->addObject(
	$transaction->getComment(),
	PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
	}
	$engine->process();

	$transaction->setHandles($handles);

	$view = id(new PhabricatorApplicationTransactionView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setTransactions($transactions)
	->setIsPreview(true);

	return id(new AphrontAjaxResponse())
	->setContent((string)phutil_implode_html('', $view->buildEvents()));
	}

	}
	diff --git a/src/applications/maniphest/controller/ManiphestTransactionSaveController.php b/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
	index f7693d9416..b060b18cab 100644
	--- a/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
	+++ b/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
	@@ -1,210 +1,209 @@
	<?php

	final class ManiphestTransactionSaveController extends ManiphestController {

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

	$task = id(new ManiphestTaskQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withIDs(array($request->getStr('taskID')))
	->needSubscriberPHIDs(true)
	->needProjectPHIDs(true)
	->executeOne();
	if (!$task) {
	return new Aphront404Response();
	}

	$task_uri = '/'.$task->getMonogram();

	$transactions = array();

	$action = $request->getStr('action');

	$implicit_ccs = array();
	$explicit_ccs = array();

	$transaction = new ManiphestTransaction();
	$transaction
	->setTransactionType($action);

	switch ($action) {
	case ManiphestTransaction::TYPE_STATUS:
	$transaction->setNewValue($request->getStr('resolution'));
	break;
	case ManiphestTransaction::TYPE_OWNER:
	$assign_to = $request->getArr('assign_to');
	$assign_to = reset($assign_to);
	$transaction->setNewValue($assign_to);
	break;
	case PhabricatorTransactions::TYPE_EDGE:
	$projects = $request->getArr('projects');
	$projects = array_merge($projects, $task->getProjectPHIDs());
	$projects = array_filter($projects);
	$projects = array_unique($projects);

	$project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$transaction
	->setMetadataValue('edge:type', $project_type)
	->setNewValue(
	array(
	'+' => array_fuse($projects),
	));
	break;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	// Accumulate the new explicit CCs into the array that we'll add in
	// the CC transaction later.
	$explicit_ccs = $request->getArr('ccs');

	// Throw away the primary transaction.
	$transaction = null;
	break;
	case ManiphestTransaction::TYPE_PRIORITY:
	$transaction->setNewValue($request->getInt('priority'));
	break;
	case PhabricatorTransactions::TYPE_COMMENT:
	// Nuke this, we're going to create it below.
	$transaction = null;
	break;
	default:
	throw new Exception(pht("Unknown action '%s'!", $action));
	}

	if ($transaction) {
	$transactions[] = $transaction;
	}


	// When you interact with a task, we add you to the CC list so you get
	// further updates, and possibly assign the task to you if you took an
	// ownership action (closing it) but it's currently unowned. We also move
	// previous owners to CC if ownership changes. Detect all these conditions
	// and create side-effect transactions for them.

	$implicitly_claimed = false;
	if ($action == ManiphestTransaction::TYPE_OWNER) {
	if ($task->getOwnerPHID() == $transaction->getNewValue()) {
	// If this is actually no-op, don't generate the side effect.
	} else {
	// Otherwise, when a task is reassigned, move the previous owner to CC.
	if ($task->getOwnerPHID()) {
	$implicit_ccs[] = $task->getOwnerPHID();
	}
	}
	}

	if ($action == ManiphestTransaction::TYPE_STATUS) {
	$resolution = $request->getStr('resolution');
	if (!$task->getOwnerPHID() &&
	ManiphestTaskStatus::isClosedStatus($resolution)) {
	// Closing an unassigned task. Assign the user as the owner of
	// this task.
	$assign = new ManiphestTransaction();
	$assign->setTransactionType(ManiphestTransaction::TYPE_OWNER);
	- $assign->setNewValue($user->getPHID());
	+ $assign->setNewValue($viewer->getPHID());
	$transactions[] = $assign;

	$implicitly_claimed = true;
	}
	}

	$user_owns_task = false;
	if ($implicitly_claimed) {
	$user_owns_task = true;
	} else {
	if ($action == ManiphestTransaction::TYPE_OWNER) {
	- if ($transaction->getNewValue() == $user->getPHID()) {
	+ if ($transaction->getNewValue() == $viewer->getPHID()) {
	$user_owns_task = true;
	}
	- } else if ($task->getOwnerPHID() == $user->getPHID()) {
	+ } else if ($task->getOwnerPHID() == $viewer->getPHID()) {
	$user_owns_task = true;
	}
	}

	if (!$user_owns_task) {
	// If we aren't making the user the new task owner and they aren't the
	// existing task owner, add them to CC unless they're aleady CC'd.
	- if (!in_array($user->getPHID(), $task->getSubscriberPHIDs())) {
	- $implicit_ccs[] = $user->getPHID();
	+ if (!in_array($viewer->getPHID(), $task->getSubscriberPHIDs())) {
	+ $implicit_ccs[] = $viewer->getPHID();
	}
	}

	if ($implicit_ccs \|\| $explicit_ccs) {

	// TODO: These implicit CC rules should probably be handled inside the
	// Editor, eventually.

	$all_ccs = array_fuse($implicit_ccs) + array_fuse($explicit_ccs);

	$cc_transaction = id(new ManiphestTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
	->setNewValue(array('+' => $all_ccs));

	if (!$explicit_ccs) {
	$cc_transaction->setIgnoreOnNoEffect(true);
	}

	$transactions[] = $cc_transaction;
	}

	$comments = $request->getStr('comments');
	if (strlen($comments) \|\| !$transactions) {
	$transactions[] = id(new ManiphestTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	->attachComment(
	id(new ManiphestTransactionComment())
	->setContent($comments));
	}

	$event = new PhabricatorEvent(
	PhabricatorEventType::TYPE_MANIPHEST_WILLEDITTASK,
	array(
	'task' => $task,
	'new' => false,
	'transactions' => $transactions,
	));
	- $event->setUser($user);
	+ $event->setUser($viewer);
	$event->setAphrontRequest($request);
	PhutilEventEngine::dispatchEvent($event);

	$task = $event->getValue('task');
	$transactions = $event->getValue('transactions');

	$editor = id(new ManiphestTransactionEditor())
	- ->setActor($user)
	+ ->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnMissingFields(true)
	->setContinueOnNoEffect($request->isContinueRequest());

	try {
	$editor->applyTransactions($task, $transactions);
	} catch (PhabricatorApplicationTransactionNoEffectException $ex) {
	return id(new PhabricatorApplicationTransactionNoEffectResponse())
	->setCancelURI($task_uri)
	->setException($ex);
	}

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	- $user->getPHID(),
	+ $viewer->getPHID(),
	$task->getPHID());
	if ($draft) {
	$draft->delete();
	}

	$event = new PhabricatorEvent(
	PhabricatorEventType::TYPE_MANIPHEST_DIDEDITTASK,
	array(
	'task' => $task,
	'new' => false,
	'transactions' => $transactions,
	));
	- $event->setUser($user);
	+ $event->setUser($viewer);
	$event->setAphrontRequest($request);
	PhutilEventEngine::dispatchEvent($event);

	return id(new AphrontRedirectResponse())->setURI($task_uri);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jul 27, 2:05 PM (1 w, 5 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 185808
Default Alt Text: (90 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions