From 7626a459361ab170098521f276c62f3b31da7082 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 11 Feb 2008 09:56:16 +0000 Subject: [PATCH] Fixed folder add. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8813 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../admin/groups/apps/class_groupApplication2.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gosa-plugins/goto/admin/groups/apps/class_groupApplication2.inc b/gosa-plugins/goto/admin/groups/apps/class_groupApplication2.inc index fa4f90afc..9785878de 100644 --- a/gosa-plugins/goto/admin/groups/apps/class_groupApplication2.inc +++ b/gosa-plugins/goto/admin/groups/apps/class_groupApplication2.inc @@ -623,6 +623,7 @@ class appgroup2 extends plugin $a_folder['UNIQID'] = uniqid(); $a_folder['PARENT'] = $folder; $a_folder['TYPE'] = "FOLDER"; + $a_folder['ICON'] = ""; $all[$folder]['ENTRIES'][] = $a_folder; } } @@ -982,7 +983,13 @@ class appgroup2 extends plugin $attrs['objectClass'] = "gotoSubmenuEntry"; $attrs['cn'] = $entry['NAME']; $attrs['gosaApplicationPriority'] = $prio; - $attrs['gosaApplicationIcon'] = $entry['ICON']; + if($entry['STATUS'] != "ADDED"){ + $attrs['gosaApplicationIcon'] = array(); + } + + if(!empty($entry['ICON'])){ + $attrs['gosaApplicationIcon'] = $entry['ICON']; + } } break; case "RELEASE" : @@ -1020,6 +1027,7 @@ class appgroup2 extends plugin $ldap->cat($dn); if($ldap->count()){ $ldap->rmdir_recursive($dn); + show_ldap_error($ldap->get_error(), _("Could not save group application settings.")); } } foreach($Actions['Add'] as $dn => $data){ @@ -1027,6 +1035,7 @@ class appgroup2 extends plugin $ldap->cat($dn); if(!$ldap->count()){ $ldap->add($data); + show_ldap_error($ldap->get_error(), _("Could not save group application settings.")); } } foreach($Actions['Edit'] as $dn => $data){ @@ -1034,8 +1043,10 @@ class appgroup2 extends plugin $ldap->cat($dn); if($ldap->count()){ $ldap->modify($data); + show_ldap_error($ldap->get_error(), _("Could not save group application settings.")); } } + $this->_load_menu_structure(); } -- 2.30.2