From 430c4e002be95c47078952b44c3291cdc8b5bcfd Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Sat, 25 Jan 2025 16:07:43 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20(content):=20go=20back=20to=20th?=
 =?UTF-8?q?e=20right=20page=20when=20deleting?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bl-kernel/admin/controllers/content.php      | 2 +-
 bl-kernel/admin/controllers/edit-content.php | 1 +
 bl-kernel/admin/views/content.php            | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bl-kernel/admin/controllers/content.php b/bl-kernel/admin/controllers/content.php
index d59ddf78..c6b90d2a 100644
--- a/bl-kernel/admin/controllers/content.php
+++ b/bl-kernel/admin/controllers/content.php
@@ -64,7 +64,7 @@ if (checkRole(array('author'), false)) {
 
 // Check if out of range the pageNumber
 if (empty($published) && $url->pageNumber()>1) {
-	Redirect::page('content');
+	Redirect::page('content/'.$contentTypeKey);
 }
 
 // Title of the page
diff --git a/bl-kernel/admin/controllers/edit-content.php b/bl-kernel/admin/controllers/edit-content.php
index 5077fbcb..d9612c7b 100644
--- a/bl-kernel/admin/controllers/edit-content.php
+++ b/bl-kernel/admin/controllers/edit-content.php
@@ -56,6 +56,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 	if ($_POST['state']==='delete') {
 		if (deletePage($_POST['key'])) {
 			Alert::set( $L->g('The changes have been saved') );
+			Redirect::page('content/'.$contentTypeKey);
 		}
 	} else {
 		$key = editPage($_POST);
diff --git a/bl-kernel/admin/views/content.php b/bl-kernel/admin/views/content.php
index d13c74fa..468b2e91 100644
--- a/bl-kernel/admin/views/content.php
+++ b/bl-kernel/admin/views/content.php
@@ -88,7 +88,7 @@ function table($type) {
 					echo '<a class="btn btn-sm btn-secondary d-none d-md-inline" target="_blank" href="'.$page->permalink().'"><i class="fa fa-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL;
 					echo '<a class="btn btn-sm btn-secondary d-none d-md-inline ms-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$page->key().'"><i class="fa fa-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL;
 					if (count($page->children())==0) {
-						echo '<a href="#" class="ms-2 btn btn-sm btn-danger deletePageButton d-block d-sm-inline" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$page->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
+						echo '<a href="#" class="ms-2 btn btn-sm btn-danger deletePageButton d-block d-sm-inline" data-bs-toggle="modal" data-bs-target="#jsdeletePageModal" data-key="'.$page->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
 					}
 					echo '</td>';
 
@@ -118,7 +118,7 @@ function table($type) {
 						echo '<a class="btn btn-sm btn-secondary d-none d-md-inline" target="_blank" href="'.$child->permalink().'"><i class="fa fa-desktop"></i>'.$L->g('View').'</a>'.PHP_EOL;
 						}
 						echo '<a class="btn btn-sm btn-secondary d-none d-md-inline ms-2" href="'.HTML_PATH_ADMIN_ROOT.'edit-content/'.$child->key().'"><i class="fa fa-edit"></i>'.$L->g('Edit').'</a>'.PHP_EOL;
-						echo '<a class="ms-2 btn btn-sm btn-danger deletePageButton d-block d-sm-inline" href="#" data-toggle="modal" data-target="#jsdeletePageModal" data-key="'.$child->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
+						echo '<a class="ms-2 btn btn-sm btn-danger deletePageButton d-block d-sm-inline" href="#" data-bs-toggle="modal" data-bs-target="#jsdeletePageModal" data-key="'.$child->key().'"><i class="fa fa-trash"></i>'.$L->g('Delete').'</a>'.PHP_EOL;
 						echo '</td>';
 
 						echo '</tr>';
@@ -289,7 +289,7 @@ $(document).ready(function() {
 			'value': key
 		}).append(jQuery('<input>', {
 			'type': 'hidden',
-			'name': 'type',
+			'name': 'state',
 			'value': 'delete'
 		}))));