Skip to content

Commit bbdd53d

Browse files
committed
Update picklist options #1647
Changing the new id value over to a generic variable that can be used on all the api routes uniformly to make this easier
1 parent 04415b3 commit bbdd53d

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

api/v1/deleteRoutes.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ function updatedevice($deviceid){
358358
// Method: DELETE
359359
// Params:
360360
// Required: ConnectorID
361-
// Optional: NewConnectorID
361+
// Optional: NewID
362362
// Returns: true/false on delete operation
363363

364364
$app->delete( '/powerconnectortypes/{id}', function( Request $request, Response $response, $args ) use ($person) {
@@ -372,7 +372,7 @@ function updatedevice($deviceid){
372372
$r['errorcode']=401;
373373
$r['message']=__("Access Denied");
374374
}else{
375-
if(!PowerConnectors::deleteConnector($id,(isset($vars['NewConnectorID']))?$vars['NewConnectorID']:0)){
375+
if(!PowerConnectors::deleteConnector($id,(isset($vars['NewID']))?$vars['NewID']:0)){
376376
$r['message']=__("Connector deletion failed");
377377
}else{
378378
$r['error']=false;
@@ -388,7 +388,7 @@ function updatedevice($deviceid){
388388
// Method: DELETE
389389
// Params:
390390
// Required: PhaseID
391-
// Optional: NewPhaseID
391+
// Optional: NewID
392392
// Returns: true/false on delete operation
393393

394394
$app->delete( '/powerphases/{id}', function( Request $request, Response $response, $args ) use ($person) {
@@ -402,7 +402,7 @@ function updatedevice($deviceid){
402402
$r['errorcode']=401;
403403
$r['message']=__("Access Denied");
404404
}else{
405-
if(!PowerPhases::deletePhase($id,(isset($vars['NewPhaseID']))?$vars['NewPhaseID']:0)){
405+
if(!PowerPhases::deletePhase($id,(isset($vars['NewID']))?$vars['NewID']:0)){
406406
$r['message']=__("Phase deletion failed");
407407
}else{
408408
$r['error']=false;
@@ -418,7 +418,7 @@ function updatedevice($deviceid){
418418
// Method: DELETE
419419
// Params:
420420
// Required: VoltageID
421-
// Optional: NewVoltageID
421+
// Optional: NewID
422422
// Returns: true/false on delete operation
423423

424424
$app->delete( '/powervoltages/{id}', function( Request $request, Response $response, $args ) use ($person) {
@@ -432,7 +432,7 @@ function updatedevice($deviceid){
432432
$r['errorcode']=401;
433433
$r['message']=__("Access Denied");
434434
}else{
435-
if(!PowerVoltages::deleteVoltage($id,(isset($vars['NewVoltageID']))?$vars['NewVoltageID']:0)){
435+
if(!PowerVoltages::deleteVoltage($id,(isset($vars['NewID']))?$vars['NewID']:0)){
436436
$r['message']=__("Voltage deletion failed");
437437
}else{
438438
$r['error']=false;
@@ -448,7 +448,7 @@ function updatedevice($deviceid){
448448
// Method: DELETE
449449
// Params:
450450
// Required: ConnectorID
451-
// Optional: NewConnectorID
451+
// Optional: NewID
452452
// Returns: true/false on delete operation
453453

454454
$app->delete( '/mediaconnectors/{id}', function( Request $request, Response $response, $args ) use ($person) {
@@ -462,7 +462,7 @@ function updatedevice($deviceid){
462462
$r['errorcode']=401;
463463
$r['message']=__("Access Denied");
464464
}else{
465-
if(!MediaConnectors::deleteConnector($id,(isset($vars['NewConnectorID']))?$vars['NewConnectorID']:0)){
465+
if(!MediaConnectors::deleteConnector($id,(isset($vars['NewID']))?$vars['NewID']:0)){
466466
$r['message']=__("Connector deletion failed");
467467
}else{
468468
$r['error']=false;
@@ -478,7 +478,7 @@ function updatedevice($deviceid){
478478
// Method: DELETE
479479
// Params:
480480
// Required: RateID
481-
// Optional: NewRateID
481+
// Optional: NewID
482482
// Returns: true/false on delete operation
483483

484484
$app->delete( '/mediadatarates/{id}', function( Request $request, Response $response, $args ) use ($person) {
@@ -492,7 +492,7 @@ function updatedevice($deviceid){
492492
$r['errorcode']=401;
493493
$r['message']=__("Access Denied");
494494
}else{
495-
if(!MediaDataRates::deleteRate($id,(isset($vars['NewRateID']))?$vars['NewRateID']:0)){
495+
if(!MediaDataRates::deleteRate($id,(isset($vars['NewID']))?$vars['NewID']:0)){
496496
$r['message']=__("Rate deletion failed");
497497
}else{
498498
$r['error']=false;
@@ -508,7 +508,7 @@ function updatedevice($deviceid){
508508
// Method: DELETE
509509
// Params:
510510
// Required: ProtocolID
511-
// Optional: NewProtocolID
511+
// Optional: NewID
512512
// Returns: true/false on delete operation
513513

514514
$app->delete( '/mediaprotocols/{id}', function( Request $request, Response $response, $args ) use ($person) {
@@ -522,7 +522,7 @@ function updatedevice($deviceid){
522522
$r['errorcode']=401;
523523
$r['message']=__("Access Denied");
524524
}else{
525-
if(!MediaProtocols::deleteProtocol($id,(isset($vars['NewProtocolID']))?$vars['NewProtocolID']:0)){
525+
if(!MediaProtocols::deleteProtocol($id,(isset($vars['NewID']))?$vars['NewID']:0)){
526526
$r['message']=__("Protocol deletion failed");
527527
}else{
528528
$r['error']=false;

configuration.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,10 +1113,10 @@ function genericbindrow(row){
11131113
});
11141114
function ajaxdelete(){
11151115
var modalactive = !!modal.data('ui-dialog');
1116-
var newConnectorId = (choices && choices.length)?choices.val():undefined;
1116+
var newId = (choices && choices.length)?choices.val():undefined;
11171117
$.ajax({
11181118
url: 'api/v1/' + datapath + '/' + rowinput.data('id'),
1119-
data: newConnectorId === undefined ? undefined : { NewConnectorID: newConnectorId },
1119+
data: newId === undefined ? undefined : { NewID: newId },
11201120
method: 'DELETE'
11211121
}).done(function(data){
11221122
if(modalactive){

0 commit comments

Comments
 (0)