View Options

	diff --git a/src/applications/conpherence/controller/ConpherenceNewRoomController.php b/src/applications/conpherence/controller/ConpherenceNewRoomController.php
	index 5578741e89..40dd6b2572 100644
	--- a/src/applications/conpherence/controller/ConpherenceNewRoomController.php
	+++ b/src/applications/conpherence/controller/ConpherenceNewRoomController.php
	@@ -1,131 +1,133 @@
	<?php

	final class ConpherenceNewRoomController extends ConpherenceController {

	public function handleRequest(AphrontRequest $request) {
	$user = $request->getUser();

	$title = pht('New Room');
	$e_title = true;
	+ $v_message = null;
	$validation_exception = null;

	$conpherence = ConpherenceThread::initializeNewRoom($user);
	$participants = array();
	if ($request->isFormPost()) {
	$editor = new ConpherenceEditor();
	$xactions = array();

	$participants = $request->getArr('participants');
	$participants[] = $user->getPHID();
	$participants = array_unique($participants);
	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(ConpherenceTransaction::TYPE_PARTICIPANTS)
	->setNewValue(array('+' => $participants));

	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(ConpherenceTransaction::TYPE_TITLE)
	->setNewValue($request->getStr('title'));
	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
	->setNewValue($request->getStr('viewPolicy'));
	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDIT_POLICY)
	->setNewValue($request->getStr('editPolicy'));
	$xactions[] = id(new ConpherenceTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_JOIN_POLICY)
	->setNewValue($request->getStr('joinPolicy'));

	- $message = $request->getStr('message');
	- if ($message) {
	+ $v_message = $request->getStr('message');
	+ if (strlen($v_message)) {
	$message_xactions = $editor->generateTransactionsFromText(
	$user,
	$conpherence,
	- $message);
	+ $v_message);
	$xactions = array_merge($xactions, $message_xactions);
	}

	try {
	$editor
	->setContentSourceFromRequest($request)
	->setContinueOnNoEffect(true)
	->setActor($user)
	->applyTransactions($conpherence, $xactions);

	return id(new AphrontRedirectResponse())
	->setURI('/'.$conpherence->getMonogram());
	} catch (PhabricatorApplicationTransactionValidationException $ex) {
	$validation_exception = $ex;

	$e_title = $ex->getShortMessage(ConpherenceTransaction::TYPE_TITLE);

	$conpherence->setViewPolicy($request->getStr('viewPolicy'));
	$conpherence->setEditPolicy($request->getStr('editPolicy'));
	$conpherence->setJoinPolicy($request->getStr('joinPolicy'));
	}
	} else {
	if ($request->getStr('participant')) {
	$participants[] = $request->getStr('participant');
	}
	}

	$policies = id(new PhabricatorPolicyQuery())
	->setViewer($user)
	->setObject($conpherence)
	->execute();

	$submit_uri = $this->getApplicationURI('new/');
	$cancel_uri = $this->getApplicationURI('search/');

	$dialog = $this->newDialog()
	->setWidth(AphrontDialogView::WIDTH_FORM)
	->setValidationException($validation_exception)
	->setUser($user)
	->setTitle($title)
	->addCancelButton($cancel_uri)
	->addSubmitButton(pht('Create Room'));

	$form = id(new PHUIFormLayoutView())
	->setUser($user)
	->appendChild(
	id(new AphrontFormTextControl())
	->setError($e_title)
	->setLabel(pht('Name'))
	->setName('title')
	->setValue($request->getStr('title')))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setName('participants')
	->setUser($user)
	->setDatasource(new PhabricatorPeopleDatasource())
	->setValue($participants)
	->setLabel(pht('Other Participants')))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setName('viewPolicy')
	->setPolicyObject($conpherence)
	->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
	->setPolicies($policies))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setName('editPolicy')
	->setPolicyObject($conpherence)
	->setCapability(PhabricatorPolicyCapability::CAN_EDIT)
	->setPolicies($policies))
	->appendChild(
	id(new AphrontFormPolicyControl())
	->setName('joinPolicy')
	->setPolicyObject($conpherence)
	->setCapability(PhabricatorPolicyCapability::CAN_JOIN)
	->setPolicies($policies))
	->appendChild(
	id(new PhabricatorRemarkupControl())
	->setUser($user)
	->setName('message')
	- ->setLabel(pht('First Message')));
	+ ->setLabel(pht('First Message'))
	+ ->setValue($v_message));

	$dialog->appendChild($form);

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 18:55 (1 d, 8 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1127606
Default Alt Text: (5 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions