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

Merge pull request #3057 from hregis/3.7_photos

Browse Source 
Fix: no error message if extrafield is require
This commit is contained in:
Laurent Destailleur 2015-06-17 00:18:12 +02:00
commit 2617d28f58
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
htdocs/fichinter/card.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2005-2015 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es>
@ -324,24 +324,34 @@ else if ($action == 'add' && $user->rights->ficheinter->creer)
} }
else else
{ {
// Extrafields // Fill array 'array_options' with data from add form
$extrafields = new ExtraFields($db); $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element); if ($ret < 0) {
$array_option = $extrafields->getOptionalsFromPost($extralabels); $error ++;
$action = 'create';
}
$object->array_options = $array_option; if (! $error)
{
// Extrafields
$extrafields = new ExtraFields($db);
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$array_option = $extrafields->getOptionalsFromPost($extralabels);
$result = $object->create($user); $object->array_options = $array_option;
if ($result > 0)
{ $result = $object->create($user);
$id=$result; // Force raffraichissement sur fiche venant d'etre cree if ($result > 0)
} {
else $id=$result; // Force raffraichissement sur fiche venant d'etre cree
{ }
$langs->load("errors"); else
setEventMessages($object->error, $object->errors, 'errors'); {
$action = 'create'; $langs->load("errors");
} setEventMessages($object->error, $object->errors, 'errors');
$action = 'create';
}
}
} }
} }
else else