From 468b2bb19c019d5c6d13887097801305d5f9daa0 Mon Sep 17 00:00:00 2001 From: cajus Date: Thu, 3 Apr 2008 12:32:50 +0000 Subject: [PATCH] Updated group application git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10145 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/goto/admin/groups/apps/app_list.tpl | 4 ++-- .../admin/groups/apps/class_groupApplication.inc | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/gosa-plugins/goto/admin/groups/apps/app_list.tpl b/gosa-plugins/goto/admin/groups/apps/app_list.tpl index c30dfb9b5..feb319bdd 100644 --- a/gosa-plugins/goto/admin/groups/apps/app_list.tpl +++ b/gosa-plugins/goto/admin/groups/apps/app_list.tpl @@ -53,9 +53,9 @@ {elseif $item.TYPE == "FOLDER"} { if $i++ % 2 == 0} - - {else} + {else} + {/if} {if $item.ICON != ""} diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc index 4a3e50076..6577bf28c 100644 --- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc +++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc @@ -272,14 +272,11 @@ class appgroup extends plugin /* Do we represent a valid account? */ if (!$this->is_account){ - $display= $this->show_enable_header(_("Add application extension"), - _("Application extension disabled. You can enable it by clicking below.")); + $display= $this->show_disable_header(msgPool::addFeaturesButton(_("Menu")), msgPool::featuresDisabled(_("Menu"))); return ($display); } - $display = $this->show_enable_header(_("Remove application extension"), - _("Application extension enabled. You can disable it by clicking below.")); - + $display= $this->show_disable_header(msgPool::removeFeaturesButton(_("Menu")), msgPool::featuresEnabled(_("Menu"))); if(isset($_GET['send'])){ $id = $_GET['send']; @@ -1115,7 +1112,11 @@ class appgroup extends plugin continue; } if($entry['STATUS'] == "REMOVED"){ - $Actions['Remove'][$entry['DN']] = $entry['DN']; + if(isset($entry['DN'])){ + $Actions['Remove'][$entry['DN']] = $entry['DN']; + }else{ + $Actions['Remove'][$cur_dn] = $cur_dn; + } } if($entry['STATUS'] == "EDITED"){ $Actions['Edit'][$cur_dn] = $attrs; -- 2.30.2