From 50a3e307ef6126cf694acd715f13028fb2a89485 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 16 Jan 2006 15:32:31 +0000 Subject: [PATCH] Updated printer dialog for speed Updated support lib to handle more than one IDE disk of the same type git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2493 594d385d-05f5-0310-b6e9-bd551577e9d8 --- contrib/fai/goto-fai/goto-support.lib | 2 +- plugins/admin/systems/class_selectUserToPrinterDialog.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/fai/goto-fai/goto-support.lib b/contrib/fai/goto-fai/goto-support.lib index b608c041a..c6bdbba8e 100644 --- a/contrib/fai/goto-fai/goto-support.lib +++ b/contrib/fai/goto-fai/goto-support.lib @@ -365,7 +365,7 @@ EOF # Insert IDE-Devices for f in /proc/ide/ide?/hd?/model; do - [ -f $f ] && echo "ghIdeDev: "$(cat $f) + [ -f $f ] && echo "ghIdeDev: "$(echo $f | cut -d/ -f5)" ("$(cat $f)")" done (cat /proc/scsi/scsi | sed -ne 's/.*Vendor: \([^ ]*\) *Model: \([^ ]*\) *.*$/\1 \2/p') 2> /dev/null|while read line; do diff --git a/plugins/admin/systems/class_selectUserToPrinterDialog.inc b/plugins/admin/systems/class_selectUserToPrinterDialog.inc index 6bde40544..cde125b47 100644 --- a/plugins/admin/systems/class_selectUserToPrinterDialog.inc +++ b/plugins/admin/systems/class_selectUserToPrinterDialog.inc @@ -27,7 +27,7 @@ class selectUserToPrinterDialog extends plugin switch($type){ case "AddUser" : - $this->searchObjects = "(objectClass=person)(objectClass=inetOrgPerson)(!(uid=*$))"; + $this->searchObjects = "(objectClass=gosaAccount)(!(uid=*$))"; $this->searchAttrs = array("cn","uid"); $this->searchAppend = "uid"; ;break; @@ -37,7 +37,7 @@ class selectUserToPrinterDialog extends plugin $this->searchAppend = "cn"; ;break; case "AddAdminUser" : - $this->searchObjects = "(objectClass=person)(objectClass=inetOrgPerson)(!(uid=*$))"; + $this->searchObjects = "(objectClass=gosaAccount)(!(uid=*$))"; $this->searchAttrs = array("cn","uid"); $this->searchAppend = "uid"; ;break; -- 2.30.2