From 04a38a22f956790b083dbe78dde007097f8365f3 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Fri, 3 Jan 2025 18:09:42 -0400 Subject: [PATCH 1/2] Fix broken e2e tests --- classes/controllers/FrmAppController.php | 3 ++- classes/controllers/FrmEntriesController.php | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index d943f488a5..a35bf10e0d 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -17,7 +17,8 @@ public static function menu() { $menu_name = FrmAppHelper::get_menu_name(); if ( in_array( $menu_name, array( 'Formidable', 'Forms' ), true ) ) { - $menu_name .= wp_kses_post( FrmInboxController::get_notice_count() ); + $inbox = new FrmInbox(); + $menu_name .= wp_kses_post( $inbox->unread_html( false ) ); } add_menu_page( 'Formidable', $menu_name, 'frm_view_forms', 'formidable', 'FrmFormsController::route', self::menu_icon(), self::get_menu_position() ); diff --git a/classes/controllers/FrmEntriesController.php b/classes/controllers/FrmEntriesController.php index 557467b6db..e87846e98b 100644 --- a/classes/controllers/FrmEntriesController.php +++ b/classes/controllers/FrmEntriesController.php @@ -333,7 +333,10 @@ private static function base_column_key( $menu_name = '' ) { $menu_name = FrmAppHelper::get_menu_name(); } - return sanitize_title( $menu_name ) . '_page_formidable-entries'; + $inbox = new FrmInbox(); + $unread_count = count( $inbox->unread() ); + + return sanitize_title( $menu_name ) . ( $unread_count ? '-' . $unread_count : '' ) . '_page_formidable-entries'; } public static function save_per_page( $save, $option, $value ) { From 5556c08de283d75184db081d192d89512ffb76d7 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Fri, 3 Jan 2025 18:11:50 -0400 Subject: [PATCH 2/2] Use the previous function call --- classes/controllers/FrmAppController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index a35bf10e0d..d943f488a5 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -17,8 +17,7 @@ public static function menu() { $menu_name = FrmAppHelper::get_menu_name(); if ( in_array( $menu_name, array( 'Formidable', 'Forms' ), true ) ) { - $inbox = new FrmInbox(); - $menu_name .= wp_kses_post( $inbox->unread_html( false ) ); + $menu_name .= wp_kses_post( FrmInboxController::get_notice_count() ); } add_menu_page( 'Formidable', $menu_name, 'frm_view_forms', 'formidable', 'FrmFormsController::route', self::menu_icon(), self::get_menu_position() );