godotengine/godot-asset-library
1
0
Fork 0
mirror of https://github.com/godotengine/godot-asset-library.git synced 2026-02-25 06:33:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #318 from Gramps/master

Browse Source 
Revert JSON flag, added actual error messages to DB calls
This commit is contained in:
Emi
2024-02-13 11:09:44 +01:00
committed by GitHub
parent 8ebe458c8b ea9d9d1ff1
commit 93f24543b4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/asset.php
View File

@@ -156,7 +156,7 @@ $app->get('/asset', function ($request, $response, $args) {
'pages' => ceil($total_count / $page_size),
'page_length' => $page_size,
'total_items' => (int) $total_count,
], 200, JSON_PARTIAL_OUTPUT_ON_ERROR);
], 200);
});
// Get information for a single asset

12
src/routes/asset_edit.php
View File

@@ -700,7 +700,7 @@ $app->post('/asset/edit/{id:[0-9]+}/accept', function ($request, $response, $arg
$query_edit->bindValue(':edit_id', (int) $args['id'], PDO::PARAM_INT);
$query_edit->execute();
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_edit);
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_edit, 'Cannot get asset edit data from database.');
$error = $this->utils->errorResponseIfQueryNoResults($error, $response, $query_edit);
if ($error) {
return $response;
@@ -755,7 +755,7 @@ $app->post('/asset/edit/{id:[0-9]+}/accept', function ($request, $response, $arg
$query_status->bindValue(':reason', '');
$query_status->execute();
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_status);
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_status, 'Unable to update asset status in database');
$error = $this->utils->errorResponseIfQueryNoResults(false, $response, $query_status); // Important: Ensure that something was actually changed
if ($error) {
$this->db->rollback();
@@ -764,7 +764,7 @@ $app->post('/asset/edit/{id:[0-9]+}/accept', function ($request, $response, $arg
// Run
$query->execute();
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query);
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query, 'Failed query build process');
if ($error) {
$this->db->rollback();
return $response;
@@ -781,7 +781,7 @@ $app->post('/asset/edit/{id:[0-9]+}/accept', function ($request, $response, $arg
$query_update_id->execute();
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_update_id);
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_update_id, 'Failed to update the newly-created asset ID');
if ($error) {
$this->db->rollback();
return $response;
@@ -815,7 +815,7 @@ $app->post('/asset/edit/{id:[0-9]+}/accept', function ($request, $response, $arg
}
$query_apply_preview->execute();
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_apply_preview);
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_apply_preview, 'Failed to apply preview data for asset');
if ($error) {
$this->db->rollback();
return $response;
@@ -829,7 +829,7 @@ $app->post('/asset/edit/{id:[0-9]+}/accept', function ($request, $response, $arg
$query_verify->bindValue(':type', (int) $this->constants['user_type']['verified'], PDO::PARAM_INT);
$query_verify->execute();
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_verify);
$error = $this->utils->errorResponseIfQueryBad(false, $response, $query_verify, 'Failed to mark user as verified');
if ($error) {
$this->db->rollback();
return $response;