revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-09-20 17:28:51 +02:00
Code Issues Releases Wiki Activity

Make UX improvements to diff create screen

Browse source 
Summary: Minor tweaks for consistency, and raise a friendlier error if the user doesn't upload anything.

Test Plan:
{F48686}
{F48685}

Reviewers: chad

Reviewed By: chad

CC: aran

Differential Revision: https://secure.phabricator.com/D6360
This commit is contained in:
epriestley 2013-07-03 10:32:02 -07:00
parent 29658db32e
commit ebfa7e2c95
1 changed files with 44 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/applications/differential/controller/DifferentialDiffCreateController.php
View file

@ -6,6 +6,9 @@ final class DifferentialDiffCreateController extends DifferentialController {
$request = $this->getRequest();
$errors = array();
$e_diff = null;
$e_file = null;
if ($request->isFormPost()) {
$diff = null;
@ -15,16 +18,26 @@ final class DifferentialDiffCreateController extends DifferentialController {
$diff = $request->getStr('diff');
}
$call = new ConduitCall(
'differential.createrawdiff',
array(
'diff' => $diff,
));
$call->setUser($request->getUser());
$result = $call->execute();
if (!strlen($diff)) {
$errors[] = pht(
"You can not create an empty diff. Copy/paste a diff, or upload a ".
"diff file.");
$e_diff = pht('Required');
$e_file = pht('Required');
}
$path = id(new PhutilURI($result['uri']))->getPath();
return id(new AphrontRedirectResponse())->setURI($path);
if (!$errors) {
$call = new ConduitCall(
'differential.createrawdiff',
array(
'diff' => $diff,
));
$call->setUser($request->getUser());
$result = $call->execute();
$path = id(new PhutilURI($result['uri']))->getPath();
return id(new AphrontRedirectResponse())->setURI($path);
}
}
$form = new AphrontFormView();
@ -38,41 +51,52 @@ final class DifferentialDiffCreateController extends DifferentialController {
'target' => '_blank',
),
'Arcanist');
$cancel_uri = $this->getApplicationURI();
$form
->setAction('/differential/diff/create/')
->setEncType('multipart/form-data')
->setUser($request->getUser())
->appendChild(hsprintf(
'<p class="aphront-form-instructions">%s</p>',
->appendInstructions(
pht(
'The best way to create a Differential diff is by using %s, but you '.
'can also just paste a diff (e.g., from %s or %s) into this box '.
'or upload it as a file if you really want.',
'can also just paste a diff (for example, from %s, %s or %s) into '.
'this box, or upload a diff file.',
$arcanist_link,
phutil_tag('tt', array(), 'svn diff'),
phutil_tag('tt', array(), 'git diff'))))
phutil_tag('tt', array(), 'git diff'),
phutil_tag('tt', array(), 'hg diff')))
->appendChild(
id(new AphrontFormTextAreaControl())
->setLabel(pht('Raw Diff'))
->setName('diff')
->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL))
->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
->setError($e_diff))
->appendChild(
id(new AphrontFormFileControl())
->setLabel(pht('Raw Diff from file'))
->setName('diff-file'))
->setLabel(pht('Raw Diff From File'))
->setName('diff-file')
->setError($e_file))
->appendChild(
id(new AphrontFormSubmitControl())
->setValue(pht("Create Diff \xC2\xBB")));
->addCancelButton($cancel_uri)
->setValue(pht("Create Diff")));
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addCrumb(
id(new PhabricatorCrumbView())
->setName(pht('Create Diff'))
->setHref('/differential/diff/create/'));
->setName(pht('Create Diff')));
if ($errors) {
$errors = id(new AphrontErrorView())
->setErrors($errors);
}
return $this->buildApplicationPage(
array(
$crumbs,
$errors,
$form
),
array(