From f6a01f830e8038b5b4af15dfecc5256cadd6939e Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Fri, 19 Jul 2024 15:57:48 +0300 Subject: [PATCH 1/4] Make sure popper is registered for legacy Views --- classes/controllers/FrmAppController.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index cc19d0c057..f7be339282 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -933,10 +933,21 @@ private static function register_popper1() { private static function should_register_popper() { global $pagenow; - $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); + $post_id = FrmAppHelper::simple_get( 'post', 'absint' ); $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); - return strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $post_type === 'frm_display' ) || ( in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && FrmAppHelper::simple_get( 'taxonomy' ) === 'frm_application' ); + if ( 'post.php' === $pagenow && $post_id && 'frm_display' === get_post_type( $post_id ) ) { + return true; + } + $is_views_post_type = 'frm_display' === $post_type; + + if ( 'post-new.php' === $pagenow && $is_views_post_type ) { + return true; + } + + $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); + + return strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $is_views_post_type ) || ( in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && FrmAppHelper::simple_get( 'taxonomy' ) === 'frm_application' ); } /** From b99d8f0e92343efba37abc5d52f1e12bc9b6ac56 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Fri, 19 Jul 2024 16:07:56 +0300 Subject: [PATCH 2/4] Improve code readability --- classes/controllers/FrmAppController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index f7be339282..444d28e194 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -947,7 +947,11 @@ private static function should_register_popper() { $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); - return strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $is_views_post_type ) || ( in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && FrmAppHelper::simple_get( 'taxonomy' ) === 'frm_application' ); + if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $is_views_post_type ) ) { + return true; + } + + return in_array( $pagenow, array( 'term.php', 'edit-tags.php' ), true ) && FrmAppHelper::simple_get( 'taxonomy' ) === 'frm_application'; } /** From 162603d6971f8aa58966bacd830429a7d65067b3 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Fri, 19 Jul 2024 18:19:29 +0300 Subject: [PATCH 3/4] Simplify code a bit --- classes/controllers/FrmAppController.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index 444d28e194..954dd690b7 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -933,20 +933,18 @@ private static function register_popper1() { private static function should_register_popper() { global $pagenow; - $post_id = FrmAppHelper::simple_get( 'post', 'absint' ); - $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); - + $post_id = FrmAppHelper::simple_get( 'post', 'absint' ); if ( 'post.php' === $pagenow && $post_id && 'frm_display' === get_post_type( $post_id ) ) { return true; } - $is_views_post_type = 'frm_display' === $post_type; + $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); + $is_views_post_type = 'frm_display' === $post_type; if ( 'post-new.php' === $pagenow && $is_views_post_type ) { return true; } $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); - if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $is_views_post_type ) ) { return true; } From 5140eb9a9493ff6e81328ffb1c6cb89001d13678 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Mon, 22 Jul 2024 09:00:17 +0300 Subject: [PATCH 4/4] Simplify logic --- classes/controllers/FrmAppController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index 954dd690b7..268e5e6ad8 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -940,12 +940,12 @@ private static function should_register_popper() { $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); $is_views_post_type = 'frm_display' === $post_type; - if ( 'post-new.php' === $pagenow && $is_views_post_type ) { + if ( in_array( $pagenow, array( 'post-new.php', 'edit.php' ), true ) && $is_views_post_type ) { return true; } $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); - if ( strpos( $page, 'formidable' ) === 0 || ( $pagenow === 'edit.php' && $is_views_post_type ) ) { + if ( strpos( $page, 'formidable' ) === 0 ) { return true; }