From 40cf9835eecbbacb2ae8be602e9f6d18be4393a0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 19 Sep 2011 09:11:38 -0400
Subject: [PATCH] Fixed bug that caused the wrong list to be loaded when the return key was pressed in a search text field of a list.
---
interface/web/themes/default_no_navimg/templates/main.tpl.htm | 6 ++++++
interface/web/themes/default/templates/main.tpl.htm | 11 +++++++++--
interface/web/themes/default_combobox/templates/main.tpl.htm | 12 +++++++++---
interface/web/themes/default_64_navimg/templates/main.tpl.htm | 6 ++++++
4 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 842ffd7..83cf44b 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -68,7 +68,14 @@
jQuery(document).ready(function() {
loadInitContent();
});
-
+
+
+ jQuery(document).bind("change", function(event) {
+ if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
+ $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+ }
+ });
+
//Use jQuery submit with kespress Enter in panel filterbar
jQuery(document).bind("keypress", function(event) {
if (event.which == '13' && $(".panel #Filter").length > 0) {
@@ -117,7 +124,7 @@
<div id="col3_content" class="clearfix">
<a id="content" name="content"></a>
<!-- skiplink anchor: Content -->
- <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
+ <form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm" onSubmit="return false;">
<div id="pageContent"><!-- AJAX CONTENT --></div>
</form>
</div>
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index fcb8b53..a0a08f0 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -70,6 +70,12 @@
loadInitContent();
});
+ jQuery(document).bind("change", function(event) {
+ if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
+ $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+ }
+ });
+
//Use jQuery submit with kespress Enter in panel filterbar
jQuery(document).bind("keypress", function(event) {
if (event.which == '13' && $(".panel #Filter").length > 0) {
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index e33fba4..6c1b46d 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -72,10 +72,16 @@
loadInitContent();
});
+ jQuery(document).bind("change", function(event) {
+ if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
+ $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+ }
+ });
+
//Use jQuery submit with kespress Enter in panel filterbar
- jQuery(".panel .list input").live("keypress", function(event) {
- if (event.which == '13' && $(this).parents("tr").find("#Filter")) {
- $(this).parents("tr").find("#Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+ jQuery(document).bind("keypress", function(event) {
+ if (event.which == '13' && $(".panel #Filter").length > 0) {
+ $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
}
});
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index 31fc802..7d2571d 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -70,6 +70,12 @@
loadInitContent();
});
+ jQuery(document).bind("change", function(event) {
+ if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
+ $(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+ }
+ });
+
//Use jQuery submit with kespress Enter in panel filterbar
jQuery(document).bind("keypress", function(event) {
if (event.which == '13' && $(".panel #Filter").length > 0) {
--
Gitblit v1.9.1