No OneTemporary
Actions

Size

33 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/pholio/controller/PholioImageUploadController.php b/src/applications/pholio/controller/PholioImageUploadController.php
	index 530563dc8f..0329d3eb1d 100644
	--- a/src/applications/pholio/controller/PholioImageUploadController.php
	+++ b/src/applications/pholio/controller/PholioImageUploadController.php
	@@ -1,44 +1,43 @@
	<?php

	final class PholioImageUploadController extends PholioController {

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

	$phid = $request->getStr('filePHID');
	$replaces_phid = $request->getStr('replacesPHID');
	$title = $request->getStr('title');
	$description = $request->getStr('description');

	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($phid))
	->executeOne();
	if (!$file) {
	return new Aphront404Response();
	}

	if (!strlen($title)) {
	$title = $file->getName();
	}

	$image = id(new PholioImage())
	->attachFile($file)
	->setName($title)
	->setDescription($description)
	->makeEphemeral();

	$view = id(new PholioUploadedImageView())
	->setUser($viewer)
	->setImage($image)
	->setReplacesPHID($replaces_phid);

	$content = array(
	'markup' => $view,
	);

	return id(new AphrontAjaxResponse())->setContent($content);
	}

	}
	diff --git a/src/applications/pholio/controller/PholioInlineController.php b/src/applications/pholio/controller/PholioInlineController.php
	index 4cc5510b99..101ef9e758 100644
	--- a/src/applications/pholio/controller/PholioInlineController.php
	+++ b/src/applications/pholio/controller/PholioInlineController.php
	@@ -1,173 +1,167 @@
	<?php

	final class PholioInlineController extends PholioController {

	- private $id;
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');

	- public function willProcessRequest(array $data) {
	- $this->id = idx($data, 'id');
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $viewer = $request->getUser();
	-
	- if ($this->id) {
	- $inline = id(new PholioTransactionComment())->load($this->id);
	+ if ($id) {
	+ $inline = id(new PholioTransactionComment())->load($id);

	if (!$inline) {
	return new Aphront404Response();
	}

	if ($inline->getTransactionPHID()) {
	$mode = 'view';
	} else {
	if ($inline->getAuthorPHID() == $viewer->getPHID()) {
	$mode = 'edit';
	} else {
	return new Aphront404Response();
	}
	}
	} else {
	$mock = id(new PholioMockQuery())
	->setViewer($viewer)
	->withIDs(array($request->getInt('mockID')))
	->executeOne();

	if (!$mock) {
	return new Aphront404Response();
	}

	$inline = id(new PholioTransactionComment())
	->setImageID($request->getInt('imageID'))
	->setX($request->getInt('startX'))
	->setY($request->getInt('startY'))
	->setCommentVersion(1)
	->setAuthorPHID($viewer->getPHID())
	->setEditPolicy($viewer->getPHID())
	->setViewPolicy(PhabricatorPolicies::POLICY_PUBLIC)
	->setContentSourceFromRequest($request)
	->setWidth($request->getInt('endX') - $request->getInt('startX'))
	->setHeight($request->getInt('endY') - $request->getInt('startY'));

	$mode = 'new';
	}

	$v_content = $inline->getContent();

	// TODO: Not correct, but we don't always have a mock right now.
	$mock_uri = '/';

	if ($mode == 'view') {
	require_celerity_resource('pholio-inline-comments-css');
	$image = id(new PholioImageQuery())
	->setViewer($viewer)
	->withIDs(array($inline->getImageID()))
	->executeOne();

	$handles = $this->loadViewerHandles(array($inline->getAuthorPHID()));
	$author_handle = $handles[$inline->getAuthorPHID()];

	$file = $image->getFile();
	if (!$file->isViewableImage()) {
	throw new Exception(pht('File is not viewable.'));
	}

	$image_uri = $file->getBestURI();

	$thumb = id(new PHUIImageMaskView())
	->addClass('mrl')
	->setImage($image_uri)
	->setDisplayHeight(200)
	->setDisplayWidth(498)
	->withMask(true)
	->centerViewOnPoint(
	$inline->getX(), $inline->getY(),
	$inline->getHeight(), $inline->getWidth());

	$comment_head = phutil_tag(
	'div',
	array(
	'class' => 'pholio-inline-comment-head',
	),
	$author_handle->renderLink());

	$comment_body = phutil_tag(
	'div',
	array(
	'class' => 'pholio-inline-comment-body',
	),
	PhabricatorMarkupEngine::renderOneObject(
	id(new PhabricatorMarkupOneOff())
	->setContent($inline->getContent()),
	'default',
	$viewer));

	return $this->newDialog()
	->setTitle(pht('Inline Comment'))
	->appendChild($thumb)
	->appendChild($comment_head)
	->appendChild($comment_body)
	->addCancelButton($mock_uri, pht('Close'));
	}

	if ($request->isFormPost()) {
	$v_content = $request->getStr('content');

	if (strlen($v_content)) {
	$inline->setContent($v_content);
	$inline->save();
	$dictionary = $inline->toDictionary();
	} else if ($inline->getID()) {
	$inline->delete();
	$dictionary = array();
	}

	return id(new AphrontAjaxResponse())->setContent($dictionary);
	}

	switch ($mode) {
	case 'edit':
	$title = pht('Edit Inline Comment');
	$submit_text = pht('Save Draft');
	break;
	case 'new':
	$title = pht('New Inline Comment');
	$submit_text = pht('Save Draft');
	break;
	}

	$form = id(new AphrontFormView())
	->setUser($viewer);

	if ($mode == 'new') {
	$params = array(
	'mockID' => $request->getInt('mockID'),
	'imageID' => $request->getInt('imageID'),
	'startX' => $request->getInt('startX'),
	'startY' => $request->getInt('startY'),
	'endX' => $request->getInt('endX'),
	'endY' => $request->getInt('endY'),
	);
	foreach ($params as $key => $value) {
	$form->addHiddenInput($key, $value);
	}
	}

	$form
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setUser($viewer)
	->setName('content')
	->setLabel(pht('Comment'))
	->setValue($v_content));

	return $this->newDialog()
	->setTitle($title)
	->setWidth(AphrontDialogView::WIDTH_FORM)
	->appendChild($form->buildLayoutView())
	->addCancelButton($mock_uri)
	->addSubmitButton($submit_text);
	}

	}
	diff --git a/src/applications/pholio/controller/PholioInlineListController.php b/src/applications/pholio/controller/PholioInlineListController.php
	index 0befd5dbd2..673a55bbaa 100644
	--- a/src/applications/pholio/controller/PholioInlineListController.php
	+++ b/src/applications/pholio/controller/PholioInlineListController.php
	@@ -1,40 +1,34 @@
	<?php

	final class PholioInlineListController extends PholioController {

	- 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 = $request->getViewer();
	+ $id = $request->getURIData('id');

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

	$inline_comments = id(new PholioTransactionComment())->loadAllWhere(
	'imageid = %d AND (transactionphid IS NOT NULL
	OR (authorphid = %s AND transactionphid IS NULL))',
	- $this->id,
	- $user->getPHID());
	+ $id,
	+ $viewer->getPHID());

	$author_phids = mpull($inline_comments, 'getAuthorPHID');
	$authors = $this->loadViewerHandles($author_phids);

	$inlines = array();
	foreach ($inline_comments as $inline_comment) {
	$inlines[] = $inline_comment->toDictionary();
	}

	return id(new AphrontAjaxResponse())->setContent($inlines);
	}

	}
	diff --git a/src/applications/pholio/controller/PholioMockCommentController.php b/src/applications/pholio/controller/PholioMockCommentController.php
	index 719d2db6ef..b127d0b1da 100644
	--- a/src/applications/pholio/controller/PholioMockCommentController.php
	+++ b/src/applications/pholio/controller/PholioMockCommentController.php
	@@ -1,90 +1,84 @@
	<?php

	final class PholioMockCommentController extends PholioController {

	- 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 = $request->getViewer();
	+ $id = $request->getURIData('id');

	if (!$request->isFormPost()) {
	return new Aphront400Response();
	}

	$mock = id(new PholioMockQuery())
	- ->setViewer($user)
	- ->withIDs(array($this->id))
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	->needImages(true)
	->executeOne();

	if (!$mock) {
	return new Aphront404Response();
	}

	$is_preview = $request->isPreviewRequest();

	$draft = PhabricatorDraft::buildFromRequest($request);

	$mock_uri = '/M'.$mock->getID();

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

	$xactions = array();

	$inline_comments = id(new PholioTransactionComment())->loadAllWhere(
	'authorphid = %s AND transactionphid IS NULL AND imageid IN (%Ld)',
	- $user->getPHID(),
	+ $viewer->getPHID(),
	mpull($mock->getImages(), 'getID'));

	if (!$inline_comments \|\| strlen($comment)) {
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	->attachComment(
	id(new PholioTransactionComment())
	->setContent($comment));
	}

	foreach ($inline_comments as $inline_comment) {
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PholioTransaction::TYPE_INLINE)
	->attachComment($inline_comment);
	}

	$editor = id(new PholioMockEditor())
	- ->setActor($user)
	+ ->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect($request->isContinueRequest())
	->setIsPreview($is_preview);

	try {
	$xactions = $editor->applyTransactions($mock, $xactions);
	} catch (PhabricatorApplicationTransactionNoEffectException $ex) {
	return id(new PhabricatorApplicationTransactionNoEffectResponse())
	->setCancelURI($mock_uri)
	->setException($ex);
	}

	if ($draft) {
	$draft->replaceOrDelete();
	}

	if ($request->isAjax() && $is_preview) {
	$xaction_view = id(new PholioTransactionView())
	->setMock($mock);

	return id(new PhabricatorApplicationTransactionResponse())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->setTransactions($xactions)
	->setTransactionView($xaction_view)
	->setIsPreview($is_preview);
	} else {
	return id(new AphrontRedirectResponse())->setURI($mock_uri);
	}
	}

	}
	diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php
	index 728c7b29d6..18423e0050 100644
	--- a/src/applications/pholio/controller/PholioMockEditController.php
	+++ b/src/applications/pholio/controller/PholioMockEditController.php
	@@ -1,400 +1,394 @@
	<?php

	final class PholioMockEditController extends PholioController {

	- private $id;
	+ public function handleRequest(AphrontRequest $request) {
	+ $viewer = $request->getViewer();
	+ $id = $request->getURIData('id');

	- public function willProcessRequest(array $data) {
	- $this->id = idx($data, 'id');
	- }
	-
	- public function processRequest() {
	- $request = $this->getRequest();
	- $user = $request->getUser();
	-
	- if ($this->id) {
	+ if ($id) {
	$mock = id(new PholioMockQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->needImages(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	- ->withIDs(array($this->id))
	+ ->withIDs(array($id))
	->executeOne();

	if (!$mock) {
	return new Aphront404Response();
	}

	$title = pht('Edit Mock');

	$is_new = false;
	$mock_images = $mock->getImages();
	$files = mpull($mock_images, 'getFile');
	$mock_images = mpull($mock_images, null, 'getFilePHID');
	} else {
	- $mock = PholioMock::initializeNewMock($user);
	+ $mock = PholioMock::initializeNewMock($viewer);

	$title = pht('Create Mock');

	$is_new = true;
	$files = array();
	$mock_images = array();
	}

	if ($is_new) {
	$v_projects = array();
	} else {
	$v_projects = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$mock->getPHID(),
	PhabricatorProjectObjectHasProjectEdgeType::EDGECONST);
	$v_projects = array_reverse($v_projects);
	}

	$e_name = true;
	$e_images = count($mock_images) ? null : true;
	$errors = array();
	$posted_mock_images = array();

	$v_name = $mock->getName();
	$v_desc = $mock->getDescription();
	$v_status = $mock->getStatus();
	$v_view = $mock->getViewPolicy();
	$v_edit = $mock->getEditPolicy();
	$v_cc = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$mock->getPHID());
	$v_space = $mock->getSpacePHID();

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

	$type_name = PholioTransaction::TYPE_NAME;
	$type_desc = PholioTransaction::TYPE_DESCRIPTION;
	$type_status = PholioTransaction::TYPE_STATUS;
	$type_view = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$type_edit = PhabricatorTransactions::TYPE_EDIT_POLICY;
	$type_cc = PhabricatorTransactions::TYPE_SUBSCRIBERS;
	$type_space = PhabricatorTransactions::TYPE_SPACE;

	$v_name = $request->getStr('name');
	$v_desc = $request->getStr('description');
	$v_status = $request->getStr('status');
	$v_view = $request->getStr('can_view');
	$v_edit = $request->getStr('can_edit');
	$v_cc = $request->getArr('cc');
	$v_projects = $request->getArr('projects');
	$v_space = $request->getStr('spacePHID');

	$mock_xactions = array();
	$mock_xactions[$type_name] = $v_name;
	$mock_xactions[$type_desc] = $v_desc;
	$mock_xactions[$type_status] = $v_status;
	$mock_xactions[$type_view] = $v_view;
	$mock_xactions[$type_edit] = $v_edit;
	$mock_xactions[$type_cc] = array('=' => $v_cc);
	$mock_xactions[$type_space] = $v_space;

	if (!strlen($request->getStr('name'))) {
	$e_name = pht('Required');
	$errors[] = pht('You must give the mock a name.');
	}

	$file_phids = $request->getArr('file_phids');
	if ($file_phids) {
	$files = id(new PhabricatorFileQuery())
	- ->setViewer($user)
	+ ->setViewer($viewer)
	->withPHIDs($file_phids)
	->execute();
	$files = mpull($files, null, 'getPHID');
	$files = array_select_keys($files, $file_phids);
	} else {
	$files = array();
	}

	if (!$files) {
	$e_images = pht('Required');
	$errors[] = pht('You must add at least one image to the mock.');
	} else {
	$mock->setCoverPHID(head($files)->getPHID());
	}

	foreach ($mock_xactions as $type => $value) {
	$xactions[$type] = id(new PholioTransaction())
	->setTransactionType($type)
	->setNewValue($value);
	}

	$order = $request->getStrList('imageOrder');
	$sequence_map = array_flip($order);
	$replaces = $request->getArr('replaces');
	$replaces_map = array_flip($replaces);

	/**
	* Foreach file posted, check to see whether we are replacing an image,
	* adding an image, or simply updating image metadata. Create
	* transactions for these cases as appropos.
	*/
	foreach ($files as $file_phid => $file) {
	$replaces_image_phid = null;
	if (isset($replaces_map[$file_phid])) {
	$old_file_phid = $replaces_map[$file_phid];
	if ($old_file_phid != $file_phid) {
	$old_image = idx($mock_images, $old_file_phid);
	if ($old_image) {
	$replaces_image_phid = $old_image->getPHID();
	}
	}
	}

	$existing_image = idx($mock_images, $file_phid);

	$title = (string)$request->getStr('title_'.$file_phid);
	$description = (string)$request->getStr('description_'.$file_phid);
	$sequence = $sequence_map[$file_phid];

	if ($replaces_image_phid) {
	$replace_image = id(new PholioImage())
	->setReplacesImagePHID($replaces_image_phid)
	->setFilePhid($file_phid)
	->attachFile($file)
	->setName(strlen($title) ? $title : $file->getName())
	->setDescription($description)
	->setSequence($sequence);
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(
	PholioTransaction::TYPE_IMAGE_REPLACE)
	->setNewValue($replace_image);
	$posted_mock_images[] = $replace_image;
	} else if (!$existing_image) { // this is an add
	$add_image = id(new PholioImage())
	->setFilePhid($file_phid)
	->attachFile($file)
	->setName(strlen($title) ? $title : $file->getName())
	->setDescription($description)
	->setSequence($sequence);
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PholioTransaction::TYPE_IMAGE_FILE)
	->setNewValue(
	array('+' => array($add_image)));
	$posted_mock_images[] = $add_image;
	} else {
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PholioTransaction::TYPE_IMAGE_NAME)
	->setNewValue(
	array($existing_image->getPHID() => $title));
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(
	PholioTransaction::TYPE_IMAGE_DESCRIPTION)
	->setNewValue(
	array($existing_image->getPHID() => $description));
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(
	PholioTransaction::TYPE_IMAGE_SEQUENCE)
	->setNewValue(
	array($existing_image->getPHID() => $sequence));

	$posted_mock_images[] = $existing_image;
	}
	}
	foreach ($mock_images as $file_phid => $mock_image) {
	if (!isset($files[$file_phid]) && !isset($replaces[$file_phid])) {
	// this is an outright delete
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PholioTransaction::TYPE_IMAGE_FILE)
	->setNewValue(
	array('-' => array($mock_image)));
	}
	}

	if (!$errors) {
	$proj_edge_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	$xactions[] = id(new PholioTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $proj_edge_type)
	->setNewValue(array('=' => array_fuse($v_projects)));

	$mock->openTransaction();
	$editor = id(new PholioMockEditor())
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true)
	- ->setActor($user);
	+ ->setActor($viewer);

	$xactions = $editor->applyTransactions($mock, $xactions);

	$mock->saveTransaction();

	return id(new AphrontRedirectResponse())
	->setURI('/M'.$mock->getID());
	}
	}

	- if ($this->id) {
	+ if ($id) {
	$submit = id(new AphrontFormSubmitControl())
	- ->addCancelButton('/M'.$this->id)
	+ ->addCancelButton('/M'.$id)
	->setValue(pht('Save'));
	} else {
	$submit = id(new AphrontFormSubmitControl())
	->addCancelButton($this->getApplicationURI())
	->setValue(pht('Create'));
	}

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

	// NOTE: Make this show up correctly on the rendered form.
	$mock->setViewPolicy($v_view);
	$mock->setEditPolicy($v_edit);

	$image_elements = array();
	if ($posted_mock_images) {
	$display_mock_images = $posted_mock_images;
	} else {
	$display_mock_images = $mock_images;
	}
	foreach ($display_mock_images as $mock_image) {
	$image_elements[] = id(new PholioUploadedImageView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setImage($mock_image)
	->setReplacesPHID($mock_image->getFilePHID());
	}

	$list_id = celerity_generate_unique_node_id();
	$drop_id = celerity_generate_unique_node_id();
	$order_id = celerity_generate_unique_node_id();

	$list_control = phutil_tag(
	'div',
	array(
	'id' => $list_id,
	'class' => 'pholio-edit-list',
	),
	$image_elements);

	$drop_control = phutil_tag(
	'div',
	array(
	'id' => $drop_id,
	'class' => 'pholio-edit-drop',
	),
	pht('Drag and drop images here to add them to the mock.'));

	$order_control = phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => 'imageOrder',
	'id' => $order_id,
	));

	Javelin::initBehavior(
	'pholio-mock-edit',
	array(
	'listID' => $list_id,
	'dropID' => $drop_id,
	'orderID' => $order_id,
	'uploadURI' => '/file/dropupload/',
	'renderURI' => $this->getApplicationURI('image/upload/'),
	'pht' => array(
	'uploading' => pht('Uploading Image...'),
	'uploaded' => pht('Upload Complete...'),
	'undo' => pht('Undo'),
	'removed' => pht('This image will be removed from the mock.'),
	),
	));

	require_celerity_resource('pholio-edit-css');
	$form = id(new AphrontFormView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->appendChild($order_control)
	->appendChild(
	id(new AphrontFormTextControl())
	->setName('name')
	->setValue($v_name)
	->setLabel(pht('Name'))
	->setError($e_name))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setName('description')
	->setValue($v_desc)
	->setLabel(pht('Description'))
	- ->setUser($user));
	+ ->setUser($viewer));

	- if ($this->id) {
	+ if ($id) {
	$form->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Status'))
	->setName('status')
	->setValue($mock->getStatus())
	->setOptions($mock->getStatuses()));
	} else {
	$form->addHiddenInput('status', 'open');
	}

	$form
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Projects'))
	->setName('projects')
	->setValue($v_projects)
	->setDatasource(new PhabricatorProjectDatasource()))
	->appendControl(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Subscribers'))
	->setName('cc')
	->setValue($v_cc)
	- ->setUser($user)
	+ ->setUser($viewer)
	->setDatasource(new PhabricatorMetaMTAMailableDatasource()))
	->appendChild(
	id(new AphrontFormPolicyControl())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	->setPolicyObject($mock)
	->setPolicies($policies)
	->setSpacePHID($v_space)
	->setName('can_view'))
	->appendChild(
	id(new AphrontFormPolicyControl())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setPolicyObject($mock)
	->setPolicies($policies)
	->setName('can_edit'))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setValue($list_control))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setValue($drop_control)
	->setError($e_images))
	->appendChild($submit);

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

	$crumbs = $this->buildApplicationCrumbs();
	if (!$is_new) {
	$crumbs->addTextCrumb($mock->getMonogram(), '/'.$mock->getMonogram());
	}
	$crumbs->addTextCrumb($title);

	$content = array(
	$crumbs,
	$form_box,
	);

	$this->addExtraQuicksandConfig(
	array('mockEditConfig' => true));
	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $title,
	));
	}

	}
	diff --git a/src/applications/pholio/controller/PholioMockListController.php b/src/applications/pholio/controller/PholioMockListController.php
	index c4d7fb4117..b4fa17fc8a 100644
	--- a/src/applications/pholio/controller/PholioMockListController.php
	+++ b/src/applications/pholio/controller/PholioMockListController.php
	@@ -1,24 +1,20 @@
	<?php

	final class PholioMockListController extends PholioController {

	- 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(new PholioMockSearchEngine())
	->setNavigation($this->buildSideNavView());

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

	}
	diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
	index b9084474d2..c5c6fed16c 100644
	--- a/src/applications/pholio/controller/PholioMockViewController.php
	+++ b/src/applications/pholio/controller/PholioMockViewController.php
	@@ -1,217 +1,211 @@
	<?php

	final class PholioMockViewController extends PholioController {

	- private $id;
	- private $imageID;
	private $maniphestTaskPHIDs = array();

	private function setManiphestTaskPHIDs($maniphest_task_phids) {
	$this->maniphestTaskPHIDs = $maniphest_task_phids;
	return $this;
	}
	private function getManiphestTaskPHIDs() {
	return $this->maniphestTaskPHIDs;
	}

	public function shouldAllowPublic() {
	return true;
	}

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

	$mock = id(new PholioMockQuery())
	- ->setViewer($user)
	- ->withIDs(array($this->id))
	+ ->setViewer($viewer)
	+ ->withIDs(array($id))
	->needImages(true)
	->needInlineComments(true)
	->executeOne();

	if (!$mock) {
	return new Aphront404Response();
	}

	$phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$mock->getPHID(),
	PholioMockHasTaskEdgeType::EDGECONST);
	$this->setManiphestTaskPHIDs($phids);

	$engine = id(new PhabricatorMarkupEngine())
	- ->setViewer($user);
	+ ->setViewer($viewer);
	$engine->addObject($mock, PholioMock::MARKUP_FIELD_DESCRIPTION);

	$title = $mock->getName();

	if ($mock->isClosed()) {
	$header_icon = 'fa-ban';
	$header_name = pht('Closed');
	$header_color = 'dark';
	} else {
	$header_icon = 'fa-square-o';
	$header_name = pht('Open');
	$header_color = 'bluegrey';
	}

	$header = id(new PHUIHeaderView())
	->setHeader($title)
	- ->setUser($user)
	+ ->setUser($viewer)
	->setStatus($header_icon, $header_color, $header_name)
	->setPolicyObject($mock);

	$timeline = $this->buildTransactionTimeline(
	$mock,
	new PholioTransactionQuery(),
	$engine);
	$timeline->setMock($mock);

	$actions = $this->buildActionView($mock);
	$properties = $this->buildPropertyView($mock, $engine, $actions);

	require_celerity_resource('pholio-css');
	require_celerity_resource('pholio-inline-comments-css');

	$comment_form_id = celerity_generate_unique_node_id();
	$mock_view = id(new PholioMockImagesView())
	->setRequestURI($request->getRequestURI())
	->setCommentFormID($comment_form_id)
	- ->setUser($user)
	+ ->setUser($viewer)
	->setMock($mock)
	- ->setImageID($this->imageID);
	+ ->setImageID($image_id);
	$this->addExtraQuicksandConfig(
	array('mockViewConfig' => $mock_view->getBehaviorConfig()));

	$output = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Image'))
	->appendChild($mock_view);

	$add_comment = $this->buildAddCommentView($mock, $comment_form_id);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb('M'.$mock->getID(), '/M'.$mock->getID());

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

	$thumb_grid = id(new PholioMockThumbGridView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setMock($mock);

	$content = array(
	$crumbs,
	$object_box,
	$output,
	$thumb_grid,
	$timeline,
	$add_comment,
	);

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => 'M'.$mock->getID().' '.$title,
	'pageObjects' => array($mock->getPHID()),
	));
	}

	private function buildActionView(PholioMock $mock) {
	- $user = $this->getRequest()->getUser();
	+ $viewer = $this->getViewer();

	$actions = id(new PhabricatorActionListView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setObjectURI($this->getRequest()->getRequestURI())
	->setObject($mock);

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	- $user,
	+ $viewer,
	$mock,
	PhabricatorPolicyCapability::CAN_EDIT);

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Mock'))
	->setHref($this->getApplicationURI('/edit/'.$mock->getID().'/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit));

	$actions->addAction(
	id(new PhabricatorActionView())
	->setIcon('fa-anchor')
	->setName(pht('Edit Maniphest Tasks'))
	->setHref("/search/attach/{$mock->getPHID()}/TASK/edge/")
	- ->setDisabled(!$user->isLoggedIn())
	+ ->setDisabled(!$viewer->isLoggedIn())
	->setWorkflow(true));

	return $actions;
	}

	private function buildPropertyView(
	PholioMock $mock,
	PhabricatorMarkupEngine $engine,
	PhabricatorActionListView $actions) {

	- $user = $this->getRequest()->getUser();
	+ $viewer = $this->getViewer();

	$properties = id(new PHUIPropertyListView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setObject($mock)
	->setActionList($actions);

	$properties->addProperty(
	pht('Author'),
	- $user->renderHandle($mock->getAuthorPHID()));
	+ $viewer->renderHandle($mock->getAuthorPHID()));

	$properties->addProperty(
	pht('Created'),
	- phabricator_datetime($mock->getDateCreated(), $user));
	+ phabricator_datetime($mock->getDateCreated(), $viewer));

	if ($this->getManiphestTaskPHIDs()) {
	$properties->addProperty(
	pht('Maniphest Tasks'),
	- $user->renderHandleList($this->getManiphestTaskPHIDs()));
	+ $viewer->renderHandleList($this->getManiphestTaskPHIDs()));
	}

	$properties->invokeWillRenderEvent();

	$properties->addSectionHeader(
	pht('Description'),
	PHUIPropertyListView::ICON_SUMMARY);

	$properties->addImageContent(
	$engine->getOutput($mock, PholioMock::MARKUP_FIELD_DESCRIPTION));

	return $properties;
	}

	private function buildAddCommentView(PholioMock $mock, $comment_form_id) {
	- $user = $this->getRequest()->getUser();
	+ $viewer = $this->getViewer();

	- $draft = PhabricatorDraft::newFromUserAndKey($user, $mock->getPHID());
	+ $draft = PhabricatorDraft::newFromUserAndKey($viewer, $mock->getPHID());

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
	$title = $is_serious
	? pht('Add Comment')
	: pht('History Beckons');

	$form = id(new PhabricatorApplicationTransactionCommentView())
	- ->setUser($user)
	+ ->setUser($viewer)
	->setObjectPHID($mock->getPHID())
	->setFormID($comment_form_id)
	->setDraft($draft)
	->setHeaderText($title)
	->setSubmitButtonName(pht('Add Comment'))
	->setAction($this->getApplicationURI('/comment/'.$mock->getID().'/'))
	->setRequestURI($this->getRequest()->getRequestURI());

	return $form;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Jul 3, 9:27 PM (1 h, 16 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166420
Default Alt Text: (33 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions