From f1ad3dd4d84d9399c13bbe109e2291018169457a Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 16 Mar 2010 06:27:26 +0000 Subject: [PATCH] Updated systems filter git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16546 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../systems/admin/systems/system-filter.xml | 31 ++++++++++++++++--- .../systems/admin/systems/system-list.xml | 8 ++--- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/gosa-plugins/systems/admin/systems/system-filter.xml b/gosa-plugins/systems/admin/systems/system-filter.xml index 81f39c576..511d0f12c 100644 --- a/gosa-plugins/systems/admin/systems/system-filter.xml +++ b/gosa-plugins/systems/admin/systems/system-filter.xml @@ -22,7 +22,18 @@ SYSTEMS - (&(|(objectClass=goServer)(objectClass=goFonHardware)(objectClass=gotoWorkstation)(objectClass=gotoWorkstation)(objectClass=ieee802Device)(objectClass=gotoPrinter))(cn=$)) + (& + (|(objectClass=goServer) + (objectClass=gotoWorkstation) + (objectClass=gotoTerminal) + (objectClass=goFonHardware) + (objectClass=ieee802Device) + (objectClass=gotoPrinter) + (objectClass=sambaSamAccount) + ) + (cn=$) + ) + cn @@ -33,10 +44,22 @@ all - + SYSTEMS - (&(objectClass=goServer)(objectClass=goPhoneHardware)(cn=$)) + (& + (|(objectClass=goServer) + (objectClass=gotoWorkstation) + (objectClass=gotoTerminal) + (objectClass=goFonHardware) + (objectClass=ieee802Device) + (objectClass=gotoPrinter) + (objectClass=sambaSamAccount) + (&(objectClass=goHard)(ou:dn:=%systemIncomingRDN)) + ) + (cn=$) + ) + OPSIHOSTS @@ -52,7 +75,7 @@ onlyOpsi - + OPSIHOSTS cn=$ diff --git a/gosa-plugins/systems/admin/systems/system-list.xml b/gosa-plugins/systems/admin/systems/system-list.xml index e16b68d58..506892dc4 100644 --- a/gosa-plugins/systems/admin/systems/system-list.xml +++ b/gosa-plugins/systems/admin/systems/system-list.xml @@ -23,7 +23,7 @@ FAKE_OC_NewWorkstation workstation workgeneric - plugins/systems/images/select_new_workstation.png + plugins/systems/images/select_workstation.png[new] @@ -56,7 +56,7 @@ FAKE_OC_NewTerminal terminal termgeneric - plugins/systems/images/select_new_terminal.png + plugins/systems/images/select_terminal.png[new] @@ -64,7 +64,7 @@ FAKE_OC_ArpNewDevice terminal termgeneric - plugins/systems/images/select_newsystem.png + plugins/systems/images/select_default.png[new] @@ -72,7 +72,7 @@ FAKE_OC_NewDevice terminal termgeneric - plugins/systems/images/select_newsystem.png + plugins/systems/images/select_default.png[new] -- 2.30.2