From e8ede90eb5416d46ce7155ecfe1772275215b516 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Sat, 19 Mar 2016 09:06:53 +0000 Subject: [PATCH] added filter function to html.inc --- lam/lib/html.inc | 12 +++++++++++- lam/lib/modules/nisNetGroupHost.inc | 2 +- lam/lib/modules/nisNetGroupUser.inc | 2 +- lam/lib/modules/windowsGroup.inc | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lam/lib/html.inc b/lam/lib/html.inc index 74e0e37e..3f826e13 100644 --- a/lam/lib/html.inc +++ b/lam/lib/html.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2010 - 2014 Roland Gruber + Copyright (C) 2010 - 2016 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -767,6 +767,16 @@ class htmlInputField extends htmlElement { $this->sameValueFieldID = $sameValueFieldID; } + /** + * Turns this field into a live filter for a select box. + * Cannot be used together with setOnKeyUp(). + * + * @param String $name select box name + */ + public function filterSelectBox($name) { + $this->setOnKeyUp('filterSelect(\'' . $this->fieldName . '\', \'' . $name . '\', event);'); + } + } /** diff --git a/lam/lib/modules/nisNetGroupHost.inc b/lam/lib/modules/nisNetGroupHost.inc index c334cb80..b158f2ae 100644 --- a/lam/lib/modules/nisNetGroupHost.inc +++ b/lam/lib/modules/nisNetGroupHost.inc @@ -117,7 +117,7 @@ class nisNetGroupHost extends nisNetGroupUser { $filterGroup->addElement(new htmlOutputText(_('Filter') . ' ')); $filter = new htmlInputField('group_filter'); $filter->setFieldSize('5em'); - $filter->setOnKeyUp('filterSelect(\'group_filter\', \'group_add\', event);'); + $filter->filterSelectBox('group_add'); $filterGroup->addElement($filter); $return->addElement($filterGroup, true); diff --git a/lam/lib/modules/nisNetGroupUser.inc b/lam/lib/modules/nisNetGroupUser.inc index 36cd26ed..a4b6d2ef 100644 --- a/lam/lib/modules/nisNetGroupUser.inc +++ b/lam/lib/modules/nisNetGroupUser.inc @@ -197,7 +197,7 @@ class nisNetGroupUser extends baseModule { $filterGroup->addElement(new htmlOutputText(_('Filter') . ' ')); $filter = new htmlInputField('group_filter'); $filter->setFieldSize('5em'); - $filter->setOnKeyUp('filterSelect(\'group_filter\', \'group_add\', event);'); + $filter->filterSelectBox('group_add'); $filterGroup->addElement($filter); $return->addElement($filterGroup, true); diff --git a/lam/lib/modules/windowsGroup.inc b/lam/lib/modules/windowsGroup.inc index ec23697a..e84897b5 100644 --- a/lam/lib/modules/windowsGroup.inc +++ b/lam/lib/modules/windowsGroup.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2013 - 2015 Roland Gruber + Copyright (C) 2013 - 2016 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -649,7 +649,7 @@ class windowsGroup extends baseModule { $filterGroup->addElement(new htmlOutputText(_('Filter') . ' ')); $filter = new htmlInputField('windows_filter'); $filter->setFieldSize('5em'); - $filter->setOnKeyUp('filterSelect(\'windows_filter\', \'members\', event);'); + $filter->filterSelectBox('members'); $filterGroup->addElement($filter); $return->addElement($filterGroup, true);