From 9fba6d198407b0ce94feea9e81b4cd956090c5c9 Mon Sep 17 00:00:00 2001 From: Keita Jamadam Sugama Date: Sat, 20 Apr 2024 01:02:58 +0900 Subject: [PATCH 1/3] remove useless if-statement and wrong indentation --- tmpl/admin2023/cms/dialog/create_association.tmpl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tmpl/admin2023/cms/dialog/create_association.tmpl b/tmpl/admin2023/cms/dialog/create_association.tmpl index 7a0559b75e..47d5f07e48 100644 --- a/tmpl/admin2023/cms/dialog/create_association.tmpl +++ b/tmpl/admin2023/cms/dialog/create_association.tmpl @@ -108,13 +108,11 @@ function init() { var tagName = element.tagName ? element.tagName.toLowerCase() : null; // handle checkboxes - if ( tagName == "input" && - TC.hasClassName( element, "select" ) ) { - if ((element.type == "checkbox") || (element.type == "radio")) - var parent = TC.getParentByTagName( element, "tr" ); - if (parent) this.setFocus( parent ); - // evt.preventDefault(); - return this.select( element, parent ); + if ( tagName == "input" && TC.hasClassName( element, "select" ) ) { + var parent = TC.getParentByTagName( element, "tr" ); + if (parent) this.setFocus( parent ); + // evt.preventDefault(); + return this.select( element, parent ); } // handle rows From 37cc37bff7e9b3b34765ea2e0e905b870e82c9b0 Mon Sep 17 00:00:00 2001 From: Keita Jamadam Sugama Date: Sat, 20 Apr 2024 01:04:44 +0900 Subject: [PATCH 2/3] stop selecting row beyond li --- tmpl/admin2023/cms/dialog/create_association.tmpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tmpl/admin2023/cms/dialog/create_association.tmpl b/tmpl/admin2023/cms/dialog/create_association.tmpl index 47d5f07e48..c66f2963fb 100644 --- a/tmpl/admin2023/cms/dialog/create_association.tmpl +++ b/tmpl/admin2023/cms/dialog/create_association.tmpl @@ -110,9 +110,10 @@ function init() { // handle checkboxes if ( tagName == "input" && TC.hasClassName( element, "select" ) ) { var parent = TC.getParentByTagName( element, "tr" ); + var parent_li = TC.getParentByTagName( element, "li" ); if (parent) this.setFocus( parent ); // evt.preventDefault(); - return this.select( element, parent ); + return this.select( element, (parent_li ? null : parent) ); } // handle rows From 176bff9ad85881e7a589673469294974e06bb690 Mon Sep 17 00:00:00 2001 From: Keita Jamadam Sugama Date: Tue, 23 Apr 2024 11:30:47 +0900 Subject: [PATCH 3/3] fix to make selected-items work --- tmpl/admin2023/cms/dialog/create_association.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmpl/admin2023/cms/dialog/create_association.tmpl b/tmpl/admin2023/cms/dialog/create_association.tmpl index c66f2963fb..cca00d0383 100644 --- a/tmpl/admin2023/cms/dialog/create_association.tmpl +++ b/tmpl/admin2023/cms/dialog/create_association.tmpl @@ -113,7 +113,7 @@ function init() { var parent_li = TC.getParentByTagName( element, "li" ); if (parent) this.setFocus( parent ); // evt.preventDefault(); - return this.select( element, (parent_li ? null : parent) ); + return this.select( element, (parent_li ? parent_li : parent) ); } // handle rows