From 274cd34a4585bf102b436861b25a6868d3d5c3d2 Mon Sep 17 00:00:00 2001 From: cajus Date: Sat, 30 Jan 2010 11:48:27 +0000 Subject: [PATCH] Updated lists git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15498 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../admin/systems/class_componentGeneric.inc | 31 ------------------- .../admin/systems/serverService-list.tpl | 7 ++--- .../systems/admin/systems/system-list.tpl | 8 ++--- .../systemSelect/selectSystem-list.tpl | 9 ++---- 4 files changed, 8 insertions(+), 47 deletions(-) diff --git a/gosa-plugins/systems/admin/systems/class_componentGeneric.inc b/gosa-plugins/systems/admin/systems/class_componentGeneric.inc index 35ed070d6..70477398b 100644 --- a/gosa-plugins/systems/admin/systems/class_componentGeneric.inc +++ b/gosa-plugins/systems/admin/systems/class_componentGeneric.inc @@ -85,37 +85,6 @@ class componentGeneric extends plugin return($display); } - /* Base select dialog */ - $once = true; - foreach($_POST as $name => $value){ - if(preg_match("/^chooseBase/",$name) && $once){ - $once = false; - $this->dialog = new baseSelectDialog($this->config,$this,$this->get_allowed_bases()); - $this->dialog->setCurrentBase($this->base); - } - } - - /* Dialog handling */ - if(is_object($this->dialog)){ - /* Must be called before save_object */ - $this->dialog->save_object(); - - if($this->dialog->isClosed()){ - $this->dialog = false; - }elseif($this->dialog->isSelected()){ - - /* A new base was selected, check if it is a valid one */ - $tmp = $this->get_allowed_bases(); - if(isset($tmp[$this->dialog->isSelected()])){ - $this->base = $this->dialog->isSelected(); - } - - $this->dialog= false; - }else{ - return($this->dialog->execute()); - } - } - /* Fill templating stuff */ $smarty= get_smarty(); $smarty->assign("usePrototype", "true"); diff --git a/gosa-plugins/systems/admin/systems/serverService-list.tpl b/gosa-plugins/systems/admin/systems/serverService-list.tpl index cdef0d1b1..6c9ff0a22 100644 --- a/gosa-plugins/systems/admin/systems/serverService-list.tpl +++ b/gosa-plugins/systems/admin/systems/serverService-list.tpl @@ -1,8 +1,8 @@ - +
- diff --git a/gosa-plugins/systems/admin/systems/system-list.tpl b/gosa-plugins/systems/admin/systems/system-list.tpl index f3bba3f7a..d0747103b 100644 --- a/gosa-plugins/systems/admin/systems/system-list.tpl +++ b/gosa-plugins/systems/admin/systems/system-list.tpl @@ -1,8 +1,8 @@ -
+

 {$HEADLINE} {$SIZELIMIT}

@@ -17,9 +17,6 @@
- - - {$LIST}
+
- - diff --git a/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-list.tpl b/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-list.tpl index 231a0495e..ad9f86af8 100644 --- a/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-list.tpl +++ b/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-list.tpl @@ -1,8 +1,8 @@ -
+

 {$HEADLINE} {$SIZELIMIT}

@@ -18,11 +18,9 @@
- - {$LIST}
+ {$FILTER}
+
- - -- 2.30.2
+

 {$HEADLINE} {$SIZELIMIT}

@@ -17,12 +17,9 @@
- - - {$LIST}
+ {$FILTER}