lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return specific code for duplicate

Browse Source
This commit is contained in:
Laurent Destailleur 2012-03-20 13:51:50 +01:00
parent 4690944216
commit 845fe95128
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/categories/class/categorie.class.php
View File

@ -125,6 +125,7 @@ class Categorie
* @return int -1 : erreur SQL * @return int -1 : erreur SQL
* -2 : nouvel ID inconnu * -2 : nouvel ID inconnu
* -3 : categorie invalide * -3 : categorie invalide
* -4 : category already exists
*/ */
function create($user='') function create($user='')
{ {
@ -141,7 +142,7 @@ class Categorie
{ {
$this->error=$langs->trans("ImpossibleAddCat"); $this->error=$langs->trans("ImpossibleAddCat");
$this->error.=" : ".$langs->trans("CategoryExistsAtSameLevel"); $this->error.=" : ".$langs->trans("CategoryExistsAtSameLevel");
return -1; return -4;
} }
$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie (label, description,"; $sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie (label, description,";
@ -176,7 +177,7 @@ class Categorie
if($this->add_fille() < 0) if($this->add_fille() < 0)
{ {
$this->error=$langs->trans("ImpossibleAssociateCategory"); $this->error=$langs->trans("ImpossibleAssociateCategory");
return -1; return -3;
} }
} }

8
test/phpunit/CategorieTest.php
View File

@ -129,12 +129,16 @@ class CategorieTest extends PHPUnit_Framework_TestCase
$localobject=new Categorie($this->savdb); $localobject=new Categorie($this->savdb);
$localobject->initAsSpecimen(); $localobject->initAsSpecimen();
$result=$localobject->create($user);
// We create category
$result=$localobject->create($user);
$this->assertLessThan($result, 0); $this->assertLessThan($result, 0);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
// TODO Add test on error when creating duplicate // We try to create same category again
$result=$localobject->create($user);
$this->assertLessThan($result, -4);
print __METHOD__." result=".$result."\n";
return $result; return $result;