From 9f9c6bb74adb8ba3eb7a7d18964b52ed02c3be3d Mon Sep 17 00:00:00 2001 From: Daniel Neto Date: Fri, 3 Jan 2025 19:05:10 -0300 Subject: [PATCH] https://github.com/WWBN/AVideo/issues/9765#issuecomment-2569215237 --- objects/category.php | 8 ++++++++ objects/categoryDelete.json.php | 5 ++++- view/managerCategories_body.php | 8 +++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/objects/category.php b/objects/category.php index 86aa041773..efa13e3d70 100644 --- a/objects/category.php +++ b/objects/category.php @@ -913,16 +913,21 @@ class Category public function delete() { + global $categoryDeleteMessage; + $categoryDeleteMessage = ''; if (!self::canCreateCategory()) { + $categoryDeleteMessage = 'You cannot delete a category'; return false; } if (!self::userCanEditCategory($this->id)) { + $categoryDeleteMessage = 'This category does not belong to you'; return false; } // cannot delete default category if ($this->id == 1) { + $categoryDeleteMessage = 'You cannot delete the main category'; return false; } @@ -934,9 +939,12 @@ class Category if ($categories_id) { $sql = "UPDATE videos SET categories_id = ? WHERE categories_id = ?"; sqlDAL::writeSql($sql, "ii", [$categories_id, $this->id]); + $sql = "UPDATE live_transmitions SET categories_id = ? WHERE categories_id = ?"; + sqlDAL::writeSql($sql, "ii", [$categories_id, $this->id]); } $sql = "DELETE FROM categories WHERE id = ?"; } else { + $categoryDeleteMessage = 'Id is empty'; return false; } self::deleteAssets($this->id); diff --git a/objects/categoryDelete.json.php b/objects/categoryDelete.json.php index 36b009b41e..843f4e079e 100644 --- a/objects/categoryDelete.json.php +++ b/objects/categoryDelete.json.php @@ -14,4 +14,7 @@ require_once 'category.php'; $obj = new Category($_POST['id']); $response = $obj->delete(); -echo '{"status":"' . $response . '"}'; + +$resp = array('error'=> empty($response), 'msg'=>$categoryDeleteMessage); + +echo json_encode($resp); diff --git a/view/managerCategories_body.php b/view/managerCategories_body.php index 444e9231d6..f3fce93249 100644 --- a/view/managerCategories_body.php +++ b/view/managerCategories_body.php @@ -397,17 +397,15 @@ modal.showPleaseWait(); $.ajax({ - url: '', + url: webSiteRootURL+'objects/categoryDelete.json.php', data: { "id": row.id }, type: 'post', success: function(response) { - if (response.status === "1") { + avideoResponse(response); + if(empty(response.error)){ $("#grid").bootgrid("reload"); - avideoToast(""); - } else { - avideoAlert("", "", "error"); } modal.hidePleaseWait(); }