From 0bc3af61bc11737f46dbf502502687c62d5124db Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 6 Jul 2010 12:38:12 +0000 Subject: [PATCH] Updated sortableListing -Do not use the 'onClick' statement for columns that contain links or buttons (HTML actions) This enables us to use action images/icons such as download buttons in sortable listings. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18942 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/include/class_sortableListing.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gosa-core/include/class_sortableListing.inc b/gosa-core/include/class_sortableListing.inc index 3af979b28..79bc25e7a 100644 --- a/gosa-core/include/class_sortableListing.inc +++ b/gosa-core/include/class_sortableListing.inc @@ -298,8 +298,14 @@ class sortableListing { $first= " style='border:0'"; foreach ($this->displayData[$row] as $column) { - $result.= " ".$column."\n"; - $first= ""; + + // Do NOT use the onClick statement for columns that contain links or buttons. + if(preg_match("<.*type=.submit..*>", $column) || preg_match("", $column)){ + $result.= " ".$column."\n"; + }else{ + $result.= " ".$column."\n"; + } + $first= ""; } if ($action_width) { -- 2.30.2