1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-09-20 09:18:48 +02:00

Don't show current revision in dependencies

Test Plan: Edit Dependencies, don't see current revision.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran

Differential Revision: https://secure.phabricator.com/D2098
This commit is contained in:
vrana 2012-04-03 18:34:55 -07:00
parent c241f50d77
commit 6f855c8b52
6 changed files with 36 additions and 20 deletions

View file

@ -879,7 +879,7 @@ celerity_register_resource_map(array(
),
'javelin-behavior-phabricator-object-selector' =>
array(
'uri' => '/res/b711be4b/rsrc/js/application/core/behavior-object-selector.js',
'uri' => '/res/6788bf1e/rsrc/js/application/core/behavior-object-selector.js',
'type' => 'js',
'requires' =>
array(
@ -2093,7 +2093,7 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/18be02e0/differential.pkg.css',
'type' => 'css',
),
'06ebcd69' =>
'b2139675' =>
array(
'name' => 'differential.pkg.js',
'symbols' =>
@ -2116,7 +2116,7 @@ celerity_register_resource_map(array(
15 => 'javelin-behavior-differential-dropdown-menus',
16 => 'javelin-behavior-buoyant',
),
'uri' => '/res/pkg/06ebcd69/differential.pkg.js',
'uri' => '/res/pkg/b2139675/differential.pkg.js',
'type' => 'js',
),
'61f9d480' =>
@ -2207,7 +2207,7 @@ celerity_register_resource_map(array(
'aphront-typeahead-control-css' => '943d4357',
'differential-changeset-view-css' => '18be02e0',
'differential-core-view-css' => '18be02e0',
'differential-inline-comment-editor' => '06ebcd69',
'differential-inline-comment-editor' => 'b2139675',
'differential-local-commits-view-css' => '18be02e0',
'differential-revision-add-comment-css' => '18be02e0',
'differential-revision-comment-css' => '18be02e0',
@ -2218,27 +2218,27 @@ celerity_register_resource_map(array(
'diffusion-commit-view-css' => '61f9d480',
'javelin-behavior' => '4fbae2af',
'javelin-behavior-aphront-basic-tokenizer' => '2af849fb',
'javelin-behavior-aphront-drag-and-drop' => '06ebcd69',
'javelin-behavior-aphront-drag-and-drop-textarea' => '06ebcd69',
'javelin-behavior-aphront-drag-and-drop' => 'b2139675',
'javelin-behavior-aphront-drag-and-drop-textarea' => 'b2139675',
'javelin-behavior-aphront-form-disable-on-submit' => '21d01ed8',
'javelin-behavior-buoyant' => '06ebcd69',
'javelin-behavior-differential-accept-with-errors' => '06ebcd69',
'javelin-behavior-differential-add-reviewers-and-ccs' => '06ebcd69',
'javelin-behavior-differential-comment-jump' => '06ebcd69',
'javelin-behavior-differential-diff-radios' => '06ebcd69',
'javelin-behavior-differential-dropdown-menus' => '06ebcd69',
'javelin-behavior-differential-edit-inline-comments' => '06ebcd69',
'javelin-behavior-differential-feedback-preview' => '06ebcd69',
'javelin-behavior-differential-keyboard-navigation' => '06ebcd69',
'javelin-behavior-differential-populate' => '06ebcd69',
'javelin-behavior-differential-show-more' => '06ebcd69',
'javelin-behavior-buoyant' => 'b2139675',
'javelin-behavior-differential-accept-with-errors' => 'b2139675',
'javelin-behavior-differential-add-reviewers-and-ccs' => 'b2139675',
'javelin-behavior-differential-comment-jump' => 'b2139675',
'javelin-behavior-differential-diff-radios' => 'b2139675',
'javelin-behavior-differential-dropdown-menus' => 'b2139675',
'javelin-behavior-differential-edit-inline-comments' => 'b2139675',
'javelin-behavior-differential-feedback-preview' => 'b2139675',
'javelin-behavior-differential-keyboard-navigation' => 'b2139675',
'javelin-behavior-differential-populate' => 'b2139675',
'javelin-behavior-differential-show-more' => 'b2139675',
'javelin-behavior-maniphest-batch-selector' => '86fc0b0c',
'javelin-behavior-maniphest-transaction-controls' => '86fc0b0c',
'javelin-behavior-maniphest-transaction-expand' => '86fc0b0c',
'javelin-behavior-maniphest-transaction-preview' => '86fc0b0c',
'javelin-behavior-phabricator-autofocus' => '21d01ed8',
'javelin-behavior-phabricator-keyboard-shortcuts' => '21d01ed8',
'javelin-behavior-phabricator-object-selector' => '06ebcd69',
'javelin-behavior-phabricator-object-selector' => 'b2139675',
'javelin-behavior-phabricator-watch-anchor' => '21d01ed8',
'javelin-behavior-refresh-csrf' => '21d01ed8',
'javelin-behavior-workflow' => '21d01ed8',
@ -2267,7 +2267,7 @@ celerity_register_resource_map(array(
'phabricator-core-buttons-css' => '943d4357',
'phabricator-core-css' => '943d4357',
'phabricator-directory-css' => '943d4357',
'phabricator-drag-and-drop-file-upload' => '06ebcd69',
'phabricator-drag-and-drop-file-upload' => 'b2139675',
'phabricator-dropdown-menu' => '21d01ed8',
'phabricator-jump-nav' => '943d4357',
'phabricator-keyboard-shortcut' => '21d01ed8',
@ -2276,7 +2276,7 @@ celerity_register_resource_map(array(
'phabricator-object-selector-css' => '18be02e0',
'phabricator-paste-file-upload' => '21d01ed8',
'phabricator-remarkup-css' => '943d4357',
'phabricator-shaped-request' => '06ebcd69',
'phabricator-shaped-request' => 'b2139675',
'phabricator-standard-page-view' => '943d4357',
'phabricator-transaction-view-css' => '943d4357',
'syntax-highlighting-css' => '943d4357',

View file

@ -116,6 +116,7 @@ final class PhabricatorSearchAttachController
'all' => 'All '.$strings['target_plural_noun'],
))
->setSelectedFilter($strings['selected'])
->setExcluded($this->phid)
->setCancelURI($handle->getURI())
->setSearchURI('/search/select/'.$attach_type.'/')
->setTitle($strings['title'])

View file

@ -54,6 +54,8 @@ final class PhabricatorSearchSelectController
break;
}
$query->setParameter('exclude', $request->getStr('exclude'));
$engine = PhabricatorSearchEngineSelector::newSelector()->newEngine();
$results = $engine->executeSearch($query);

View file

@ -202,6 +202,11 @@ final class PhabricatorSearchEngineMySQL extends PhabricatorSearchEngine {
}
}
$exclude = $query->getParameter('exclude');
if ($exclude) {
$where[] = qsprintf($conn_r, 'document.phid != %s', $exclude);
}
if ($query->getParameter('type')) {
if (strlen($q)) {
// TODO: verify that this column actually does something useful in query

View file

@ -25,6 +25,7 @@ final class PhabricatorObjectSelectorDialog {
private $submitURI;
private $searchURI;
private $selectedFilter;
private $excluded;
private $title;
private $header;
@ -46,6 +47,11 @@ final class PhabricatorObjectSelectorDialog {
return $this;
}
public function setExcluded($excluded_phid) {
$this->excluded = $excluded_phid;
return $this;
}
public function setHandles(array $handles) {
assert_instances_of($handles, 'PhabricatorObjectHandle');
$this->handles = $handles;
@ -190,6 +196,7 @@ final class PhabricatorObjectSelectorDialog {
'results' => $results_id,
'current' => $current_id,
'form' => $form_id,
'exclude' => $this->excluded,
'uri' => $this->searchURI,
'handles' => $handle_views,
));

View file

@ -113,6 +113,7 @@ JX.behavior('phabricator-object-selector', function(config) {
new JX.Request(config.uri, JX.bind(null, onreceive, ++n))
.setData({
filter: JX.$(config.filter).value,
exclude: config.exclude,
query: JX.$(config.query).value
})
.send();