mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-23 22:10:55 +01:00
Allow Maniphest filtering by "upforgrabs" explicitly
Summary: Allow you to filter by "upforgrabs" to find unassigned tasks. Test Plan: Filtered by "upforgrabs". Reviewed By: tuomaspelkonen Reviewers: tuomaspelkonen, jungejason, aran Commenters: aran CC: sandra, anjali, aran, tuomaspelkonen, epriestley Differential Revision: 365
This commit is contained in:
parent
e3a02f7945
commit
10c6fcb4bb
11 changed files with 82 additions and 11 deletions
|
@ -268,6 +268,7 @@ phutil_register_library_map(array(
|
||||||
'ManiphestTaskEditController' => 'applications/maniphest/controller/taskedit',
|
'ManiphestTaskEditController' => 'applications/maniphest/controller/taskedit',
|
||||||
'ManiphestTaskListController' => 'applications/maniphest/controller/tasklist',
|
'ManiphestTaskListController' => 'applications/maniphest/controller/tasklist',
|
||||||
'ManiphestTaskListView' => 'applications/maniphest/view/tasklist',
|
'ManiphestTaskListView' => 'applications/maniphest/view/tasklist',
|
||||||
|
'ManiphestTaskOwner' => 'applications/maniphest/constants/owner',
|
||||||
'ManiphestTaskPriority' => 'applications/maniphest/constants/priority',
|
'ManiphestTaskPriority' => 'applications/maniphest/constants/priority',
|
||||||
'ManiphestTaskStatus' => 'applications/maniphest/constants/status',
|
'ManiphestTaskStatus' => 'applications/maniphest/constants/status',
|
||||||
'ManiphestTaskSummaryView' => 'applications/maniphest/view/tasksummary',
|
'ManiphestTaskSummaryView' => 'applications/maniphest/view/tasksummary',
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright 2011 Facebook, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
final class ManiphestTaskOwner {
|
||||||
|
|
||||||
|
const OWNER_UP_FOR_GRABS = 'PHID-!!!!-UP-FOR-GRABS';
|
||||||
|
|
||||||
|
}
|
10
src/applications/maniphest/constants/owner/__init__.php
Normal file
10
src/applications/maniphest/constants/owner/__init__.php
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* This file is automatically generated. Lint this module to rebuild it.
|
||||||
|
* @generated
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
phutil_require_source('ManiphestTaskOwner.php');
|
|
@ -113,9 +113,10 @@ class ManiphestTaskListController extends ManiphestController {
|
||||||
$form->appendChild(
|
$form->appendChild(
|
||||||
id(new AphrontFormTokenizerControl())
|
id(new AphrontFormTokenizerControl())
|
||||||
->setLimit(1)
|
->setLimit(1)
|
||||||
->setDatasource('/typeahead/common/users/')
|
->setDatasource('/typeahead/common/searchowner/')
|
||||||
->setName('view_user')
|
->setName('view_user')
|
||||||
->setLabel('View User')
|
->setLabel('View User')
|
||||||
|
->setCaption('Use "upforgrabs" to find unassigned tasks.')
|
||||||
->setValue(
|
->setValue(
|
||||||
array(
|
array(
|
||||||
$view_phid => $handles[$view_phid]->getFullName(),
|
$view_phid => $handles[$view_phid]->getFullName(),
|
||||||
|
@ -211,6 +212,14 @@ class ManiphestTaskListController extends ManiphestController {
|
||||||
private function loadTasks($view_phid, array $dict) {
|
private function loadTasks($view_phid, array $dict) {
|
||||||
$phids = array($view_phid);
|
$phids = array($view_phid);
|
||||||
|
|
||||||
|
$include_upforgrabs = false;
|
||||||
|
foreach ($phids as $key => $phid) {
|
||||||
|
if ($phid == ManiphestTaskOwner::OWNER_UP_FOR_GRABS) {
|
||||||
|
unset($phids[$key]);
|
||||||
|
$include_upforgrabs = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$task = new ManiphestTask();
|
$task = new ManiphestTask();
|
||||||
|
|
||||||
$argv = array();
|
$argv = array();
|
||||||
|
@ -229,16 +238,39 @@ class ManiphestTaskListController extends ManiphestController {
|
||||||
$extra_clause = '1 = 1';
|
$extra_clause = '1 = 1';
|
||||||
switch ($this->view) {
|
switch ($this->view) {
|
||||||
case 'action':
|
case 'action':
|
||||||
$extra_clause = 'ownerPHID in (%Ls)';
|
$parts = array();
|
||||||
|
if ($phids) {
|
||||||
|
$parts[] = 'ownerPHID in (%Ls)';
|
||||||
$argv[] = $phids;
|
$argv[] = $phids;
|
||||||
|
}
|
||||||
|
if ($include_upforgrabs) {
|
||||||
|
$parts[] = 'ownerPHID IS NULL';
|
||||||
|
}
|
||||||
|
$extra_clause = '('.implode(' OR ', $parts).')';
|
||||||
break;
|
break;
|
||||||
case 'created':
|
case 'created':
|
||||||
$extra_clause = 'authorPHID in (%Ls)';
|
$parts = array();
|
||||||
|
if ($phids) {
|
||||||
|
$parts[] = 'authorPHID in (%Ls)';
|
||||||
$argv[] = $phids;
|
$argv[] = $phids;
|
||||||
|
}
|
||||||
|
if ($include_upforgrabs) {
|
||||||
|
// This should be impossible since every task is supposed to have a
|
||||||
|
// valid author, but we might as well run the query.
|
||||||
|
$parts[] = 'authorPHID IS NULL';
|
||||||
|
}
|
||||||
|
$extra_clause = '('.implode(' OR ', $parts).')';
|
||||||
break;
|
break;
|
||||||
case 'triage':
|
case 'triage':
|
||||||
$extra_clause = 'ownerPHID in (%Ls) AND priority = %d';
|
$parts = array();
|
||||||
|
if ($phids) {
|
||||||
|
$parts[] = 'ownerPHID in (%Ls)';
|
||||||
$argv[] = $phids;
|
$argv[] = $phids;
|
||||||
|
}
|
||||||
|
if ($include_upforgrabs) {
|
||||||
|
$parts[] = 'ownerPHID IS NULL';
|
||||||
|
}
|
||||||
|
$extra_clause = '('.implode(' OR ', $parts).') AND priority = %d';
|
||||||
$argv[] = ManiphestTaskPriority::PRIORITY_TRIAGE;
|
$argv[] = ManiphestTaskPriority::PRIORITY_TRIAGE;
|
||||||
break;
|
break;
|
||||||
case 'alltriage':
|
case 'alltriage':
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
|
|
||||||
phutil_require_module('phabricator', 'aphront/response/redirect');
|
phutil_require_module('phabricator', 'aphront/response/redirect');
|
||||||
|
phutil_require_module('phabricator', 'applications/maniphest/constants/owner');
|
||||||
phutil_require_module('phabricator', 'applications/maniphest/constants/priority');
|
phutil_require_module('phabricator', 'applications/maniphest/constants/priority');
|
||||||
phutil_require_module('phabricator', 'applications/maniphest/constants/status');
|
phutil_require_module('phabricator', 'applications/maniphest/constants/status');
|
||||||
phutil_require_module('phabricator', 'applications/maniphest/controller/base');
|
phutil_require_module('phabricator', 'applications/maniphest/controller/base');
|
||||||
|
|
|
@ -94,8 +94,9 @@ class PhabricatorObjectHandleData {
|
||||||
$handle->setPHID($phid);
|
$handle->setPHID($phid);
|
||||||
$handle->setType($type);
|
$handle->setType($type);
|
||||||
switch ($phid) {
|
switch ($phid) {
|
||||||
case 'PHID-!!!!-UP-FOR-GRABS':
|
case ManiphestTaskOwner::OWNER_UP_FOR_GRABS:
|
||||||
$handle->setName('Up For Grabs');
|
$handle->setName('Up For Grabs');
|
||||||
|
$handle->setFullName('upforgrabs (Up For Grabs)');
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
$handle->setName('Foul Magicks');
|
$handle->setName('Foul Magicks');
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
|
|
||||||
phutil_require_module('phabricator', 'applications/files/uri');
|
phutil_require_module('phabricator', 'applications/files/uri');
|
||||||
|
phutil_require_module('phabricator', 'applications/maniphest/constants/owner');
|
||||||
phutil_require_module('phabricator', 'applications/phid/constants');
|
phutil_require_module('phabricator', 'applications/phid/constants');
|
||||||
phutil_require_module('phabricator', 'applications/phid/handle');
|
phutil_require_module('phabricator', 'applications/phid/handle');
|
||||||
phutil_require_module('phabricator', 'applications/repository/constants/repositorytype');
|
phutil_require_module('phabricator', 'applications/repository/constants/repositorytype');
|
||||||
|
|
|
@ -100,7 +100,7 @@ class PhabricatorSearchManiphestIndexer
|
||||||
} else {
|
} else {
|
||||||
$doc->addRelationship(
|
$doc->addRelationship(
|
||||||
PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
|
PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
|
||||||
'PHID-!!!!-UP-FOR-GRABS',
|
ManiphestTaskOwner::OWNER_UP_FOR_GRABS,
|
||||||
PhabricatorPHIDConstants::PHID_TYPE_MAGIC,
|
PhabricatorPHIDConstants::PHID_TYPE_MAGIC,
|
||||||
$owner
|
$owner
|
||||||
? $owner->getDateCreated()
|
? $owner->getDateCreated()
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
phutil_require_module('phabricator', 'applications/maniphest/constants/owner');
|
||||||
phutil_require_module('phabricator', 'applications/maniphest/constants/status');
|
phutil_require_module('phabricator', 'applications/maniphest/constants/status');
|
||||||
phutil_require_module('phabricator', 'applications/maniphest/constants/transactiontype');
|
phutil_require_module('phabricator', 'applications/maniphest/constants/transactiontype');
|
||||||
phutil_require_module('phabricator', 'applications/maniphest/storage/transaction');
|
phutil_require_module('phabricator', 'applications/maniphest/storage/transaction');
|
||||||
|
|
|
@ -63,9 +63,9 @@ class PhabricatorTypeaheadCommonDatasourceController
|
||||||
|
|
||||||
if ($need_upforgrabs) {
|
if ($need_upforgrabs) {
|
||||||
$data[] = array(
|
$data[] = array(
|
||||||
'Up For Grabs',
|
'upforgrabs (Up For Grabs)',
|
||||||
null,
|
null,
|
||||||
'PHID-!!!!-UP-FOR-GRABS',
|
ManiphestTaskOwner::OWNER_UP_FOR_GRABS,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
|
|
||||||
phutil_require_module('phabricator', 'aphront/response/ajax');
|
phutil_require_module('phabricator', 'aphront/response/ajax');
|
||||||
|
phutil_require_module('phabricator', 'applications/maniphest/constants/owner');
|
||||||
phutil_require_module('phabricator', 'applications/metamta/storage/mailinglist');
|
phutil_require_module('phabricator', 'applications/metamta/storage/mailinglist');
|
||||||
phutil_require_module('phabricator', 'applications/owners/storage/package');
|
phutil_require_module('phabricator', 'applications/owners/storage/package');
|
||||||
phutil_require_module('phabricator', 'applications/people/storage/user');
|
phutil_require_module('phabricator', 'applications/people/storage/user');
|
||||||
|
|
Loading…
Reference in a new issue