1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-21 04:50:55 +01:00

Added Additional Fuctionality to Jump Nav: Jump to users, projects, symbols, or

create new tasks

Summary: see title

Test Plan: Tested jump nav and found the correct urls were being loaded. Old
functionality was not effected.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: ddfisher, allenjohnashton, kpark517, aran, epriestley

Differential Revision: https://secure.phabricator.com/D1642
This commit is contained in:
David Fisher 2012-02-20 10:22:52 -08:00 committed by epriestley
parent be66a52050
commit fc4e23c50f
6 changed files with 96 additions and 8 deletions

View file

@ -668,6 +668,7 @@ phutil_register_library_map(array(
'PhabricatorProjectProfileController' => 'applications/project/controller/profile', 'PhabricatorProjectProfileController' => 'applications/project/controller/profile',
'PhabricatorProjectProfileEditController' => 'applications/project/controller/profileedit', 'PhabricatorProjectProfileEditController' => 'applications/project/controller/profileedit',
'PhabricatorProjectQuery' => 'applications/project/query/project', 'PhabricatorProjectQuery' => 'applications/project/query/project',
'PhabricatorProjectQueryUtil' => 'applications/project/query/util',
'PhabricatorProjectStatus' => 'applications/project/constants/status', 'PhabricatorProjectStatus' => 'applications/project/constants/status',
'PhabricatorProjectSubproject' => 'applications/project/storage/subproject', 'PhabricatorProjectSubproject' => 'applications/project/storage/subproject',
'PhabricatorProjectTransaction' => 'applications/project/storage/transaction', 'PhabricatorProjectTransaction' => 'applications/project/storage/transaction',

View file

@ -109,17 +109,16 @@ class PhabricatorDirectoryMainController
'/^d$/i' => 'uri:/differential/', '/^d$/i' => 'uri:/differential/',
'/^r$/i' => 'uri:/diffusion/', '/^r$/i' => 'uri:/diffusion/',
'/^t$/i' => 'uri:/maniphest/', '/^t$/i' => 'uri:/maniphest/',
'/^p$/i' => 'uri:/project/',
'/^u$/i' => 'uri:/people/',
'/r([A-Z]+)$/' => 'repository', '/r([A-Z]+)$/' => 'repository',
'/r([A-Z]+)(\S+)$/' => 'commit', '/r([A-Z]+)(\S+)$/' => 'commit',
'/^d(\d+)$/i' => 'revision', '/^d(\d+)$/i' => 'revision',
'/^t(\d+)$/i' => 'task', '/^t(\d+)$/i' => 'task',
'/^p\s+(.+)$/i' => 'project',
// TODO: '/^p$/i' => 'uri:/projects/', '/^u\s+(\S+)$/i' => 'user',
// TODO: '/^u$/i' => 'uri:/people/', '/^task:\s*(.+)/i' => 'create-task',
// TODO: '/^p\s+(\S+)$/i' => 'project', '/^(?:s|symbol)\s+(\S+)/i' => 'find-symbol',
// TODO: '/^u\s+(\S+)$/i' => 'user',
// TODO: '/^task:\s+(\S+)/i' => 'create-task',
// TODO: '/^(?:s|symbol)\s+(\S+)/i' => 'find-symbol',
); );
@ -143,6 +142,26 @@ class PhabricatorDirectoryMainController
case 'task': case 'task':
return id(new AphrontRedirectResponse()) return id(new AphrontRedirectResponse())
->setURI('/T'.$matches[1]); ->setURI('/T'.$matches[1]);
case 'user':
return id(new AphrontRedirectResponse())
->setURI('/p/'.$matches[1].'/');
case 'project':
$project = PhabricatorProjectQueryUtil
::findCloselyNamedProject($matches[1]);
if ($project) {
return id(new AphrontRedirectResponse())
->setURI('/project/view/'.$project->getID().'/');
} else {
$jump = $matches[1];
}
break;
case 'find-symbol':
return id(new AphrontRedirectResponse())
->setURI('/diffusion/symbol/'.$matches[1].'/?jump=true');
case 'create-task':
return id(new AphrontRedirectResponse())
->setURI('/maniphest/task/create/?title='
.phutil_escape_uri($matches[1]));
default: default:
throw new Exception("Unknown jump effect '{$effect}'!"); throw new Exception("Unknown jump effect '{$effect}'!");
} }

View file

@ -18,6 +18,7 @@ phutil_require_module('phabricator', 'applications/maniphest/query');
phutil_require_module('phabricator', 'applications/maniphest/view/tasklist'); phutil_require_module('phabricator', 'applications/maniphest/view/tasklist');
phutil_require_module('phabricator', 'applications/phid/handle/data'); phutil_require_module('phabricator', 'applications/phid/handle/data');
phutil_require_module('phabricator', 'applications/project/query/project'); phutil_require_module('phabricator', 'applications/project/query/project');
phutil_require_module('phabricator', 'applications/project/query/util');
phutil_require_module('phabricator', 'applications/search/storage/query'); phutil_require_module('phabricator', 'applications/search/storage/query');
phutil_require_module('phabricator', 'infrastructure/celerity/api'); phutil_require_module('phabricator', 'infrastructure/celerity/api');
phutil_require_module('phabricator', 'infrastructure/env'); phutil_require_module('phabricator', 'infrastructure/env');

View file

@ -0,0 +1,46 @@
<?php
/*
* Copyright 2012 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 PhabricatorProjectQueryUtil {
public static function findCloselyNamedProject($name) {
$project = id(new PhabricatorProject())->loadOneWhere(
'name = %s',
name);
if ($project) {
return $project;
} else { // no exact match, try a fuzzy match
$projects = id(new PhabricatorProject())->loadAllWhere(
'name LIKE %~',
$name);
if ($projects) {
$min_name_length = PHP_INT_MAX;
$best_project = null;
foreach ($projects as $project) {
$name_length = strlen($project->getName());
if ($name_length <= $min_name_length) {
$min_name_length = $name_length;
$best_project = $project;
}
}
return $best_project;
} else {
return null;
}
}
}
}

View file

@ -0,0 +1,14 @@
<?php
/**
* This file is automatically generated. Lint this module to rebuild it.
* @generated
*/
phutil_require_module('phabricator', 'applications/project/storage/project');
phutil_require_module('phutil', 'utils');
phutil_require_source('PhabricatorProjectQueryUtil.php');

View file

@ -18,4 +18,11 @@ a navigational command into the box and press return.
- **r** - Jump to Diffusion. - **r** - Jump to Diffusion.
- **rXYZ** - Jump to Diffusion Repository XYZ. - **rXYZ** - Jump to Diffusion Repository XYZ.
- **rXYZabcdef** - Jump to Diffusion Commit rXYZabcdef. - **rXYZabcdef** - Jump to Diffusion Commit rXYZabcdef.
- **u** - Jump to People
- **u username** - Jump to username's Profile
- **p** - Jump to Project
- **p Some Project** - Jump to Project: Some Project
- **s SymbolName** - Jump to Symbol SymbolName
- **task: (new title)** - Jumps to Task Creation Page with pre-filled
title.
- **(default)** - Search for input. - **(default)** - Search for input.