From 888d57f4fd09f7504f889bcf4c39eea186af009d Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Fri, 10 Mar 2006 11:04:54 +0000
Subject: [PATCH] Make sure the new name in an edited unit is not a name of an existing unit.

---
 plugins/ktcore/admin/unitManagement.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/plugins/ktcore/admin/unitManagement.php b/plugins/ktcore/admin/unitManagement.php
index 533f40d..6e68398 100755
--- a/plugins/ktcore/admin/unitManagement.php
+++ b/plugins/ktcore/admin/unitManagement.php
@@ -89,7 +89,7 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
         );
         $sName = $this->oValidator->validateString($_REQUEST['unit_name'], $aOptions);
 		$aOptions['message'] = _('A unit with that name already exists.');
-		$sName = $this->oValidator->validateDuplicateName('Unit', _('Unit'), $sName, $aOptions);
+		$sName = $this->oValidator->validateDuplicateName2('Unit', $sName, $aOptions);
 
         $iFolderId = KTUtil::arrayGet($_REQUEST, 'fFolderId', 1);
         $_REQUEST['fFolderId'] = $iFolderId;
@@ -163,7 +163,7 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
         );
         $sName = $this->oValidator->validateString($_REQUEST['unit_name'], $aOptions);
 		$aOptions['message'] = _('A unit with that name already exists.');
-		$sName = $this->oValidator->validateDuplicateName('Unit', _('Unit'), $sName, $aOptions);
+		$sName = $this->oValidator->validateDuplicateName2('Unit', $sName, $aOptions);
 
         $oFolder = KTFolderUtil::add($oParentFolder, $sName, $this->oUser);
         $aOptions = array(
@@ -198,7 +198,14 @@ class KTUnitAdminDispatcher extends KTAdminDispatcher {
 
     function do_saveUnit() {
         $oUnit =& $this->oValidator->validateUnit($_REQUEST['unit_id']); 
-        $sName =& $this->oValidator->validateString($_REQUEST['unit_name']);
+        $aOptions = array(
+            'redirect_to' => array('editUnit', sprintf('unit_id=%d', $oUnit->getId())),
+            'message' => _('No name given'),
+        );
+        $sName = $this->oValidator->validateString($_REQUEST['unit_name'], $aOptions);
+		$aOptions['message'] = _('A unit with that name already exists.');
+		$aOptions['rename'] = $oUnit->getId();
+		$sName = $this->oValidator->validateDuplicateName2('Unit', $sName, $aOptions);
         $oUnit->setName($sName);
         $res = $oUnit->update();
         if (($res == false) || (PEAR::isError($res))) {
--
libgit2 0.21.4