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

diff --git a/contrib/fai/goto-fai/goto-support.lib b/contrib/fai/goto-fai/goto-support.lib
index b608c041a4ea04aac4f191cbb5b2715fbd56aa77..c6bdbba8ea5f29cfb4ebba1eab86d6ec5ad57bf9 100644 (file)
--- 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 6bde4054494bd7b64a31285b24328112480bd3e0..cde125b4731f5ba5af7d3b43f95ca9d93fe046f9 100644 (file)
--- 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;