Fixes #1 Module LDC messages
Pagination wasnt keeping search and other filters Enhance plugin
This commit is contained in:
parent
b54273371b
commit
bdc8b14c27
1 changed files with 33 additions and 15 deletions
|
|
@ -389,8 +389,8 @@ function getMessages($page, $limit = 8, $search = false, $status = null)
|
|||
' FROM wp_messages, wp_messages_types' .
|
||||
' WHERE wp_messages.type_id = wp_messages_types.id';
|
||||
|
||||
if ($search !== false) {
|
||||
|
||||
if ($search !== false and !empty($search)) {
|
||||
// * Text search filter
|
||||
$search = trim(strip_tags($search));
|
||||
|
||||
// string search
|
||||
|
|
@ -423,11 +423,10 @@ function getMessages($page, $limit = 8, $search = false, $status = null)
|
|||
}
|
||||
|
||||
$query .= ')';
|
||||
} else {
|
||||
// status
|
||||
if ($status !== null) {
|
||||
$query .= " AND status = $status";
|
||||
}
|
||||
}
|
||||
// status
|
||||
if ($status !== null) {
|
||||
$query .= " AND status = $status";
|
||||
}
|
||||
|
||||
$total = $wpdb->get_results(
|
||||
|
|
@ -460,6 +459,16 @@ function queryMessagesTypesFromDB()
|
|||
return $wpdb->get_results("SELECT * FROM wp_messages_types");
|
||||
}
|
||||
|
||||
function start_session_if_needed()
|
||||
{
|
||||
if (!session_id()) {
|
||||
@session_start();
|
||||
}
|
||||
}
|
||||
|
||||
// Start session on init hook.
|
||||
add_action('init', 'start_session_if_needed');
|
||||
|
||||
function init()
|
||||
{
|
||||
/**
|
||||
|
|
@ -468,24 +477,33 @@ function init()
|
|||
* @var int
|
||||
* */
|
||||
$messagesByPage = 8;
|
||||
|
||||
$search = isset($_SESSION['LDC_MESSAGE.search']) ? strval($_SESSION['LDC_MESSAGE.search']) : false;
|
||||
// * Fetch from search
|
||||
$search = ($_SERVER['REQUEST_METHOD'] === 'POST' and isset($_POST['search'])) ?
|
||||
sanitize_text_field($_POST['search']) : false;
|
||||
sanitize_text_field($_POST['search']) : $search;
|
||||
// * Reset if present in search
|
||||
$search = ($_SERVER['REQUEST_METHOD'] === 'GET' and isset($_GET['search'])) ? false : $search;
|
||||
$_SESSION['LDC_MESSAGE.search'] = $search;
|
||||
$searchLabel = $search ? "- Recherche de '{$search}'" : '';
|
||||
|
||||
$currentPage = isset($_GET['p']) ? intval(sanitize_text_field($_GET['p'])) : 1;
|
||||
$status = isset($_GET['s']) ? intval((bool)sanitize_text_field($_GET['s'])) : null;
|
||||
$statusLabel = $status == '0' ? 'À traiter' : ($status == '1' ? 'Traité' : 'Tout');
|
||||
$messages = getMessages($currentPage, $messagesByPage, $search, $status);
|
||||
|
||||
$page = '<div class="wrap">';
|
||||
$page .= '<h1 class="wp-heading-inline">Gestion des messages - LDC</h1>';
|
||||
$page .= "<h1 class=\"wp-heading-inline\">Gestion des messages - LDC - {$statusLabel} {$searchLabel}</h1>";
|
||||
|
||||
$page .= "<form class='ldc_messages_search' method='POST' action='/wp-admin/admin.php?page=ldc-messages'>";
|
||||
$page .= "<form class='ldc_messages_search' method='POST' action='/wp-admin/admin.php?page=ldc-messages&s={$status}'>";
|
||||
$page .= "<div>";
|
||||
$page .= "<a href='/wp-admin/admin.php?page=ldc-messages&p=$currentPage' class='ldc_messages_btn'>Tout</a>";
|
||||
$page .= "<a href='/wp-admin/admin.php?page=ldc-messages&p=$currentPage&s=0' class='ldc_messages_btn ldc_messages_bg_red'>À traiter</a>";
|
||||
$page .= "<a href='/wp-admin/admin.php?page=ldc-messages&p=$currentPage&s=1' class='ldc_messages_btn ldc_messages_bg_green'>Traité</a>";
|
||||
$page .= "<a href='/wp-admin/admin.php?page=ldc-messages' class='ldc_messages_btn'>Tout</a>";
|
||||
$page .= "<a href='/wp-admin/admin.php?page=ldc-messages&s=0' class='ldc_messages_btn ldc_messages_bg_red'>À traiter</a>";
|
||||
$page .= "<a href='/wp-admin/admin.php?page=ldc-messages&s=1' class='ldc_messages_btn ldc_messages_bg_green'>Traité</a>";
|
||||
$page .= "</div>";
|
||||
$page .= '<input type="text" name="search" style="min-width: 28rem;" placeholder="Recherche selon de multiples critères" required/>';
|
||||
$page .= "<input type=\"text\" name=\"search\" style=\"min-width: 28rem;\" placeholder=\"Recherche selon de multiples critères\" value=\"{$search}\" required/>";
|
||||
if (!empty($searchLabel)) {
|
||||
$page .= " <a href=\"/wp-admin/admin.php?page=ldc-messages&s={$status}&search\">Effacer</a> ";
|
||||
}
|
||||
$page .= "<button type='submit'>Rechercher</button>";
|
||||
$page .= "</form>";
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue