No OneTemporary
Actions

Size

81 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/maniphest/constants/transactiontype/ManiphestTransactionType.php b/src/applications/maniphest/constants/transactiontype/ManiphestTransactionType.php
	index 01706429c9..1d1444b3c6 100644
	--- a/src/applications/maniphest/constants/transactiontype/ManiphestTransactionType.php
	+++ b/src/applications/maniphest/constants/transactiontype/ManiphestTransactionType.php
	@@ -1,48 +1,49 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group maniphest
	*/
	final class ManiphestTransactionType extends ManiphestConstants {

	const TYPE_NONE = 'comment';
	const TYPE_STATUS = 'status';
	const TYPE_OWNER = 'reassign';
	const TYPE_CCS = 'ccs';
	const TYPE_PROJECTS = 'projects';
	const TYPE_PRIORITY = 'priority';

	const TYPE_ATTACH = 'attach';

	const TYPE_TITLE = 'title';
	const TYPE_DESCRIPTION = 'description';
	+ const TYPE_AUXILIARY = 'aux';

	public static function getTransactionTypeMap() {
	return array(
	self::TYPE_NONE => 'Comment',
	self::TYPE_STATUS => 'Close Task',
	self::TYPE_OWNER => 'Reassign / Claim',
	self::TYPE_CCS => 'Add CCs',
	self::TYPE_PRIORITY => 'Change Priority',
	self::TYPE_ATTACH => 'Upload File',
	self::TYPE_PROJECTS => 'Associate Projects',
	);
	}

	}
	diff --git a/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
	index 0bf1113ec5..34d5873278 100644
	--- a/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
	+++ b/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
	@@ -1,510 +1,503 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group maniphest
	*/
	class ManiphestTaskDetailController extends ManiphestController {

	private $id;

	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 ManiphestTask())->load($this->id);
	if (!$task) {
	return new Aphront404Response();
	}

	$workflow = $request->getStr('workflow');
	$parent_task = null;
	if ($workflow && is_numeric($workflow)) {
	$parent_task = id(new ManiphestTask())->load($workflow);
	}

	- $extensions = ManiphestTaskExtensions::newExtensions();
	- $aux_fields = $extensions->getAuxiliaryFieldSpecifications();
	-
	$transactions = id(new ManiphestTransaction())->loadAllWhere(
	'taskID = %d ORDER BY id ASC',
	$task->getID());

	$phids = array();
	foreach ($transactions as $transaction) {
	foreach ($transaction->extractPHIDs() as $phid) {
	$phids[$phid] = true;
	}
	}
	foreach ($task->getCCPHIDs() as $phid) {
	$phids[$phid] = true;
	}
	foreach ($task->getProjectPHIDs() as $phid) {
	$phids[$phid] = 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 = id(new PhabricatorObjectHandleData($phids))
	->loadHandles();

	$engine = PhabricatorMarkupEngine::newManiphestMarkupEngine();

	$dict = array();
	$dict['Status'] =
	'<strong>'.
	ManiphestTaskStatus::getTaskStatusFullName($task->getStatus()).
	'</strong>';

	$dict['Assigned To'] = $task->getOwnerPHID()
	? $handles[$task->getOwnerPHID()]->renderLink()
	: '<em>None</em>';

	$dict['Priority'] = ManiphestTaskPriority::getTaskPriorityName(
	$task->getPriority());

	$cc = $task->getCCPHIDs();
	if ($cc) {
	$cc_links = array();
	foreach ($cc as $phid) {
	$cc_links[] = $handles[$phid]->renderLink();
	}
	$dict['CC'] = implode(', ', $cc_links);
	} else {
	$dict['CC'] = '<em>None</em>';
	}

	$dict['Author'] = $handles[$task->getAuthorPHID()]->renderLink();

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

	$projects = $task->getProjectPHIDs();
	if ($projects) {
	$project_links = array();
	foreach ($projects as $phid) {
	$project_links[] = $handles[$phid]->renderLink();
	}
	$dict['Projects'] = implode(', ', $project_links);
	} else {
	$dict['Projects'] = '<em>None</em>';
	}

	+ $extensions = ManiphestTaskExtensions::newExtensions();
	+ $aux_fields = $extensions->getAuxiliaryFieldSpecifications();
	if ($aux_fields) {
	+ $task->loadAndAttachAuxiliaryAttributes();
	foreach ($aux_fields as $aux_field) {
	- $attribute = $task->loadAuxiliaryAttribute(
	- $aux_field->getAuxiliaryKey()
	- );
	-
	- if ($attribute) {
	- $aux_field->setValue($attribute->getValue());
	- }
	-
	+ $aux_key = $aux_field->getAuxiliaryKey();
	+ $aux_field->setValue($task->getAuxiliaryAttribute($aux_key));
	$value = $aux_field->renderForDetailView();
	-
	if (strlen($value)) {
	$dict[$aux_field->getLabel()] = $value;
	}
	}
	}

	$dtasks = idx($attached, PhabricatorPHIDConstants::PHID_TYPE_TASK);
	if ($dtasks) {
	$dtask_links = array();
	foreach ($dtasks as $dtask => $info) {
	$dtask_links[] = $handles[$dtask]->renderLink();
	}
	$dtask_links = implode('<br />', $dtask_links);
	$dict['Depends On'] = $dtask_links;
	}

	$revs = idx($attached, PhabricatorPHIDConstants::PHID_TYPE_DREV);
	if ($revs) {
	$rev_links = array();
	foreach ($revs as $rev => $info) {
	$rev_links[] = $handles[$rev]->renderLink();
	}
	$rev_links = implode('<br />', $rev_links);
	$dict['Revisions'] = $rev_links;
	}

	$file_infos = idx($attached, PhabricatorPHIDConstants::PHID_TYPE_FILE);
	if ($file_infos) {
	$file_phids = array_keys($file_infos);

	$files = id(new PhabricatorFile())->loadAllWhere(
	'phid IN (%Ls)',
	$file_phids);

	$views = array();
	foreach ($files as $file) {
	$view = new AphrontFilePreviewView();
	$view->setFile($file);
	$views[] = $view->render();
	}
	$dict['Files'] = implode('', $views);
	}

	$dict['Description'] =
	'<div class="maniphest-task-description">'.
	'<div class="phabricator-remarkup">'.
	$engine->markupText($task->getDescription()).
	'</div>'.
	'</div>';

	require_celerity_resource('mainphest-task-detail-css');

	$table = array();
	foreach ($dict as $key => $value) {
	$table[] =
	'<tr>'.
	'<th>'.phutil_escape_html($key).':</th>'.
	'<td>'.$value.'</td>'.
	'</tr>';
	}
	$table =
	'<table class="maniphest-task-properties">'.
	implode("\n", $table).
	'</table>';

	$context_bar = null;

	if ($parent_task) {
	$context_bar = new AphrontContextBarView();
	$context_bar->addButton(
	phutil_render_tag(
	'a',
	array(
	'href' => '/maniphest/task/create/?parent='.$parent_task->getID(),
	'class' => 'green button',
	),
	'Create Another Subtask'));
	$context_bar->appendChild(
	'Created a subtask of <strong>'.
	$handles[$parent_task->getPHID()]->renderLink().
	'</strong>');
	} else if ($workflow == 'create') {
	$context_bar = new AphrontContextBarView();
	$context_bar->addButton(
	phutil_render_tag(
	'a',
	array(
	'href' => '/maniphest/task/create/?template='.$task->getID(),
	'class' => 'green button',
	),
	'Create Another Task'));
	$context_bar->appendChild('New task created.');
	}

	$actions = array();

	$action = new AphrontHeadsupActionView();
	$action->setName('Edit Task');
	$action->setURI('/maniphest/task/edit/'.$task->getID().'/');
	$action->setClass('action-edit');
	$actions[] = $action;

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

	$action = new AphrontHeadsupActionView();
	$action->setName('Merge Duplicates');
	$action->setURI('/search/attach/'.$task->getPHID().'/TASK/merge/');
	$action->setWorkflow(true);
	$action->setClass('action-merge');
	$actions[] = $action;

	$action = new AphrontHeadsupActionView();
	$action->setName('Create Subtask');
	$action->setURI('/maniphest/task/create/?parent='.$task->getID());
	$action->setClass('action-branch');
	$actions[] = $action;


	$action = new AphrontHeadsupActionView();
	$action->setName('Edit Dependencies');
	$action->setURI('/search/attach/'.$task->getPHID().'/TASK/dependencies/');
	$action->setWorkflow(true);
	$action->setClass('action-dependencies');
	$actions[] = $action;

	$action = new AphrontHeadsupActionView();
	$action->setName('Edit Differential Revisions');
	$action->setURI('/search/attach/'.$task->getPHID().'/DREV/');
	$action->setWorkflow(true);
	$action->setClass('action-attach');
	$actions[] = $action;

	$action_list = new AphrontHeadsupActionListView();
	$action_list->setActions($actions);

	$panel =
	'<div class="maniphest-panel">'.
	$action_list->render().
	'<div class="maniphest-task-detail-core">'.
	'<h1>'.
	'<span class="aphront-headsup-object-name">'.
	phutil_escape_html('T'.$task->getID()).
	'</span>'.
	' '.
	phutil_escape_html($task->getTitle()).
	'</h1>'.
	$table.
	'</div>'.
	'</div>';

	$transaction_types = ManiphestTransactionType::getTransactionTypeMap();
	$resolution_types = ManiphestTaskStatus::getTaskStatusMap();

	if ($task->getStatus() == ManiphestTaskStatus::STATUS_OPEN) {
	$resolution_types = array_select_keys(
	$resolution_types,
	array(
	ManiphestTaskStatus::STATUS_CLOSED_RESOLVED,
	ManiphestTaskStatus::STATUS_CLOSED_WONTFIX,
	ManiphestTaskStatus::STATUS_CLOSED_INVALID,
	ManiphestTaskStatus::STATUS_CLOSED_SPITE,
	));
	} else {
	$resolution_types = array(
	ManiphestTaskStatus::STATUS_OPEN => 'Reopened',
	);
	$transaction_types[ManiphestTransactionType::TYPE_STATUS] =
	'Reopen Task';
	unset($transaction_types[ManiphestTransactionType::TYPE_PRIORITY]);
	unset($transaction_types[ManiphestTransactionType::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;
	}

	$panel_id = celerity_generate_unique_node_id();

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

	if ($is_serious) {
	// Prevent tasks from being closed "out of spite" in serious business
	// installs.
	unset($resolution_types[ManiphestTaskStatus::STATUS_CLOSED_SPITE]);
	}

	$remarkup_href = PhabricatorEnv::getDoclink(
	'article/Remarkup_Reference.html');

	$comment_form = new AphrontFormView();
	$comment_form
	->setUser($user)
	->setAction('/maniphest/transaction/save/')
	->setEncType('multipart/form-data')
	->addHiddenInput('taskID', $task->getID())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Action')
	->setName('action')
	->setOptions($transaction_types)
	->setID('transaction-action'))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Resolution')
	->setName('resolution')
	->setControlID('resolution')
	->setControlStyle('display: none')
	->setOptions($resolution_types))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('Assign To')
	->setName('assign_to')
	->setControlID('assign_to')
	->setControlStyle('display: none')
	->setID('assign-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('CCs')
	->setName('ccs')
	->setControlID('ccs')
	->setControlStyle('display: none')
	->setID('cc-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Priority')
	->setName('priority')
	->setOptions($priority_map)
	->setControlID('priority')
	->setControlStyle('display: none')
	->setValue($task->getPriority()))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('Projects')
	->setName('projects')
	->setControlID('projects')
	->setControlStyle('display: none')
	->setID('projects-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new AphrontFormFileControl())
	->setLabel('File')
	->setName('file')
	->setControlID('file')
	->setControlStyle('display: none'))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Comments')
	->setName('comments')
	->setValue($draft_text)
	->setCaption(
	phutil_render_tag(
	'a',
	array(
	'href' => $remarkup_href,
	'tabindex' => '-1',
	'target' => '_blank',
	),
	'Formatting Reference'))
	->setID('transaction-comments'))
	->appendChild(
	id(new AphrontFormDragAndDropUploadControl())
	->setLabel('Attached Files')
	->setName('files')
	->setDragAndDropTarget($panel_id)
	->setActivatedClass('aphront-panel-view-drag-and-drop'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue($is_serious ? 'Submit' : 'Avast!'));

	$control_map = array(
	ManiphestTransactionType::TYPE_STATUS => 'resolution',
	ManiphestTransactionType::TYPE_OWNER => 'assign_to',
	ManiphestTransactionType::TYPE_CCS => 'ccs',
	ManiphestTransactionType::TYPE_PRIORITY => 'priority',
	ManiphestTransactionType::TYPE_PROJECTS => 'projects',
	ManiphestTransactionType::TYPE_ATTACH => 'file',
	);

	Javelin::initBehavior('maniphest-transaction-controls', array(
	'select' => 'transaction-action',
	'controlMap' => $control_map,
	'tokenizers' => array(
	ManiphestTransactionType::TYPE_PROJECTS => array(
	'id' => 'projects-tokenizer',
	'src' => '/typeahead/common/projects/',
	'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
	),
	ManiphestTransactionType::TYPE_OWNER => array(
	'id' => 'assign-tokenizer',
	'src' => '/typeahead/common/users/',
	'value' => $default_claim,
	'limit' => 1,
	'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
	),
	ManiphestTransactionType::TYPE_CCS => array(
	'id' => 'cc-tokenizer',
	'src' => '/typeahead/common/mailable/',
	'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
	),
	),
	));


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

	$comment_panel = new AphrontPanelView();
	$comment_panel->appendChild($comment_form);
	$comment_panel->setID($panel_id);
	$comment_panel->addClass('aphront-panel-accent');
	$comment_panel->setHeader($is_serious ? 'Add Comment' : 'Weigh In');

	$preview_panel =
	'<div class="aphront-panel-preview">
	<div id="transaction-preview">
	<div class="aphront-panel-preview-loading-text">
	Loading preview...
	</div>
	</div>
	</div>';

	$transaction_view = new ManiphestTransactionListView();
	$transaction_view->setTransactions($transactions);
	$transaction_view->setHandles($handles);
	$transaction_view->setUser($user);
	$transaction_view->setMarkupEngine($engine);

	return $this->buildStandardPageResponse(
	array(
	$context_bar,
	$panel,
	$transaction_view,
	$comment_panel,
	$preview_panel,
	),
	array(
	'title' => 'T'.$task->getID().' '.$task->getTitle(),
	));
	}

	}
	diff --git a/src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php b/src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php
	index 80680ef8f4..044cc733b9 100644
	--- a/src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php
	+++ b/src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php
	@@ -1,511 +1,515 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group maniphest
	*/
	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();

	$files = array();
	$parent_task = null;
	$template_id = null;

	if ($this->id) {
	$task = id(new ManiphestTask())->load($this->id);
	if (!$task) {
	return new Aphront404Response();
	}
	} else {
	$task = new ManiphestTask();
	$task->setPriority(ManiphestTaskPriority::PRIORITY_TRIAGE);
	$task->setAuthorPHID($user->getPHID());

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

	$default_projects = $request->getStr('projects');
	if ($default_projects) {
	$task->setProjectPHIDs(explode(';', $default_projects));
	}
	}

	$file_phids = $request->getArr('files', array());
	if (!$file_phids) {
	// Allow a single 'file' key instead, mostly since Mac OS X urlencodes
	// square brackets in URLs when passed to 'open', so you can't 'open'
	// a URL like '?files[]=xyz' and have PHP interpret it correctly.
	$phid = $request->getStr('file');
	if ($phid) {
	$file_phids = array($phid);
	}
	}

	if ($file_phids) {
	$files = id(new PhabricatorFile())->loadAllWhere(
	'phid IN (%Ls)',
	$file_phids);
	}

	$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 ($parent_id) {
	$parent_task = id(new ManiphestTask())->load($parent_id);
	}
	}

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

	$extensions = ManiphestTaskExtensions::newExtensions();
	$aux_fields = $extensions->getAuxiliaryFieldSpecifications();

	if ($request->isFormPost()) {

	$changes = array();

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

	$workflow = '';

	if ($task->getID()) {
	if ($new_title != $task->getTitle()) {
	$changes[ManiphestTransactionType::TYPE_TITLE] = $new_title;
	}
	if ($new_desc != $task->getDescription()) {
	$changes[ManiphestTransactionType::TYPE_DESCRIPTION] = $new_desc;
	}
	if ($new_status != $task->getStatus()) {
	$changes[ManiphestTransactionType::TYPE_STATUS] = $new_status;
	}
	} else {
	$task->setTitle($new_title);
	$task->setDescription($new_desc);
	$changes[ManiphestTransactionType::TYPE_STATUS] =
	ManiphestTaskStatus::STATUS_OPEN;

	$workflow = 'create';
	}

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

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

	foreach ($aux_fields as $aux_field) {
	$aux_field->setValueFromRequest($request);

	if ($aux_field->isRequired() && !strlen($aux_field->getValue())) {
	$errors[] = $aux_field->getLabel() . ' is required.';
	$aux_field->setError('Required');
	}

	if (strlen($aux_field->getValue())) {
	try {
	$aux_field->validate();
	} catch (Exception $e) {
	$errors[] = $e->getMessage();
	$aux_field->setError('Invalid');
	}
	}
	}

	if ($errors) {
	$task->setPriority($request->getInt('priority'));
	$task->setOwnerPHID($owner_phid);
	$task->setCCPHIDs($request->getArr('cc'));
	$task->setProjectPHIDs($request->getArr('projects'));
	} else {
	if ($request->getInt('priority') != $task->getPriority()) {
	$changes[ManiphestTransactionType::TYPE_PRIORITY] =
	$request->getInt('priority');
	}

	if ($owner_phid != $task->getOwnerPHID()) {
	$changes[ManiphestTransactionType::TYPE_OWNER] = $owner_phid;
	}

	if ($request->getArr('cc') != $task->getCCPHIDs()) {
	$changes[ManiphestTransactionType::TYPE_CCS] = $request->getArr('cc');
	}

	$new_proj_arr = $request->getArr('projects');
	$new_proj_arr = array_values($new_proj_arr);
	sort($new_proj_arr);

	$cur_proj_arr = $task->getProjectPHIDs();
	$cur_proj_arr = array_values($cur_proj_arr);
	sort($cur_proj_arr);

	if ($new_proj_arr != $cur_proj_arr) {
	$changes[ManiphestTransactionType::TYPE_PROJECTS] = $new_proj_arr;
	}

	if ($files) {
	$file_map = mpull($files, 'getPHID');
	$file_map = array_fill_keys($file_map, array());
	$changes[ManiphestTransactionType::TYPE_ATTACH] = array(
	PhabricatorPHIDConstants::PHID_TYPE_FILE => $file_map,
	);
	}

	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_WEB,
	array(
	'ip' => $request->getRemoteAddr(),
	));

	$template = new ManiphestTransaction();
	$template->setAuthorPHID($user->getPHID());
	$template->setContentSource($content_source);
	$transactions = array();

	foreach ($changes as $type => $value) {
	$transaction = clone $template;
	$transaction->setTransactionType($type);
	$transaction->setNewValue($value);
	$transactions[] = $transaction;
	}

	- if ($transactions) {
	+ if ($aux_fields) {
	+ $task->loadAndAttachAuxiliaryAttributes();
	+ foreach ($aux_fields as $aux_field) {
	+ $transaction = clone $template;
	+ $transaction->setTransactionType(
	+ ManiphestTransactionType::TYPE_AUXILIARY);
	+ $aux_key = $aux_field->getAuxiliaryKey();
	+ $transaction->setMetadataValue('aux:key', $aux_key);
	+ $transaction->setNewValue($aux_field->getValueForStorage());
	+ $transactions[] = $transaction;
	+ }
	+ }

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

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

	$editor = new ManiphestTransactionEditor();
	$editor->applyTransactions($task, $transactions);
	}

	- // TODO: Capture auxiliary field changes in a transaction
	- foreach ($aux_fields as $aux_field) {
	- $task->setAuxiliaryAttribute(
	- $aux_field->getAuxiliaryKey(),
	- $aux_field->getValueForStorage()
	- );
	- }
	-
	if ($parent_task) {
	$type_task = PhabricatorPHIDConstants::PHID_TYPE_TASK;

	// NOTE: It's safe to simply apply this transaction without doing
	// cycle detection because we know the new task has no children.
	$new_value = $parent_task->getAttached();
	$new_value[$type_task][$task->getPHID()] = array();

	$parent_xaction = clone $template;
	$attach_type = ManiphestTransactionType::TYPE_ATTACH;
	$parent_xaction->setTransactionType($attach_type);
	$parent_xaction->setNewValue($new_value);

	$editor = new ManiphestTransactionEditor();
	$editor->applyTransactions($parent_task, array($parent_xaction));

	$workflow = $parent_task->getID();
	}

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

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

	return id(new AphrontRedirectResponse())
	->setURI($redirect_uri);
	}
	} else {
	if (!$task->getID()) {
	$task->setCCPHIDs(array(
	$user->getPHID(),
	));
	if ($template_id) {
	$template_task = id(new ManiphestTask())->load($template_id);
	if ($template_task) {
	$task->setCCPHIDs($template_task->getCCPHIDs());
	$task->setProjectPHIDs($template_task->getProjectPHIDs());
	$task->setOwnerPHID($template_task->getOwnerPHID());
	}
	}
	}
	}

	$phids = array_merge(
	array($task->getOwnerPHID()),
	$task->getCCPHIDs(),
	$task->getProjectPHIDs());

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

	$phids = array_filter($phids);
	$phids = array_unique($phids);

	$handles = id(new PhabricatorObjectHandleData($phids))
	->loadHandles($phids);

	$tvalues = mpull($handles, 'getFullName', 'getPHID');

	$error_view = null;
	if ($errors) {
	$error_view = new AphrontErrorView();
	$error_view->setErrors($errors);
	$error_view->setTitle('Form Errors');
	}

	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();

	if ($task->getOwnerPHID()) {
	$assigned_value = array(
	$task->getOwnerPHID() => $handles[$task->getOwnerPHID()]->getFullName(),
	);
	} else {
	$assigned_value = array();
	}

	if ($task->getCCPHIDs()) {
	$cc_value = array_select_keys($tvalues, $task->getCCPHIDs());
	} else {
	$cc_value = array();
	}

	if ($task->getProjectPHIDs()) {
	$projects_value = array_select_keys($tvalues, $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 = 'Save Task';
	$header_name = 'Edit Task';
	} else if ($parent_task) {
	$cancel_uri = '/T'.$parent_task->getID();
	$button_name = 'Create Task';
	$header_name = 'Create New Subtask';
	} else {
	$button_name = 'Create Task';
	$header_name = 'Create New Task';
	}

	$project_tokenizer_id = celerity_generate_unique_node_id();

	$form = new AphrontFormView();
	$form
	->setUser($user)
	->setAction($request->getRequestURI()->getPath())
	->addHiddenInput('template', $template_id);

	if ($parent_task) {
	$form
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Parent Task')
	->setValue($handles[$parent_task->getPHID()]->getFullName()))
	->addHiddenInput('parent', $parent_task->getID());
	}

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

	if ($task->getID()) {
	// Only show this in "edit" mode, not "create" mode, since creating a
	// non-open task is kind of silly and it would just clutter up the
	// "create" interface.
	$form
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Status')
	->setName('status')
	->setValue($task->getStatus())
	->setOptions(ManiphestTaskStatus::getTaskStatusMap()));
	}

	$form
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('Assigned To')
	->setName('assigned_to')
	->setValue($assigned_value)
	->setDatasource('/typeahead/common/users/')
	->setLimit(1))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('CC')
	->setName('cc')
	->setValue($cc_value)
	->setDatasource('/typeahead/common/mailable/'))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Priority')
	->setName('priority')
	->setOptions($priority_map)
	->setValue($task->getPriority()))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('Projects')
	->setName('projects')
	->setValue($projects_value)
	->setID($project_tokenizer_id)
	->setCaption(
	javelin_render_tag(
	'a',
	array(
	'href' => '/project/create/',
	'mustcapture' => true,
	'sigil' => 'project-create',
	),
	'Create New Project'))
	->setDatasource('/typeahead/common/projects/'));

	- $attributes = $task->loadAuxiliaryAttributes();
	- $attributes = mpull($attributes, 'getValue', 'getName');
	+ if ($aux_fields) {

	- foreach ($aux_fields as $aux_field) {
	if (!$request->isFormPost()) {
	- $attribute = null;
	-
	- if (isset($attributes[$aux_field->getAuxiliaryKey()])) {
	- $attribute = $attributes[$aux_field->getAuxiliaryKey()];
	- $aux_field->setValueFromStorage($attribute);
	+ $task->loadAndAttachAuxiliaryAttributes();
	+ foreach ($aux_fields as $aux_field) {
	+ $aux_key = $aux_field->getAuxiliaryKey();
	+ $value = $task->getAuxiliaryAttribute($aux_key);
	+ $aux_field->setValueFromStorage($value);
	}
	}

	- if ($aux_field->isRequired() && !$aux_field->getError()
	- && !$aux_field->getValue()) {
	- $aux_field->setError(true);
	- }
	-
	- $aux_control = $aux_field->renderControl();
	+ foreach ($aux_fields as $aux_field) {
	+ if ($aux_field->isRequired() &&
	+ !$aux_field->getError() &&
	+ !$aux_field->getValue()) {
	+ $aux_field->setError(true);
	+ }

	- $form->appendChild($aux_control);
	+ $aux_control = $aux_field->renderControl();
	+ $form->appendChild($aux_control);
	+ }
	}

	require_celerity_resource('aphront-error-view-css');

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

	if ($files) {
	$file_display = array();
	foreach ($files as $file) {
	$file_display[] = phutil_escape_html($file->getName());
	}
	$file_display = implode('<br />', $file_display);

	$form->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel('Files')
	->setValue($file_display));

	foreach ($files as $ii => $file) {
	$form->addHiddenInput('files['.$ii.']', $file->getPHID());
	}
	}

	$email_create = PhabricatorEnv::getEnvConfig(
	'metamta.maniphest.public-create-email');
	$email_hint = null;
	if (!$task->getID() && $email_create) {
	$email_hint = 'You can also create tasks by sending an email to: '.
	'<tt>'.phutil_escape_html($email_create).'</tt>';
	}

	$panel_id = celerity_generate_unique_node_id();

	$form
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Description')
	->setName('description')
	->setCaption($email_hint)
	->setValue($task->getDescription()));

	if (!$task->getID()) {
	$form
	->appendChild(
	id(new AphrontFormDragAndDropUploadControl())
	->setLabel('Attached Files')
	->setName('files')
	->setDragAndDropTarget($panel_id)
	->setActivatedClass('aphront-panel-view-drag-and-drop'));
	}

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

	$panel = new AphrontPanelView();
	$panel->setWidth(AphrontPanelView::WIDTH_FULL);
	$panel->setHeader($header_name);
	$panel->setID($panel_id);
	$panel->appendChild($form);

	return $this->buildStandardPageResponse(
	array(
	$error_view,
	$panel,
	),
	array(
	'title' => 'Create Task',
	));
	}
	}
	diff --git a/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php
	index f3f153bab3..6ac800617f 100644
	--- a/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php
	+++ b/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php
	@@ -1,340 +1,352 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group maniphest
	*/
	class ManiphestTransactionEditor {

	private $parentMessageID;

	public function setParentMessageID($parent_message_id) {
	$this->parentMessageID = $parent_message_id;
	return $this;
	}

	public function applyTransactions($task, array $transactions) {

	$email_cc = $task->getCCPHIDs();

	$email_to = array();
	$email_to[] = $task->getOwnerPHID();

	foreach ($transactions as $key => $transaction) {
	$type = $transaction->getTransactionType();
	$new = $transaction->getNewValue();
	$email_to[] = $transaction->getAuthorPHID();

	$value_is_phid_set = false;

	switch ($type) {
	case ManiphestTransactionType::TYPE_NONE:
	$old = null;
	break;
	case ManiphestTransactionType::TYPE_STATUS:
	$old = $task->getStatus();
	break;
	case ManiphestTransactionType::TYPE_OWNER:
	$old = $task->getOwnerPHID();
	break;
	case ManiphestTransactionType::TYPE_CCS:
	$old = $task->getCCPHIDs();
	$value_is_phid_set = true;
	break;
	case ManiphestTransactionType::TYPE_PRIORITY:
	$old = $task->getPriority();
	break;
	case ManiphestTransactionType::TYPE_ATTACH:
	$old = $task->getAttached();
	break;
	case ManiphestTransactionType::TYPE_TITLE:
	$old = $task->getTitle();
	break;
	case ManiphestTransactionType::TYPE_DESCRIPTION:
	$old = $task->getDescription();
	break;
	case ManiphestTransactionType::TYPE_PROJECTS:
	$old = $task->getProjectPHIDs();
	$value_is_phid_set = true;
	break;
	+ case ManiphestTransactionType::TYPE_AUXILIARY:
	+ $aux_key = $transaction->getMetadataValue('aux:key');
	+ if (!$aux_key) {
	+ throw new Exception(
	+ "Expected 'aux:key' metadata on TYPE_AUXILIARY transaction.");
	+ }
	+ $old = $task->getAuxiliaryAttribute($aux_key);
	+ break;
	default:
	throw new Exception('Unknown action type.');
	}

	$old_cmp = $old;
	$new_cmp = $new;
	if ($value_is_phid_set) {

	// Normalize the old and new values if they are PHID sets so we don't
	// get any no-op transactions where the values differ only by keys,
	// order, duplicates, etc.

	if (is_array($old)) {
	$old = array_filter($old);
	$old = array_unique($old);
	sort($old);
	$old = array_values($old);
	$old_cmp = $old;
	}

	if (is_array($new)) {
	$new = array_filter($new);
	$new = array_unique($new);
	$transaction->setNewValue($new);

	$new_cmp = $new;
	sort($new_cmp);
	$new_cmp = array_values($new_cmp);
	}
	}

	if (($old !== null) && ($old_cmp == $new_cmp)) {
	if (count($transactions) > 1 && !$transaction->hasComments()) {
	// If we have at least one other transaction and this one isn't
	// doing anything and doesn't have any comments, just throw it
	// away.
	unset($transactions[$key]);
	continue;
	} else {
	$transaction->setOldValue(null);
	$transaction->setNewValue(null);
	$transaction->setTransactionType(ManiphestTransactionType::TYPE_NONE);
	}
	} else {
	switch ($type) {
	case ManiphestTransactionType::TYPE_NONE:
	break;
	case ManiphestTransactionType::TYPE_STATUS:
	$task->setStatus($new);
	break;
	case ManiphestTransactionType::TYPE_OWNER:
	if ($new) {
	$handles = id(new PhabricatorObjectHandleData(array($new)))
	->loadHandles();
	$task->setOwnerOrdering($handles[$new]->getName());
	} else {
	$task->setOwnerOrdering(null);
	}
	$task->setOwnerPHID($new);
	break;
	case ManiphestTransactionType::TYPE_CCS:
	$task->setCCPHIDs($new);
	break;
	case ManiphestTransactionType::TYPE_PRIORITY:
	$task->setPriority($new);
	break;
	case ManiphestTransactionType::TYPE_ATTACH:
	$task->setAttached($new);
	break;
	case ManiphestTransactionType::TYPE_TITLE:
	$task->setTitle($new);
	break;
	case ManiphestTransactionType::TYPE_DESCRIPTION:
	$task->setDescription($new);
	break;
	case ManiphestTransactionType::TYPE_PROJECTS:
	$task->setProjectPHIDs($new);
	break;
	+ case ManiphestTransactionType::TYPE_AUXILIARY:
	+ $aux_key = $transaction->getMetadataValue('aux:key');
	+ $task->setAuxiliaryAttribute($aux_key, $new);
	+ break;
	default:
	throw new Exception('Unknown action type.');
	}

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

	}

	$task->save();
	foreach ($transactions as $transaction) {
	$transaction->setTaskID($task->getID());
	$transaction->save();
	}

	$email_to[] = $task->getOwnerPHID();
	$email_cc = array_merge(
	$email_cc,
	$task->getCCPHIDs());

	$this->publishFeedStory($task, $transactions);

	// TODO: Do this offline via timeline
	PhabricatorSearchManiphestIndexer::indexTask($task);

	$this->sendEmail($task, $transactions, $email_to, $email_cc);
	}

	protected function getSubjectPrefix() {
	return PhabricatorEnv::getEnvConfig('metamta.maniphest.subject-prefix');
	}

	private function sendEmail($task, $transactions, $email_to, $email_cc) {
	$email_to = array_filter(array_unique($email_to));
	$email_cc = array_filter(array_unique($email_cc));

	$phids = array();
	foreach ($transactions as $transaction) {
	foreach ($transaction->extractPHIDs() as $phid) {
	$phids[$phid] = true;
	}
	}
	foreach ($email_to as $phid) {
	$phids[$phid] = true;
	}
	foreach ($email_cc as $phid) {
	$phids[$phid] = true;
	}
	$phids = array_keys($phids);

	$handles = id(new PhabricatorObjectHandleData($phids))
	->loadHandles();

	$view = new ManiphestTransactionDetailView();
	$view->setTransactionGroup($transactions);
	$view->setHandles($handles);
	list($action, $body) = $view->renderForEmail($with_date = false);

	$is_create = $this->isCreate($transactions);

	$task_uri = PhabricatorEnv::getURI('/T'.$task->getID());

	$reply_handler = $this->buildReplyHandler($task);

	if ($is_create) {
	$body .=
	"\n\n".
	"TASK DESCRIPTION\n".
	" ".$task->getDescription();
	}

	$body .=
	"\n\n".
	"TASK DETAIL\n".
	" ".$task_uri."\n";

	$reply_instructions = $reply_handler->getReplyHandlerInstructions();
	if ($reply_instructions) {
	$body .=
	"\n".
	"REPLY HANDLER ACTIONS\n".
	" ".$reply_instructions."\n";
	}

	$thread_id = '<maniphest-task-'.$task->getPHID().'>';
	$task_id = $task->getID();
	$title = $task->getTitle();
	$prefix = $this->getSubjectPrefix();
	$subject = trim("{$prefix} [{$action}] T{$task_id}: {$title}");

	$template = id(new PhabricatorMetaMTAMail())
	->setSubject($subject)
	->setFrom($transaction->getAuthorPHID())
	->setParentMessageID($this->parentMessageID)
	->addHeader('Thread-Topic', 'Maniphest Task '.$task->getID())
	->setThreadID($thread_id, $is_create)
	->setRelatedPHID($task->getPHID())
	->setIsBulk(true)
	->setBody($body);

	$mails = $reply_handler->multiplexMail(
	$template,
	array_select_keys($handles, $email_to),
	array_select_keys($handles, $email_cc));

	foreach ($mails as $mail) {
	$mail->saveAndSend();
	}
	}

	public function buildReplyHandler(ManiphestTask $task) {
	$handler_class = PhabricatorEnv::getEnvConfig(
	'metamta.maniphest.reply-handler');

	$handler_object = newv($handler_class, array());
	$handler_object->setMailReceiver($task);

	return $handler_object;
	}

	private function publishFeedStory(ManiphestTask $task, array $transactions) {
	$actions = array(ManiphestAction::ACTION_UPDATE);
	$comments = null;
	foreach ($transactions as $transaction) {
	if ($transaction->hasComments()) {
	$comments = $transaction->getComments();
	}
	switch ($transaction->getTransactionType()) {
	case ManiphestTransactionType::TYPE_OWNER:
	$actions[] = ManiphestAction::ACTION_ASSIGN;
	break;
	case ManiphestTransactionType::TYPE_STATUS:
	if ($task->getStatus() != ManiphestTaskStatus::STATUS_OPEN) {
	$actions[] = ManiphestAction::ACTION_CLOSE;
	} else if ($this->isCreate($transactions)) {
	$actions[] = ManiphestAction::ACTION_CREATE;
	}
	break;
	default:
	break;
	}
	}

	$action_type = ManiphestAction::selectStrongestAction($actions);
	$owner_phid = $task->getOwnerPHID();
	$actor_phid = head($transactions)->getAuthorPHID();
	$author_phid = $task->getAuthorPHID();

	id(new PhabricatorFeedStoryPublisher())
	->setStoryType(PhabricatorFeedStoryTypeConstants::STORY_MANIPHEST)
	->setStoryData(array(
	'taskPHID' => $task->getPHID(),
	'transactionIDs' => mpull($transactions, 'getID'),
	'ownerPHID' => $owner_phid,
	'action' => $action_type,
	'comments' => $comments,
	'description' => $task->getDescription(),
	))
	->setStoryTime(time())
	->setStoryAuthorPHID($actor_phid)
	->setRelatedPHIDs(
	array_merge(
	array_filter(
	array(
	$task->getPHID(),
	$author_phid,
	$actor_phid,
	$owner_phid,
	)),
	$task->getProjectPHIDs()))
	->publish();
	}

	private function isCreate(array $transactions) {
	$is_create = false;
	foreach ($transactions as $transaction) {
	$type = $transaction->getTransactionType();
	if (($type == ManiphestTransactionType::TYPE_STATUS) &&
	($transaction->getOldValue() === null) &&
	($transaction->getNewValue() == ManiphestTaskStatus::STATUS_OPEN)) {
	$is_create = true;
	}
	}
	return $is_create;
	}

	}
	diff --git a/src/applications/maniphest/storage/task/ManiphestTask.php b/src/applications/maniphest/storage/task/ManiphestTask.php
	index 117acca38b..5f7a54cfc4 100644
	--- a/src/applications/maniphest/storage/task/ManiphestTask.php
	+++ b/src/applications/maniphest/storage/task/ManiphestTask.php
	@@ -1,152 +1,207 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group maniphest
	*/
	class ManiphestTask extends ManiphestDAO {

	protected $phid;
	protected $authorPHID;
	protected $ownerPHID;
	protected $ccPHIDs = array();

	protected $status;
	protected $priority;

	protected $title;
	protected $description;
	protected $originalEmailSource;
	protected $mailKey;

	protected $attached = array();
	protected $projectPHIDs = array();
	private $projectsNeedUpdate;
	private $subscribersNeedUpdate;

	protected $ownerOrdering;

	+ private $auxiliaryAttributes;
	+ private $auxiliaryDirty = array();
	+
	public function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'ccPHIDs' => self::SERIALIZATION_JSON,
	'attached' => self::SERIALIZATION_JSON,
	'projectPHIDs' => self::SERIALIZATION_JSON,
	),
	) + parent::getConfiguration();
	}

	public function getAttachedPHIDs($type) {
	return array_keys(idx($this->attached, $type, array()));
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorPHIDConstants::PHID_TYPE_TASK);
	}

	public function getCCPHIDs() {
	return array_values(nonempty($this->ccPHIDs, array()));
	}

	public function setProjectPHIDs(array $phids) {
	$this->projectPHIDs = array_values($phids);
	$this->projectsNeedUpdate = true;
	return $this;
	}

	public function getProjectPHIDs() {
	return array_values(nonempty($this->projectPHIDs, array()));
	}

	public function setCCPHIDs(array $phids) {
	$this->ccPHIDs = array_values($phids);
	$this->subscribersNeedUpdate = true;
	return $this;
	}

	public function setOwnerPHID($phid) {
	$this->ownerPHID = $phid;
	$this->subscribersNeedUpdate = true;
	return $this;
	}

	- public function setAuxiliaryAttribute($key, $val) {
	- $this->removeAuxiliaryAttribute($key);
	-
	- $attribute = new ManiphestTaskAuxiliaryStorage();
	- $attribute->setTaskPHID($this->phid);
	- $attribute->setName($key);
	- $attribute->setValue($val);
	- $attribute->save();
	+ public function getAuxiliaryAttribute($key, $default = null) {
	+ if ($this->auxiliaryAttributes === null) {
	+ throw new Exception("Attach auxiliary attributes before getting them!");
	+ }
	+ return idx($this->auxiliaryAttributes, $key, $default);
	}

	- public function loadAuxiliaryAttribute($key) {
	- $attribute = id(new ManiphestTaskAuxiliaryStorage())->loadOneWhere(
	- 'taskPHID = %s AND name = %s',
	- $this->getPHID(),
	- $key);
	-
	- return $attribute;
	+ public function setAuxiliaryAttribute($key, $val) {
	+ if ($this->auxiliaryAttributes === null) {
	+ throw new Exception("Attach auxiliary attributes before setting them!");
	+ }
	+ $this->auxiliaryAttributes[$key] = $val;
	+ $this->auxiliaryDirty[$key] = true;
	+ return $this;
	}

	- public function removeAuxiliaryAttribute($key) {
	- $attribute = id(new ManiphestTaskAuxiliaryStorage())->loadOneWhere(
	- 'taskPHID = %s AND name = %s',
	- $this->getPHID(),
	- $key);
	-
	- if ($attribute) {
	- $attribute->delete();
	+ public function attachAuxiliaryAttributes(array $attrs) {
	+ if ($this->auxiliaryDirty) {
	+ throw new Exception(
	+ "This object has dirty attributes, you can not attach new attributes ".
	+ "without writing or discarding the dirty attributes.");
	}
	+ $this->auxiliaryAttributes = $attrs;
	+ return $this;
	}

	- public function loadAuxiliaryAttributes() {
	- $attributes = id(new ManiphestTaskAuxiliaryStorage())->loadAllWhere(
	+ public function loadAndAttachAuxiliaryAttributes() {
	+ if (!$this->getPHID()) {
	+ $this->auxiliaryAttributes = array();
	+ return;
	+ }
	+
	+ $storage = id(new ManiphestTaskAuxiliaryStorage())->loadAllWhere(
	'taskPHID = %s',
	$this->getPHID());

	- return $attributes;
	+ $this->auxiliaryAttributes = mpull($storage, 'getValue', 'getName');
	+
	+ return $this;
	}

	+
	public function save() {
	if (!$this->mailKey) {
	$this->mailKey = Filesystem::readRandomCharacters(20);
	}

	$result = parent::save();

	if ($this->projectsNeedUpdate) {
	// If we've changed the project PHIDs for this task, update the link
	// table.
	ManiphestTaskProject::updateTaskProjects($this);
	$this->projectsNeedUpdate = false;
	}

	if ($this->subscribersNeedUpdate) {
	// If we've changed the subscriber PHIDs for this task, update the link
	// table.
	ManiphestTaskSubscriber::updateTaskSubscribers($this);
	$this->subscribersNeedUpdate = false;
	}

	+ if ($this->auxiliaryDirty) {
	+ $this->writeAuxiliaryUpdates();
	+ $this->auxiliaryDirty = array();
	+ }
	+
	return $result;
	}

	+ private function writeAuxiliaryUpdates() {
	+ $table = new ManiphestTaskAuxiliaryStorage();
	+ $conn_w = $table->establishConnection('w');
	+ $update = array();
	+ $remove = array();
	+
	+ foreach ($this->auxiliaryDirty as $key => $dirty) {
	+ $value = $this->getAuxiliaryAttribute($key);
	+ if ($value === null) {
	+ $remove[$key] = true;
	+ } else {
	+ $update[$key] = $value;
	+ }
	+ }
	+
	+ if ($remove) {
	+ queryfx(
	+ $conn_w,
	+ 'DELETE FROM %T WHERE taskPHID = %s AND name IN (%Ls)',
	+ $table->getTableName(),
	+ $this->getPHID(),
	+ array_keys($remove));
	+ }
	+
	+ if ($update) {
	+ $sql = array();
	+ foreach ($update as $key => $val) {
	+ $sql[] = qsprintf(
	+ $conn_w,
	+ '(%s, %s, %s)',
	+ $this->getPHID(),
	+ $key,
	+ $val);
	+ }
	+ queryfx(
	+ $conn_w,
	+ 'INSERT INTO %T (taskPHID, name, value) VALUES %Q
	+ ON DUPLICATE KEY UPDATE value = VALUES(value)',
	+ $table->getTableName(),
	+ implode(', ', $sql));
	+ }
	+ }
	+
	}
	diff --git a/src/applications/maniphest/storage/task/__init__.php b/src/applications/maniphest/storage/task/__init__.php
	index ec466125bf..2c95ef8909 100644
	--- a/src/applications/maniphest/storage/task/__init__.php
	+++ b/src/applications/maniphest/storage/task/__init__.php
	@@ -1,20 +1,22 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'applications/maniphest/storage/auxiliary');
	phutil_require_module('phabricator', 'applications/maniphest/storage/base');
	phutil_require_module('phabricator', 'applications/maniphest/storage/subscriber');
	phutil_require_module('phabricator', 'applications/maniphest/storage/taskproject');
	phutil_require_module('phabricator', 'applications/phid/constants');
	phutil_require_module('phabricator', 'applications/phid/storage/phid');
	+phutil_require_module('phabricator', 'storage/qsprintf');
	+phutil_require_module('phabricator', 'storage/queryfx');

	phutil_require_module('phutil', 'filesystem');
	phutil_require_module('phutil', 'utils');


	phutil_require_source('ManiphestTask.php');
	diff --git a/src/applications/maniphest/storage/transaction/ManiphestTransaction.php b/src/applications/maniphest/storage/transaction/ManiphestTransaction.php
	index fbe5ded867..b641a9833b 100644
	--- a/src/applications/maniphest/storage/transaction/ManiphestTransaction.php
	+++ b/src/applications/maniphest/storage/transaction/ManiphestTransaction.php
	@@ -1,117 +1,141 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group maniphest
	*/
	class ManiphestTransaction extends ManiphestDAO {

	protected $taskID;
	protected $authorPHID;
	protected $transactionType;
	protected $oldValue;
	protected $newValue;
	protected $comments;
	protected $cache;
	protected $metadata = array();
	protected $contentSource;

	public function getConfiguration() {
	return array(
	self::CONFIG_SERIALIZATION => array(
	'oldValue' => self::SERIALIZATION_JSON,
	'newValue' => self::SERIALIZATION_JSON,
	'metadata' => self::SERIALIZATION_JSON,
	),
	) + parent::getConfiguration();
	}

	public function extractPHIDs() {
	$phids = array();

	switch ($this->getTransactionType()) {
	case ManiphestTransactionType::TYPE_CCS:
	case ManiphestTransactionType::TYPE_PROJECTS:
	foreach ($this->getOldValue() as $phid) {
	$phids[] = $phid;
	}
	foreach ($this->getNewValue() as $phid) {
	$phids[] = $phid;
	}
	break;
	case ManiphestTransactionType::TYPE_OWNER:
	$phids[] = $this->getOldValue();
	$phids[] = $this->getNewValue();
	break;
	case ManiphestTransactionType::TYPE_ATTACH:
	$old = $this->getOldValue();
	$new = $this->getNewValue();
	if (!is_array($old)) {
	$old = array();
	}
	if (!is_array($new)) {
	$new = array();
	}
	$val = array_merge(array_values($old), array_values($new));
	foreach ($val as $stuff) {
	foreach ($stuff as $phid => $ignored) {
	$phids[] = $phid;
	}
	}
	break;
	}

	$phids[] = $this->getAuthorPHID();

	return $phids;
	}

	+ public function getMetadataValue($key, $default = null) {
	+ if (!is_array($this->metadata)) {
	+ return $default;
	+ }
	+ return idx($this->metadata, $key, $default);
	+ }
	+
	+ public function setMetadataValue($key, $value) {
	+ if (!is_array($this->metadata)) {
	+ $this->metadata = array();
	+ }
	+ $this->metadata[$key] = $value;
	+ return $this;
	+ }
	+
	public function canGroupWith($target) {
	if ($target->getAuthorPHID() != $this->getAuthorPHID()) {
	return false;
	}
	if ($target->hasComments() && $this->hasComments()) {
	return false;
	}
	$ttime = $target->getDateCreated();
	$stime = $this->getDateCreated();
	if (abs($stime - $ttime) > 60) {
	return false;
	}

	if ($target->getTransactionType() == $this->getTransactionType()) {
	- return false;
	+ $aux_type = ManiphestTransactionType::TYPE_AUXILIARY;
	+ if ($this->getTransactionType() == $aux_type) {
	+ $that_key = $target->getMetadataValue('aux:key');
	+ $this_key = $this->getMetadataValue('aux:key');
	+ if ($that_key == $this_key) {
	+ return false;
	+ }
	+ } else {
	+ return false;
	+ }
	}

	return true;
	}

	public function hasComments() {
	return (bool)strlen(trim($this->getComments()));
	}

	public function setContentSource(PhabricatorContentSource $content_source) {
	$this->contentSource = $content_source->serialize();
	return $this;
	}

	public function getContentSource() {
	return PhabricatorContentSource::newFromSerialized($this->contentSource);
	}

	}
	diff --git a/src/applications/maniphest/storage/transaction/__init__.php b/src/applications/maniphest/storage/transaction/__init__.php
	index f095c1223e..54cfd92c58 100644
	--- a/src/applications/maniphest/storage/transaction/__init__.php
	+++ b/src/applications/maniphest/storage/transaction/__init__.php
	@@ -1,14 +1,16 @@
	<?php
	/**
	* This file is automatically generated. Lint this module to rebuild it.
	* @generated
	*/



	phutil_require_module('phabricator', 'applications/maniphest/constants/transactiontype');
	phutil_require_module('phabricator', 'applications/maniphest/storage/base');
	phutil_require_module('phabricator', 'applications/metamta/contentsource/source');

	+phutil_require_module('phutil', 'utils');
	+

	phutil_require_source('ManiphestTransaction.php');
	diff --git a/src/applications/maniphest/view/transactiondetail/ManiphestTransactionDetailView.php b/src/applications/maniphest/view/transactiondetail/ManiphestTransactionDetailView.php
	index 09c30cfeb5..0c345921f2 100644
	--- a/src/applications/maniphest/view/transactiondetail/ManiphestTransactionDetailView.php
	+++ b/src/applications/maniphest/view/transactiondetail/ManiphestTransactionDetailView.php
	@@ -1,617 +1,639 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	/**
	* @group maniphest
	*/
	class ManiphestTransactionDetailView extends ManiphestView {

	private $transactions;
	private $handles;
	private $markupEngine;
	private $forEmail;
	private $preview;
	private $commentNumber;
	private $rangeSpecification;

	private $renderSummaryOnly;
	private $renderFullSummary;
	private $user;

	public function setTransactionGroup(array $transactions) {
	$this->transactions = $transactions;
	return $this;
	}

	public function setHandles(array $handles) {
	$this->handles = $handles;
	return $this;
	}

	public function setMarkupEngine(PhutilMarkupEngine $engine) {
	$this->markupEngine = $engine;
	return $this;
	}

	public function setPreview($preview) {
	$this->preview = $preview;
	return $this;
	}

	public function setRenderSummaryOnly($render_summary_only) {
	$this->renderSummaryOnly = $render_summary_only;
	return $this;
	}

	public function getRenderSummaryOnly() {
	return $this->renderSummaryOnly;
	}

	public function setRenderFullSummary($render_full_summary) {
	$this->renderFullSummary = $render_full_summary;
	return $this;
	}

	public function getRenderFullSummary() {
	return $this->renderFullSummary;
	}

	public function setCommentNumber($comment_number) {
	$this->commentNumber = $comment_number;
	return $this;
	}

	public function setUser(PhabricatorUser $user) {
	$this->user = $user;
	return $this;
	}

	public function setRangeSpecification($range) {
	$this->rangeSpecification = $range;
	return $this;
	}

	public function getRangeSpecification() {
	return $this->rangeSpecification;
	}

	public function renderForEmail($with_date) {
	$this->forEmail = true;

	$transaction = reset($this->transactions);
	$author = $this->renderHandles(array($transaction->getAuthorPHID()));

	$action = null;
	$descs = array();
	$comments = null;
	foreach ($this->transactions as $transaction) {
	list($verb, $desc, $classes) = $this->describeAction($transaction);
	if ($action === null) {
	$action = $verb;
	}
	$desc = $author.' '.$desc.'.';
	if ($with_date) {
	// NOTE: This is going into a (potentially multi-recipient) email so
	// we can't use a single user's timezone preferences. Use the server's
	// instead, but make the timezone explicit.
	$datetime = date('M jS \a\t g:i A T', $transaction->getDateCreated());
	$desc = "On {$datetime}, {$desc}";
	}
	$descs[] = $desc;
	if ($transaction->hasComments()) {
	$comments = $transaction->getComments();
	}
	}

	$descs = implode("\n", $descs);

	if ($comments) {
	$descs .= "\n".$comments;
	}

	foreach ($this->transactions as $transaction) {
	$supplemental = $this->renderSupplementalInfoForEmail($transaction);
	if ($supplemental) {
	$descs .= "\n\n".$supplemental;
	}
	}

	$this->forEmail = false;
	return array($action, $descs);
	}

	public function render() {

	if (!$this->user) {
	throw new Exception("Call setUser() before render()!");
	}

	$handles = $this->handles;
	$transactions = $this->transactions;

	require_celerity_resource('maniphest-transaction-detail-css');

	$comment_transaction = null;
	foreach ($this->transactions as $transaction) {
	if ($transaction->hasComments()) {
	$comment_transaction = $transaction;
	break;
	}
	}
	$any_transaction = reset($transactions);

	$author = $this->handles[$any_transaction->getAuthorPHID()];

	$more_classes = array();
	$descs = array();
	foreach ($transactions as $transaction) {
	list($verb, $desc, $classes) = $this->describeAction($transaction);
	$more_classes = array_merge($more_classes, $classes);
	$full_summary = null;
	if ($this->getRenderFullSummary()) {
	$full_summary = $this->renderFullSummary($transaction);
	}
	$descs[] = javelin_render_tag(
	'div',
	array(
	'sigil' => 'maniphest-transaction-description',
	),
	$author->renderLink().' '.$desc.'.'.$full_summary);
	}
	$descs = implode("\n", $descs);

	if ($this->getRenderSummaryOnly()) {
	return $descs;
	}

	$more_classes = implode(' ', $more_classes);

	if ($comment_transaction && $comment_transaction->hasComments()) {
	$comments = $comment_transaction->getCache();
	if (!strlen($comments)) {
	$comments = $comment_transaction->getComments();
	if (strlen($comments)) {
	$comments = $this->markupEngine->markupText($comments);
	$comment_transaction->setCache($comments);
	if ($comment_transaction->getID() && !$this->preview) {
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$comment_transaction->save();
	unset($unguarded);
	}
	}
	}
	$comment_block =
	'<div class="maniphest-transaction-comments phabricator-remarkup">'.
	$comments.
	'</div>';
	} else {
	$comment_block = null;
	}

	if ($this->preview) {
	$timestamp = 'COMMENT PREVIEW';
	} else {
	$timestamp = phabricator_datetime(
	$transaction->getDateCreated(),
	$this->user);
	}

	$info = array();

	$source_transaction = nonempty($comment_transaction, $any_transaction);
	$content_source = new PhabricatorContentSourceView();
	$content_source->setContentSource($source_transaction->getContentSource());
	$content_source->setUser($this->user);
	$info[] = $content_source->render();

	$info[] = $timestamp;

	$comment_anchor = null;
	$num = $this->commentNumber;
	if ($num && !$this->preview) {
	Javelin::initBehavior('phabricator-watch-anchor');
	$info[] = javelin_render_tag(
	'a',
	array(
	'name' => 'comment-'.$num,
	'href' => '#comment-'.$num,
	),
	'Comment T'.$any_transaction->getTaskID().'#'.$num);
	$comment_anchor = 'anchor-comment-'.$num;
	}


	$info = implode(' · ', array_filter($info));

	return phutil_render_tag(
	'div',
	array(
	'class' => "maniphest-transaction-detail-container",
	'style' => "background-image: url('".$author->getImageURI()."')",
	'id' => $comment_anchor,
	),
	'<div class="maniphest-transaction-detail-view '.$more_classes.'">'.
	'<div class="maniphest-transaction-header">'.
	'<div class="maniphest-transaction-timestamp">'.
	$info.
	'</div>'.
	$descs.
	'</div>'.
	$comment_block.
	'</div>');
	}

	private function renderSupplementalInfoForEmail($transaction) {
	$handles = $this->handles;

	$type = $transaction->getTransactionType();
	$new = $transaction->getNewValue();
	$old = $transaction->getOldValue();

	switch ($type) {
	case ManiphestTransactionType::TYPE_DESCRIPTION:
	return "NEW DESCRIPTION\n ".trim($new)."\n\n".
	"PREVIOUS DESCRIPTION\n ".trim($old);
	case ManiphestTransactionType::TYPE_ATTACH:
	$old_raw = nonempty($old, array());
	$new_raw = nonempty($new, array());

	$attach_types = array(
	PhabricatorPHIDConstants::PHID_TYPE_DREV,
	PhabricatorPHIDConstants::PHID_TYPE_FILE,
	);

	foreach ($attach_types as $type) {
	$old = array_keys(idx($old_raw, $type, array()));
	$new = array_keys(idx($new_raw, $type, array()));
	if ($old != $new) {
	break;
	}
	}

	$added = array_diff($new, $old);
	if (!$added) {
	break;
	}

	$links = array();
	foreach (array_select_keys($handles, $added) as $handle) {
	$links[] = ' '.PhabricatorEnv::getProductionURI($handle->getURI());
	}
	$links = implode("\n", $links);

	switch ($type) {
	case PhabricatorPHIDConstants::PHID_TYPE_DREV:
	$title = 'ATTACHED REVISIONS';
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_FILE:
	$title = 'ATTACHED FILES';
	break;
	}

	return $title."\n".$links;
	default:
	break;
	}

	return null;
	}

	private function describeAction($transaction) {
	$verb = null;
	$desc = null;
	$classes = array();

	$handles = $this->handles;

	$type = $transaction->getTransactionType();
	$author_phid = $transaction->getAuthorPHID();
	$new = $transaction->getNewValue();
	$old = $transaction->getOldValue();
	switch ($type) {
	case ManiphestTransactionType::TYPE_TITLE:
	$verb = 'Retitled';
	$desc = 'changed the title from '.$this->renderString($old).
	' to '.$this->renderString($new);
	break;
	case ManiphestTransactionType::TYPE_DESCRIPTION:
	$verb = 'Edited';
	if ($this->forEmail \|\| $this->getRenderFullSummary()) {
	$desc = 'updated the task description';
	} else {
	$desc = 'updated the task description; '.
	$this->renderExpandLink($transaction);
	}
	break;
	case ManiphestTransactionType::TYPE_NONE:
	$verb = 'Commented On';
	$desc = 'added a comment';
	break;
	case ManiphestTransactionType::TYPE_OWNER:
	if ($transaction->getAuthorPHID() == $new) {
	$verb = 'Claimed';
	$desc = 'claimed this task';
	$classes[] = 'claimed';
	} else if (!$new) {
	$verb = 'Up For Grabs';
	$desc = 'placed this task up for grabs';
	$classes[] = 'upforgrab';
	} else if (!$old) {
	$verb = 'Assigned';
	$desc = 'assigned this task to '.$this->renderHandles(array($new));
	$classes[] = 'assigned';
	} else {
	$verb = 'Reassigned';
	$desc = 'reassigned this task from '.
	$this->renderHandles(array($old)).
	' to '.
	$this->renderHandles(array($new));
	$classes[] = 'reassigned';
	}
	break;
	case ManiphestTransactionType::TYPE_CCS:
	if ($this->preview) {
	$verb = 'Changed CC';
	$desc = 'changed CCs..';
	break;
	}
	$added = array_diff($new, $old);
	$removed = array_diff($old, $new);
	if ($added && !$removed) {
	$verb = 'Added CC';
	if (count($added) == 1) {
	$desc = 'added '.$this->renderHandles($added).' to CC';
	} else {
	$desc = 'added CCs: '.$this->renderHandles($added);
	}
	} else if ($removed && !$added) {
	$verb = 'Removed CC';
	if (count($removed) == 1) {
	$desc = 'removed '.$this->renderHandles($removed).' from CC';
	} else {
	$desc = 'removed CCs: '.$this->renderHandles($removed);
	}
	} else {
	$verb = 'Changed CC';
	$desc = 'changed CCs, added: '.$this->renderHandles($added).'; '.
	'removed: '.$this->renderHandles($removed);
	}
	break;
	case ManiphestTransactionType::TYPE_PROJECTS:
	if ($this->preview) {
	$verb = 'Changed Projects';
	$desc = 'changed projects..';
	break;
	}
	$added = array_diff($new, $old);
	$removed = array_diff($old, $new);
	if ($added && !$removed) {
	$verb = 'Added Project';
	if (count($added) == 1) {
	$desc = 'added project '.$this->renderHandles($added);
	} else {
	$desc = 'added projects: '.$this->renderHandles($added);
	}
	} else if ($removed && !$added) {
	$verb = 'Removed Project';
	if (count($removed) == 1) {
	$desc = 'removed project '.$this->renderHandles($removed);
	} else {
	$desc = 'removed projectss: '.$this->renderHandles($removed);
	}
	} else {
	$verb = 'Changed Projects';
	$desc = 'changed projects, added: '.$this->renderHandles($added).'; '.
	'removed: '.$this->renderHandles($removed);
	}
	break;
	case ManiphestTransactionType::TYPE_STATUS:
	if ($new == ManiphestTaskStatus::STATUS_OPEN) {
	if ($old) {
	$verb = 'Reopened';
	$desc = 'reopened this task';
	$classes[] = 'reopened';
	} else {
	$verb = 'Created';
	$desc = 'created this task';
	$classes[] = 'created';
	}
	} else if ($new == ManiphestTaskStatus::STATUS_CLOSED_SPITE) {
	$verb = 'Spited';
	$desc = 'closed this task out of spite';
	$classes[] = 'spited';
	} else if ($new == ManiphestTaskStatus::STATUS_CLOSED_DUPLICATE) {
	$verb = 'Merged';
	$desc = 'closed this task as a duplicate';
	$classes[] = 'duplicate';
	} else {
	$verb = 'Closed';
	$full = idx(ManiphestTaskStatus::getTaskStatusMap(), $new, '???');
	$desc = 'closed this task as "'.$full.'"';
	$classes[] = 'closed';
	}
	break;
	case ManiphestTransactionType::TYPE_PRIORITY:
	$old_name = ManiphestTaskPriority::getTaskPriorityName($old);
	$new_name = ManiphestTaskPriority::getTaskPriorityName($new);

	if ($old == ManiphestTaskPriority::PRIORITY_TRIAGE) {
	$verb = 'Triaged';
	$desc = 'triaged this task as "'.$new_name.'" priority';
	} else if ($old > $new) {
	$verb = 'Lowered Priority';
	$desc = 'lowered the priority of this task from "'.$old_name.'" to '.
	'"'.$new_name.'"';
	} else {
	$verb = 'Raised Priority';
	$desc = 'raised the priority of this task from "'.$old_name.'" to '.
	'"'.$new_name.'"';
	}
	if ($new == ManiphestTaskPriority::PRIORITY_UNBREAK_NOW) {
	$classes[] = 'unbreaknow';
	}
	break;
	case ManiphestTransactionType::TYPE_ATTACH:
	if ($this->preview) {
	$verb = 'Changed Attached';
	$desc = 'changed attachments..';
	break;
	}

	$old_raw = nonempty($old, array());
	$new_raw = nonempty($new, array());

	foreach (array(
	PhabricatorPHIDConstants::PHID_TYPE_DREV,
	PhabricatorPHIDConstants::PHID_TYPE_TASK,
	PhabricatorPHIDConstants::PHID_TYPE_FILE) as $type) {
	$old = array_keys(idx($old_raw, $type, array()));
	$new = array_keys(idx($new_raw, $type, array()));
	if ($old != $new) {
	break;
	}
	}

	$added = array_diff($new, $old);
	$removed = array_diff($old, $new);

	$add_desc = $this->renderHandles($added);
	$rem_desc = $this->renderHandles($removed);

	switch ($type) {
	case PhabricatorPHIDConstants::PHID_TYPE_DREV:
	$singular = 'Differential Revision';
	$plural = 'Differential Revisions';
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_FILE:
	$singular = 'file';
	$plural = 'files';
	break;
	case PhabricatorPHIDConstants::PHID_TYPE_TASK:
	$singular = 'Maniphest Task';
	$plural = 'Maniphest Tasks';
	$dependency = true;
	break;
	}

	if ($added && !$removed) {
	$verb = 'Attached';
	if (count($added) == 1) {
	$desc = 'attached '.$singular.': '.$add_desc;
	} else {
	$desc = 'attached '.$plural.': '.$add_desc;
	}
	} else if ($removed && !$added) {
	$verb = 'Detached';
	if (count($removed) == 1) {
	$desc = 'detached '.$singular.': '.$rem_desc;
	} else {
	$desc = 'detached '.$plural.': '.$rem_desc;
	}
	} else {
	$verb = 'Changed Attached';
	$desc = 'changed attached '.$plural.', added: '.$add_desc.'; '.
	'removed: '.$rem_desc;
	}
	+ break;
	+ case ManiphestTransactionType::TYPE_AUXILIARY:
	+
	+ // TODO: This is temporary and hacky! Allow auxiliary fields to
	+ // customize this.
	+
	+ $old_esc = phutil_escape_html($old);
	+ $new_esc = phutil_escape_html($new);
	+
	+ $aux_key = $transaction->getMetadataValue('aux:key');
	+ if ($old === null) {
	+ $verb = "Set Field";
	+ $desc = "set field '{$aux_key}' to '{$new_esc}'";
	+ } else if ($new === null) {
	+ $verb = "Removed Field";
	+ $desc = "removed field '{$aux_key}'";
	+ } else {
	+ $verb = "Updated Field";
	+ $desc = "updated field '{$aux_key}' ".
	+ "from '{$old_esc}' to '{$new_esc}'";
	+ }
	+
	break;
	default:
	return array($type, ' brazenly '.$type."'d", $classes);
	}

	return array($verb, $desc, $classes);
	}

	private function renderFullSummary($transaction) {
	switch ($transaction->getTransactionType()) {
	case ManiphestTransactionType::TYPE_DESCRIPTION:
	$id = $transaction->getID();
	$old_text = wordwrap($transaction->getOldValue(), 80);
	$new_text = wordwrap($transaction->getNewValue(), 80);

	$engine = new PhabricatorDifferenceEngine();
	$changeset = $engine->generateChangesetFromFileContent($old_text,
	$new_text);

	$whitespace_mode = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;

	$parser = new DifferentialChangesetParser();
	$parser->setChangeset($changeset);
	$parser->setRenderingReference($id);
	$parser->setWhitespaceMode($whitespace_mode);

	$spec = $this->getRangeSpecification();
	list($range_s, $range_e, $mask) =
	DifferentialChangesetParser::parseRangeSpecification($spec);
	$output = $parser->render($range_s, $range_e, $mask);

	return $output;
	}

	return null;
	}

	private function renderExpandLink($transaction) {
	$id = $transaction->getID();

	Javelin::initBehavior('maniphest-transaction-expand');

	switch ($transaction->getTransactionType()) {
	case ManiphestTransactionType::TYPE_DESCRIPTION:
	require_celerity_resource('differential-changeset-view-css');
	require_celerity_resource('syntax-highlighting-css');
	$whitespace_mode = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;
	Javelin::initBehavior('differential-show-more', array(
	'uri' => '/maniphest/task/descriptionchange/'.$id.'/',
	'whitespace' => $whitespace_mode,
	));
	break;
	default:
	break;
	}

	return javelin_render_tag(
	'a',
	array(
	'href' => '/maniphest/task/descriptionchange/'.$id.'/',
	'sigil' => 'maniphest-expand-transaction',
	'mustcapture' => true,
	),
	'show details');
	}

	private function renderHandles($phids) {
	$links = array();
	foreach ($phids as $phid) {
	if ($this->forEmail) {
	$links[] = $this->handles[$phid]->getName();
	} else {
	$links[] = $this->handles[$phid]->renderLink();
	}
	}
	return implode(', ', $links);
	}

	private function renderString($string) {
	if ($this->forEmail) {
	return '"'.$string.'"';
	} else {
	return '"'.phutil_escape_html($string).'"';
	}
	}

	}

File Metadata

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

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions