HomePhorge
Diffusion Phorge 59bb8ca9dd84

Move Maniphest attached files section into textbox.
59bb8ca9dd84
Actions

Description

Move Maniphest attached files section into textbox.

Summary: Add a button to the Remarkup area that explains how to attach an image and remove the separate upload field.

Test Plan: Check that the dialog pops up correctly and that dropping images onto the Remarkup area works.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin, AnhNhan

Maniphest Tasks: T879

Differential Revision: https://secure.phabricator.com/D6049

Details

Provenance
Bryan CuccioliAuthored on May 26 2013, 1:45 PM
epriestleyCommitted on May 26 2013, 1:46 PM
themackabuPushed on Mar 25 2025, 8:07 PM
Parents
rPef797494ca89: Add Allowed uris config
Branches
Loading...
Tags
Loading...

Event Timeline

Changes (7)

PathSize
src/
applications/
files/
application/
controller/
maniphest/
controller/
view/
form/
control/
webroot/
rsrc/
js/
core/

rP59bb8ca9dd84

View Options

src/__phutil_library_map__.php

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines protected function getGitResult(ConduitAPIRequest $request) {
return $this->processBranchRefs($request, $refs); return $this->processBranchRefs($request, $refs);
} }
protected function getMercurialResult(ConduitAPIRequest $request) { protected function getMercurialResult(ConduitAPIRequest $request) {
$drequest = $this->getDiffusionRequest(); $drequest = $this->getDiffusionRequest();
$repository = $drequest->getRepository(); $repository = $drequest->getRepository();
$refs = id(new DiffusionLowLevelMercurialBranchesQuery()) $query = id(new DiffusionLowLevelMercurialBranchesQuery())
->setRepository($repository) ->setRepository($repository);
->execute();
// If we have a 'contains' query, filter these branches down to just the
// ones which contain the commit.
$contains = $request->getValue('contains'); $contains = $request->getValue('contains');
if (strlen($contains)) { if (strlen($contains)) {
list($branches_raw) = $repository->execxLocalCommand( $query->withContainsCommit($contains);
'log --template %s --limit 1 --rev %s --',
'{branches}',
hgsprintf('%s', $contains));
$branches_raw = trim($branches_raw);
if (!strlen($branches_raw)) {
$containing_branches = array('default');
} else {
$containing_branches = explode(' ', $branches_raw);
} }
$containing_branches = array_fuse($containing_branches); $refs = $query->execute();
// NOTE: We get this very slightly wrong: a branch may have multiple
// heads and we'll keep all of the heads of the branch, even if the
// commit is only on some of the heads. This should be rare, is probably
// more clear to users as is, and would potentially be expensive to get
// right since we'd have to do additional checks.
foreach ($refs as $key => $ref) {
if (empty($containing_branches[$ref->getShortName()])) {
unset($refs[$key]);
}
}
}
return $this->processBranchRefs($request, $refs); return $this->processBranchRefs($request, $refs);
} }
protected function getSVNResult(ConduitAPIRequest $request) { protected function getSVNResult(ConduitAPIRequest $request) {
// Since SVN doesn't have meaningful branches, just return nothing for all // Since SVN doesn't have meaningful branches, just return nothing for all
// queries. // queries.
return array(); return array();
Show All 29 Lines
View Options

src/applications/files/application/PhabricatorApplicationFiles.php

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines protected function getGitResult(ConduitAPIRequest $request) {
return $this->processBranchRefs($request, $refs); return $this->processBranchRefs($request, $refs);
} }
protected function getMercurialResult(ConduitAPIRequest $request) { protected function getMercurialResult(ConduitAPIRequest $request) {
$drequest = $this->getDiffusionRequest(); $drequest = $this->getDiffusionRequest();
$repository = $drequest->getRepository(); $repository = $drequest->getRepository();
$refs = id(new DiffusionLowLevelMercurialBranchesQuery()) $query = id(new DiffusionLowLevelMercurialBranchesQuery())
->setRepository($repository) ->setRepository($repository);
->execute();
// If we have a 'contains' query, filter these branches down to just the
// ones which contain the commit.
$contains = $request->getValue('contains'); $contains = $request->getValue('contains');
if (strlen($contains)) { if (strlen($contains)) {
list($branches_raw) = $repository->execxLocalCommand( $query->withContainsCommit($contains);
'log --template %s --limit 1 --rev %s --',
'{branches}',
hgsprintf('%s', $contains));
$branches_raw = trim($branches_raw);
if (!strlen($branches_raw)) {
$containing_branches = array('default');
} else {
$containing_branches = explode(' ', $branches_raw);
} }
$containing_branches = array_fuse($containing_branches); $refs = $query->execute();
// NOTE: We get this very slightly wrong: a branch may have multiple
// heads and we'll keep all of the heads of the branch, even if the
// commit is only on some of the heads. This should be rare, is probably
// more clear to users as is, and would potentially be expensive to get
// right since we'd have to do additional checks.
foreach ($refs as $key => $ref) {
if (empty($containing_branches[$ref->getShortName()])) {
unset($refs[$key]);
}
}
}
return $this->processBranchRefs($request, $refs); return $this->processBranchRefs($request, $refs);
} }
protected function getSVNResult(ConduitAPIRequest $request) { protected function getSVNResult(ConduitAPIRequest $request) {
// Since SVN doesn't have meaningful branches, just return nothing for all // Since SVN doesn't have meaningful branches, just return nothing for all
// queries. // queries.
return array(); return array();
Show All 29 Lines
View Options

src/applications/files/controller/PhabricatorFileUploadDialogController.php

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines protected function getGitResult(ConduitAPIRequest $request) {
return $this->processBranchRefs($request, $refs); return $this->processBranchRefs($request, $refs);
} }
protected function getMercurialResult(ConduitAPIRequest $request) { protected function getMercurialResult(ConduitAPIRequest $request) {
$drequest = $this->getDiffusionRequest(); $drequest = $this->getDiffusionRequest();
$repository = $drequest->getRepository(); $repository = $drequest->getRepository();
$refs = id(new DiffusionLowLevelMercurialBranchesQuery()) $query = id(new DiffusionLowLevelMercurialBranchesQuery())
->setRepository($repository) ->setRepository($repository);
->execute();
// If we have a 'contains' query, filter these branches down to just the
// ones which contain the commit.
$contains = $request->getValue('contains'); $contains = $request->getValue('contains');
if (strlen($contains)) { if (strlen($contains)) {
list($branches_raw) = $repository->execxLocalCommand( $query->withContainsCommit($contains);
'log --template %s --limit 1 --rev %s --',
'{branches}',
hgsprintf('%s', $contains));
$branches_raw = trim($branches_raw);
if (!strlen($branches_raw)) {
$containing_branches = array('default');
} else {
$containing_branches = explode(' ', $branches_raw);
} }
$containing_branches = array_fuse($containing_branches); $refs = $query->execute();
// NOTE: We get this very slightly wrong: a branch may have multiple
// heads and we'll keep all of the heads of the branch, even if the
// commit is only on some of the heads. This should be rare, is probably
// more clear to users as is, and would potentially be expensive to get
// right since we'd have to do additional checks.
foreach ($refs as $key => $ref) {
if (empty($containing_branches[$ref->getShortName()])) {
unset($refs[$key]);
}
}
}
return $this->processBranchRefs($request, $refs); return $this->processBranchRefs($request, $refs);
} }
protected function getSVNResult(ConduitAPIRequest $request) { protected function getSVNResult(ConduitAPIRequest $request) {
// Since SVN doesn't have meaningful branches, just return nothing for all // Since SVN doesn't have meaningful branches, just return nothing for all
// queries. // queries.
return array(); return array();
Show All 29 Lines
View Options

src/applications/maniphest/controller/ManiphestTaskDetailController.php

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines protected function getGitResult(ConduitAPIRequest $request) {
return $this->processBranchRefs($request, $refs); return $this->processBranchRefs($request, $refs);
} }
protected function getMercurialResult(ConduitAPIRequest $request) { protected function getMercurialResult(ConduitAPIRequest $request) {
$drequest = $this->getDiffusionRequest(); $drequest = $this->getDiffusionRequest();
$repository = $drequest->getRepository(); $repository = $drequest->getRepository();
$refs = id(new DiffusionLowLevelMercurialBranchesQuery()) $query = id(new DiffusionLowLevelMercurialBranchesQuery())
->setRepository($repository) ->setRepository($repository);
->execute();
// If we have a 'contains' query, filter these branches down to just the
// ones which contain the commit.
$contains = $request->getValue('contains'); $contains = $request->getValue('contains');
if (strlen($contains)) { if (strlen($contains)) {
list($branches_raw) = $repository->execxLocalCommand( $query->withContainsCommit($contains);
'log --template %s --limit 1 --rev %s --',
'{branches}',
hgsprintf('%s', $contains));
$branches_raw = trim($branches_raw);
if (!strlen($branches_raw)) {
$containing_branches = array('default');
} else {
$containing_branches = explode(' ', $branches_raw);
} }
$containing_branches = array_fuse($containing_branches); $refs = $query->execute();
// NOTE: We get this very slightly wrong: a branch may have multiple
// heads and we'll keep all of the heads of the branch, even if the
// commit is only on some of the heads. This should be rare, is probably
// more clear to users as is, and would potentially be expensive to get
// right since we'd have to do additional checks.
foreach ($refs as $key => $ref) {
if (empty($containing_branches[$ref->getShortName()])) {
unset($refs[$key]);
}
}
}
return $this->processBranchRefs($request, $refs); return $this->processBranchRefs($request, $refs);
} }
protected function getSVNResult(ConduitAPIRequest $request) { protected function getSVNResult(ConduitAPIRequest $request) {
// Since SVN doesn't have meaningful branches, just return nothing for all // Since SVN doesn't have meaningful branches, just return nothing for all
// queries. // queries.
return array(); return array();
Show All 29 Lines
View Options

src/applications/maniphest/controller/ManiphestTaskEditController.php

Loading...
View Options

src/view/form/control/PhabricatorRemarkupControl.php

Loading...
View Options

webroot/rsrc/js/core/behavior-phabricator-remarkup-assist.js

Loading...