revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-20 04:20:55 +01:00
Code Issues Releases Wiki Activity

Normalize project slugs before querying for them

Browse source 
Summary:
Fixes T5728. In particular:

  - `/tag/XYZ/` now works as an alias for `/tag/xyz/`.
  - `arc todo --project ASDF` now works as an alias for `arc todo --project asdf`.

Test Plan: Called `project.query` and visited `/tag/LBHABLHBH/`.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: aklapper, epriestley

Maniphest Tasks: T5728

Differential Revision: https://secure.phabricator.com/D10144
This commit is contained in:
epriestley 2014-08-04 16:55:22 -07:00
parent 42cf7f6faa
commit 1e375c97c5
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/applications/project/conduit/ProjectQueryConduitAPIMethod.php
View file

@ -97,8 +97,9 @@ final class ProjectQueryConduitAPIMethod extends ProjectConduitAPIMethod {
// TODO: This is pretty hideous. // TODO: This is pretty hideous.
$slug_map = array(); $slug_map = array();
foreach ($slugs as $slug) { foreach ($slugs as $slug) {
$normal = rtrim(PhabricatorSlug::normalize($slug), '/');
foreach ($projects as $project) { foreach ($projects as $project) {
if (in_array($slug, $project['slugs'])) { if (in_array($normal, $project['slugs'])) {
$slug_map[$slug] = $project['phid']; $slug_map[$slug] = $project['phid'];
} }
} }

7
src/applications/project/query/PhabricatorProjectQuery.php
View file

@ -266,10 +266,15 @@ final class PhabricatorProjectQuery
} }
if ($this->slugs) { if ($this->slugs) {
$slugs = array();
foreach ($this->slugs as $slug) {
$slugs[] = rtrim(PhabricatorSlug::normalize($slug), '/');
}
$where[] = qsprintf( $where[] = qsprintf(
$conn_r, $conn_r,
'slug.slug IN (%Ls)', 'slug.slug IN (%Ls)',
$this->slugs); $slugs);
} }
if ($this->phrictionSlugs) { if ($this->phrictionSlugs) {