From 785fc064dd5f053232e1e8a0f3242af34deb372e Mon Sep 17 00:00:00 2001 From: psc Date: Wed, 24 Jun 2009 08:48:26 +0000 Subject: [PATCH] Fix Trac #2646 Do not handle field seperators different in _get_next and _get_last functions, which are used when moving items around. This fixes several problems with moving items around. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13784 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../goto/admin/groups/apps/class_groupApplication.inc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/trunk/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc b/trunk/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc index a6cb616bb..5e3b15c7e 100644 --- a/trunk/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc +++ b/trunk/gosa-plugins/goto/admin/groups/apps/class_groupApplication.inc @@ -724,7 +724,7 @@ class appgroup extends plugin $to = $this->_get_next($to,$o_from['PARENT']); $o_to = $all[$to]; } - + /* Target is ENTRY && same BASE, just switch */ if($o_to['PARENT'] == $o_from['PARENT'] ){ $parent = $all[$o_to['PARENT']]; @@ -759,7 +759,7 @@ class appgroup extends plugin break; } } - while(isset($all_l[$i]) && !in_array($all_l[$i]['TYPE'],array("ENTRY","FOLDER","CLOSE","OPEN")) && $i < count($all_l)){ + while(isset($all_l[$i]) && !in_array($all_l[$i]['TYPE'],array("SEPERATOR","ENTRY","FOLDER","CLOSE","OPEN")) && $i < count($all_l)){ $i++; } @@ -792,7 +792,7 @@ class appgroup extends plugin $i++; } }else{ - while(isset($all_l[$i]) && !in_array($all_l[$i]['TYPE'],array("ENTRY","FOLDER")) && $i < count($all_l)){ + while(isset($all_l[$i]) && !in_array($all_l[$i]['TYPE'],array("SEPERATOR","ENTRY","FOLDER")) && $i < count($all_l)){ $i++; } } @@ -805,9 +805,6 @@ class appgroup extends plugin return($all_l[$i]['UNIQID']); } - - - /* !\brief Handle ui POSTS, like sort up/down/delete */ function save_object() -- 2.30.2