Skip to content

Commit d73df58

Browse files
author
epriestley
committedMar 9, 2017
Prevent use of the "quality" constraint in the Badge search API
Summary: Ref T12270. This just drops the constraint for now, rather than dealing with all the typecasting stuff and putting us in a position which will almost certainly require backward compatibility breaks in the future. Also renames "badges.*" to "badge.*" for consistency (all other methods are singular: token.*, project.*, differential.revision.*, etc). Test Plan: Saw "qualities" now "Not Supported", while other constraints continue to work: {F3887194} Reviewers: chad Reviewed By: chad Maniphest Tasks: T12270 Differential Revision: https://secure.phabricator.com/D17487
1 parent fa569c3 commit d73df58

6 files changed

+20
-4
lines changed
 

‎src/applications/badges/conduit/PhabricatorBadgesEditConduitAPIMethod.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ final class PhabricatorBadgesEditConduitAPIMethod
44
extends PhabricatorEditEngineAPIMethod {
55

66
public function getAPIMethodName() {
7-
return 'badges.edit';
7+
return 'badge.edit';
88
}
99

1010
public function newEditEngine() {

‎src/applications/badges/conduit/PhabricatorBadgesSearchConduitAPIMethod.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ final class PhabricatorBadgesSearchConduitAPIMethod
44
extends PhabricatorSearchEngineAPIMethod {
55

66
public function getAPIMethodName() {
7-
return 'badges.search';
7+
return 'badge.search';
88
}
99

1010
public function newSearchEngine() {

‎src/applications/badges/lipsum/PhabricatorBadgesAwardTestDataGenerator.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function generateObject() {
2626
'objectIdentifier' => $badge_phid,
2727
);
2828

29-
$result = id(new ConduitCall('badges.edit', $params))
29+
$result = id(new ConduitCall('badge.edit', $params))
3030
->setUser($author)
3131
->execute();
3232

‎src/applications/badges/lipsum/PhabricatorBadgesBadgeTestDataGenerator.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function generateObject() {
4040
'transactions' => $xactions,
4141
);
4242

43-
$result = id(new ConduitCall('badges.edit', $params))
43+
$result = id(new ConduitCall('badge.edit', $params))
4444
->setUser($author)
4545
->execute();
4646

‎src/applications/badges/query/PhabricatorBadgesSearchEngine.php

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ protected function buildCustomSearchFields() {
2424
id(new PhabricatorSearchCheckboxesField())
2525
->setKey('qualities')
2626
->setLabel(pht('Quality'))
27+
->setEnableForConduit(false)
2728
->setOptions(PhabricatorBadgesQuality::getDropdownQualityMap()),
2829
id(new PhabricatorSearchCheckboxesField())
2930
->setKey('statuses')

‎src/applications/search/field/PhabricatorSearchField.php

+15
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ abstract class PhabricatorSearchField extends Phobject {
1919
private $description;
2020
private $isHidden;
2121

22+
private $enableForConduit = true;
23+
2224

2325
/* -( Configuring Fields )------------------------------------------------- */
2426

@@ -333,6 +335,10 @@ public function appendToForm(AphrontFormView $form) {
333335
* @task conduit
334336
*/
335337
final public function getConduitParameterType() {
338+
if (!$this->getEnableForConduit()) {
339+
return false;
340+
}
341+
336342
$type = $this->newConduitParameterType();
337343

338344
if ($type) {
@@ -367,6 +373,15 @@ public function getValidConstraintKeys() {
367373
$this->getConduitKey());
368374
}
369375

376+
final public function setEnableForConduit($enable) {
377+
$this->enableForConduit = $enable;
378+
return $this;
379+
}
380+
381+
final public function getEnableForConduit() {
382+
return $this->enableForConduit;
383+
}
384+
370385

371386
/* -( Utility Methods )----------------------------------------------------- */
372387

0 commit comments

Comments
 (0)
Failed to load comments.