fix api call booleans not being used
This commit is contained in:
parent
ac1d98f603
commit
b72f93faab
3 changed files with 16 additions and 18 deletions
|
|
@ -1893,7 +1893,6 @@ public function logs_by_uuid(Request $request)
|
||||||
public function delete_by_uuid(Request $request)
|
public function delete_by_uuid(Request $request)
|
||||||
{
|
{
|
||||||
$teamId = getTeamIdFromToken();
|
$teamId = getTeamIdFromToken();
|
||||||
$cleanup = filter_var($request->query->get('cleanup', true), FILTER_VALIDATE_BOOLEAN);
|
|
||||||
if (is_null($teamId)) {
|
if (is_null($teamId)) {
|
||||||
return invalidTokenResponse();
|
return invalidTokenResponse();
|
||||||
}
|
}
|
||||||
|
|
@ -1912,10 +1911,10 @@ public function delete_by_uuid(Request $request)
|
||||||
|
|
||||||
DeleteResourceJob::dispatch(
|
DeleteResourceJob::dispatch(
|
||||||
resource: $application,
|
resource: $application,
|
||||||
deleteVolumes: $request->query->get('delete_volumes', true),
|
deleteVolumes: $request->boolean('delete_volumes', true),
|
||||||
deleteConnectedNetworks: $request->query->get('delete_connected_networks', true),
|
deleteConnectedNetworks: $request->boolean('delete_connected_networks', true),
|
||||||
deleteConfigurations: $request->query->get('delete_configurations', true),
|
deleteConfigurations: $request->boolean('delete_configurations', true),
|
||||||
dockerCleanup: $request->query->get('docker_cleanup', true)
|
dockerCleanup: $request->boolean('docker_cleanup', true)
|
||||||
);
|
);
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
|
|
@ -3155,8 +3154,8 @@ public function action_deploy(Request $request)
|
||||||
if (is_null($teamId)) {
|
if (is_null($teamId)) {
|
||||||
return invalidTokenResponse();
|
return invalidTokenResponse();
|
||||||
}
|
}
|
||||||
$force = $request->query->get('force') ?? false;
|
$force = $request->boolean('force', false);
|
||||||
$instant_deploy = $request->query->get('instant_deploy') ?? false;
|
$instant_deploy = $request->boolean('instant_deploy', false);
|
||||||
$uuid = $request->route('uuid');
|
$uuid = $request->route('uuid');
|
||||||
if (! $uuid) {
|
if (! $uuid) {
|
||||||
return response()->json(['message' => 'UUID is required.'], 400);
|
return response()->json(['message' => 'UUID is required.'], 400);
|
||||||
|
|
|
||||||
|
|
@ -2133,7 +2133,6 @@ public function create_database(Request $request, NewDatabaseTypes $type)
|
||||||
public function delete_by_uuid(Request $request)
|
public function delete_by_uuid(Request $request)
|
||||||
{
|
{
|
||||||
$teamId = getTeamIdFromToken();
|
$teamId = getTeamIdFromToken();
|
||||||
$cleanup = filter_var($request->query->get('cleanup', true), FILTER_VALIDATE_BOOLEAN);
|
|
||||||
if (is_null($teamId)) {
|
if (is_null($teamId)) {
|
||||||
return invalidTokenResponse();
|
return invalidTokenResponse();
|
||||||
}
|
}
|
||||||
|
|
@ -2149,10 +2148,10 @@ public function delete_by_uuid(Request $request)
|
||||||
|
|
||||||
DeleteResourceJob::dispatch(
|
DeleteResourceJob::dispatch(
|
||||||
resource: $database,
|
resource: $database,
|
||||||
deleteVolumes: $request->query->get('delete_volumes', true),
|
deleteVolumes: $request->boolean('delete_volumes', true),
|
||||||
deleteConnectedNetworks: $request->query->get('delete_connected_networks', true),
|
deleteConnectedNetworks: $request->boolean('delete_connected_networks', true),
|
||||||
deleteConfigurations: $request->query->get('delete_configurations', true),
|
deleteConfigurations: $request->boolean('delete_configurations', true),
|
||||||
dockerCleanup: $request->query->get('docker_cleanup', true)
|
dockerCleanup: $request->boolean('docker_cleanup', true)
|
||||||
);
|
);
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
|
|
@ -2243,7 +2242,7 @@ public function delete_backup_by_uuid(Request $request)
|
||||||
return response()->json(['message' => 'Backup configuration not found.'], 404);
|
return response()->json(['message' => 'Backup configuration not found.'], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
$deleteS3 = filter_var($request->query->get('delete_s3', false), FILTER_VALIDATE_BOOLEAN);
|
$deleteS3 = $request->boolean('delete_s3', false);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
DB::beginTransaction();
|
DB::beginTransaction();
|
||||||
|
|
@ -2376,7 +2375,7 @@ public function delete_execution_by_uuid(Request $request)
|
||||||
return response()->json(['message' => 'Backup execution not found.'], 404);
|
return response()->json(['message' => 'Backup execution not found.'], 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
$deleteS3 = filter_var($request->query->get('delete_s3', false), FILTER_VALIDATE_BOOLEAN);
|
$deleteS3 = $request->boolean('delete_s3', false);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if ($execution->filename) {
|
if ($execution->filename) {
|
||||||
|
|
|
||||||
|
|
@ -649,10 +649,10 @@ public function delete_by_uuid(Request $request)
|
||||||
|
|
||||||
DeleteResourceJob::dispatch(
|
DeleteResourceJob::dispatch(
|
||||||
resource: $service,
|
resource: $service,
|
||||||
deleteVolumes: $request->query->get('delete_volumes', true),
|
deleteVolumes: $request->boolean('delete_volumes', true),
|
||||||
deleteConnectedNetworks: $request->query->get('delete_connected_networks', true),
|
deleteConnectedNetworks: $request->boolean('delete_connected_networks', true),
|
||||||
deleteConfigurations: $request->query->get('delete_configurations', true),
|
deleteConfigurations: $request->boolean('delete_configurations', true),
|
||||||
dockerCleanup: $request->query->get('docker_cleanup', true)
|
dockerCleanup: $request->boolean('docker_cleanup', true)
|
||||||
);
|
);
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue