Page MenuHomePhabricator

D15429.id.diff
No OneTemporary

D15429.id.diff

diff --git a/src/applications/almanac/query/AlmanacServiceSearchEngine.php b/src/applications/almanac/query/AlmanacServiceSearchEngine.php
--- a/src/applications/almanac/query/AlmanacServiceSearchEngine.php
+++ b/src/applications/almanac/query/AlmanacServiceSearchEngine.php
@@ -15,10 +15,6 @@
return new AlmanacServiceQuery();
}
- public function newResultObject() {
- return new AlmanacService();
- }
-
protected function buildQueryFromParameters(array $map) {
$query = $this->newQuery();
diff --git a/src/applications/nuance/query/NuanceQueueQuery.php b/src/applications/nuance/query/NuanceQueueQuery.php
--- a/src/applications/nuance/query/NuanceQueueQuery.php
+++ b/src/applications/nuance/query/NuanceQueueQuery.php
@@ -16,20 +16,12 @@
return $this;
}
+ public function newResultObject() {
+ return new NuanceQueue();
+ }
+
protected function loadPage() {
- $table = new NuanceQueue();
- $conn = $table->establishConnection('r');
-
- $data = queryfx_all(
- $conn,
- '%Q FROM %T %Q %Q %Q',
- $this->buildSelectClause($conn),
- $table->getTableName(),
- $this->buildWhereClause($conn),
- $this->buildOrderClause($conn),
- $this->buildLimitClause($conn));
-
- return $table->loadAllFromArray($data);
+ return $this->loadStandardPage($this->newResultObject());
}
protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
diff --git a/src/applications/nuance/query/NuanceQueueSearchEngine.php b/src/applications/nuance/query/NuanceQueueSearchEngine.php
--- a/src/applications/nuance/query/NuanceQueueSearchEngine.php
+++ b/src/applications/nuance/query/NuanceQueueSearchEngine.php
@@ -11,21 +11,19 @@
return pht('Nuance Queues');
}
- public function buildSavedQueryFromRequest(AphrontRequest $request) {
- $saved = new PhabricatorSavedQuery();
-
- return $saved;
+ public function newQuery() {
+ return new NuanceQueueQuery();
}
- public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
- $query = id(new NuanceQueueQuery());
+ protected function buildQueryFromParameters(array $map) {
+ $query = $this->newQuery();
return $query;
}
- public function buildSearchForm(
- AphrontFormView $form,
- PhabricatorSavedQuery $saved_query) {}
+ protected function buildCustomSearchFields() {
+ return array();
+ }
protected function getURI($path) {
return '/nuance/queue/'.$path;
diff --git a/src/applications/nuance/query/NuanceSourceQuery.php b/src/applications/nuance/query/NuanceSourceQuery.php
--- a/src/applications/nuance/query/NuanceSourceQuery.php
+++ b/src/applications/nuance/query/NuanceSourceQuery.php
@@ -22,20 +22,12 @@
return $this;
}
- protected function loadPage() {
- $table = new NuanceSource();
- $conn = $table->establishConnection('r');
-
- $data = queryfx_all(
- $conn,
- '%Q FROM %T %Q %Q %Q',
- $this->buildSelectClause($conn),
- $table->getTableName(),
- $this->buildWhereClause($conn),
- $this->buildOrderClause($conn),
- $this->buildLimitClause($conn));
+ public function newResultObject() {
+ return new NuanceSource();
+ }
- return $table->loadAllFromArray($data);
+ protected function loadPage() {
+ return $this->loadStandardPage($this->newResultObject());
}
protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
diff --git a/src/applications/nuance/query/NuanceSourceSearchEngine.php b/src/applications/nuance/query/NuanceSourceSearchEngine.php
--- a/src/applications/nuance/query/NuanceSourceSearchEngine.php
+++ b/src/applications/nuance/query/NuanceSourceSearchEngine.php
@@ -11,21 +11,19 @@
return pht('Nuance Sources');
}
- public function buildSavedQueryFromRequest(AphrontRequest $request) {
- $saved = new PhabricatorSavedQuery();
-
- return $saved;
+ public function newQuery() {
+ return new NuanceSourceQuery();
}
- public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
- $query = id(new NuanceSourceQuery());
+ protected function buildQueryFromParameters(array $map) {
+ $query = $this->newQuery();
return $query;
}
- public function buildSearchForm(
- AphrontFormView $form,
- PhabricatorSavedQuery $saved_query) {}
+ protected function buildCustomSearchFields() {
+ return array();
+ }
protected function getURI($path) {
return '/nuance/source/'.$path;

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 27, 4:11 PM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7389376
Default Alt Text
D15429.id.diff (4 KB)

Event Timeline