From cf4ff8318ed6d91704f841e7b9e8628f5d780b42 Mon Sep 17 00:00:00 2001 From: Anh Nhan Nguyen Date: Mon, 15 Apr 2013 06:43:39 -0700 Subject: [PATCH] Adding an own application for search Summary: Refs T2989 Renamed file Libery Test Plan: Nothing broken, that's always a good sign. Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Maniphest Tasks: T2989 Differential Revision: https://secure.phabricator.com/D5697 Conflicts: src/__phutil_library_map__.php --- src/__phutil_library_map__.php | 4 +- ...AphrontDefaultApplicationConfiguration.php | 12 ------ .../PhabricatorApplicationSearch.php | 41 +++++++++++++++++++ 3 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 src/applications/search/application/PhabricatorApplicationSearch.php diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index 2824cbf3ef..7f80cbc4ed 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -725,6 +725,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationReleeph' => 'applications/releeph/application/PhabricatorApplicationReleeph.php', 'PhabricatorApplicationReleephConfigOptions' => 'applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php', 'PhabricatorApplicationRepositories' => 'applications/repository/application/PhabricatorApplicationRepositories.php', + 'PhabricatorApplicationSearch' => 'applications/search/application/PhabricatorApplicationSearch.php', 'PhabricatorApplicationSearchEngine' => 'applications/search/engine/PhabricatorApplicationSearchEngine.php', 'PhabricatorApplicationSettings' => 'applications/settings/application/PhabricatorApplicationSettings.php', 'PhabricatorApplicationSlowvote' => 'applications/slowvote/application/PhabricatorApplicationSlowvote.php', @@ -963,7 +964,6 @@ phutil_register_library_map(array( 'PhabricatorFeedStoryReference' => 'applications/feed/storage/PhabricatorFeedStoryReference.php', 'PhabricatorFeedStoryStatus' => 'applications/feed/story/PhabricatorFeedStoryStatus.php', 'PhabricatorFeedStoryTypeConstants' => 'applications/feed/constants/PhabricatorFeedStoryTypeConstants.php', - 'PhabricatorFeedStoryView' => 'applications/feed/view/PhabricatorFeedStoryView.php', 'PhabricatorFeedView' => 'applications/feed/view/PhabricatorFeedView.php', 'PhabricatorFile' => 'applications/files/storage/PhabricatorFile.php', 'PhabricatorFileController' => 'applications/files/controller/PhabricatorFileController.php', @@ -2422,6 +2422,7 @@ phutil_register_library_map(array( 'PhabricatorApplicationReleeph' => 'PhabricatorApplication', 'PhabricatorApplicationReleephConfigOptions' => 'PhabricatorApplicationConfigOptions', 'PhabricatorApplicationRepositories' => 'PhabricatorApplication', + 'PhabricatorApplicationSearch' => 'PhabricatorApplication', 'PhabricatorApplicationSettings' => 'PhabricatorApplication', 'PhabricatorApplicationSlowvote' => 'PhabricatorApplication', 'PhabricatorApplicationStatusView' => 'AphrontView', @@ -2662,7 +2663,6 @@ phutil_register_library_map(array( 'PhabricatorFeedStoryReference' => 'PhabricatorFeedDAO', 'PhabricatorFeedStoryStatus' => 'PhabricatorFeedStory', 'PhabricatorFeedStoryTypeConstants' => 'PhabricatorFeedConstants', - 'PhabricatorFeedStoryView' => 'PhabricatorFeedView', 'PhabricatorFeedView' => 'AphrontView', 'PhabricatorFile' => array( diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php index 84f4a027b6..94813a1902 100644 --- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php @@ -73,18 +73,6 @@ class AphrontDefaultApplicationConfiguration 'data/(?P[^/]+)/' => 'DarkConsoleDataController', ), - '/search/' => array( - '' => 'PhabricatorSearchController', - '(?P[^/]+)/' => 'PhabricatorSearchController', - 'attach/(?P[^/]+)/(?P\w+)/(?:(?P\w+)/)?' - => 'PhabricatorSearchAttachController', - 'select/(?P\w+)/' - => 'PhabricatorSearchSelectController', - 'index/(?P[^/]+)/' => 'PhabricatorSearchIndexController', - 'hovercard/(?Pretrieve|test)/' => - 'PhabricatorSearchHovercardController', - ), - '/status/' => 'PhabricatorStatusController', diff --git a/src/applications/search/application/PhabricatorApplicationSearch.php b/src/applications/search/application/PhabricatorApplicationSearch.php new file mode 100644 index 0000000000..06bf280e3a --- /dev/null +++ b/src/applications/search/application/PhabricatorApplicationSearch.php @@ -0,0 +1,41 @@ + array( + '' => 'PhabricatorSearchController', + '(?P[^/]+)/' => 'PhabricatorSearchController', + 'attach/(?P[^/]+)/(?P\w+)/(?:(?P\w+)/)?' + => 'PhabricatorSearchAttachController', + 'select/(?P\w+)/' + => 'PhabricatorSearchSelectController', + 'index/(?P[^/]+)/' => 'PhabricatorSearchIndexController', + 'hovercard/(?Pretrieve|test)/' => + 'PhabricatorSearchHovercardController', + ), + ); + } + +}