From 771600546823d8a3b385230aadee26ba375ca870 Mon Sep 17 00:00:00 2001 From: cajus Date: Sat, 30 Jan 2010 11:41:12 +0000 Subject: [PATCH] Updated application list git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15492 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../applications/application-list-release.tpl | 2 +- .../admin/applications/application-list.tpl | 9 ++---- .../applications/class_applicationGeneric.inc | 30 ------------------- 3 files changed, 4 insertions(+), 37 deletions(-) diff --git a/gosa-plugins/goto/admin/applications/application-list-release.tpl b/gosa-plugins/goto/admin/applications/application-list-release.tpl index 54599c7be..46bd2da9a 100644 --- a/gosa-plugins/goto/admin/applications/application-list-release.tpl +++ b/gosa-plugins/goto/admin/applications/application-list-release.tpl @@ -8,7 +8,7 @@
-
+
diff --git a/gosa-plugins/goto/admin/applications/application-list.tpl b/gosa-plugins/goto/admin/applications/application-list.tpl index f3bba3f7a..c9d511416 100644 --- a/gosa-plugins/goto/admin/applications/application-list.tpl +++ b/gosa-plugins/goto/admin/applications/application-list.tpl @@ -1,8 +1,8 @@ -
{$RELOAD} {$SEPARATOR} 
+
- - diff --git a/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc b/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc index d5295027a..0beadadfb 100644 --- a/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc +++ b/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc @@ -167,36 +167,6 @@ class application extends plugin $smarty->assign("selectmode", "disabled"); } - /* Base select dialog */ - $once = true; - foreach($_POST as $name => $value){ - if(preg_match("/^chooseBase/",$name) && $once && !preg_match("/freeze/i",$this->FAIstate)){ - $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()){ - - /* Just allow selection valid bases */ - $tmp = $this->get_allowed_bases(); - if(isset($tmp[$this->dialog->isSelected()])){ - $this->base = $this->dialog->isSelected(); - } - $this->dialog= false; - }else{ - return($this->dialog->execute()); - } - } - /* Get random number for pictures */ srand((double)microtime()*1000000); $smarty->assign("rand", rand(0, 10000)); -- 2.30.2
+

 {$HEADLINE} {$SIZELIMIT}

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