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

Fix: load only textarea for nl2br

Browse Source
This commit is contained in:
Regis Houssin 2011-10-27 18:55:07 +02:00
parent 1137b69a03
commit 1464929fed
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/deplacement/fiche.php
View File

@ -361,7 +361,7 @@ else if ($id)
// Km/Price // Km/Price
print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td>'; print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td>';
print '<td>'.$form->editInPlace($object->km, 'km', $object->element, 'numeric').'</td></tr>'; print '<td>'.$form->editInPlace(price($object->km), 'km', $user->rights->deplacement->creer, 'numeric').'</td></tr>';
// Where // Where
print '<tr><td>'.$langs->trans("CompanyVisited").'</td>'; print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';

5
htdocs/core/ajax/loadinplace.php
View File

@ -48,14 +48,15 @@ if((isset($_GET['field']) && ! empty($_GET['field']))
$table_element = GETPOST('table_element'); $table_element = GETPOST('table_element');
$field = GETPOST('field'); $field = GETPOST('field');
$fk_element = GETPOST('fk_element'); $fk_element = GETPOST('fk_element');
$type = GETPOST('type');
if ($element == 'fichinter') $element = 'ficheinter'; if ($element == 'fichinter') $element = 'ficheinter';
if ($user->rights->$element->lire || $user->rights->$element->read) if ($user->rights->$element->lire || $user->rights->$element->read)
{ {
$object = new GenericObject($db); $object = new GenericObject($db);
$ret=$object->getValueFrom($table_element, $fk_element, $field); $value=$object->getValueFrom($table_element, $fk_element, $field);
echo $ret; echo $value;
} }
else else
{ {

18
htdocs/core/ajax/saveinplace.php
View File

@ -52,6 +52,8 @@ if((isset($_POST['field']) && ! empty($_POST['field']))
$value = GETPOST('value'); $value = GETPOST('value');
$type = GETPOST('type'); $type = GETPOST('type');
$error=0;
if ($element == 'fichinter') $element = 'ficheinter'; if ($element == 'fichinter') $element = 'ficheinter';
if ($user->rights->$element->creer || $user->rights->$element->write) if ($user->rights->$element->creer || $user->rights->$element->write)
@ -65,11 +67,23 @@ if((isset($_POST['field']) && ! empty($_POST['field']))
$value = price2num($value); $value = price2num($value);
// Check parameters // Check parameters
if (! is_numeric($value)) $value = 0; if (! is_numeric($value))
{
$error++;
}
} }
if (! $error)
{
$ret=$object->setValueFrom($table_element, $fk_element, $field, $value); $ret=$object->setValueFrom($table_element, $fk_element, $field, $value);
if ($ret > 0) echo (! empty($value) ? dol_nl2br($value) : '&nbsp;'); if ($ret > 0)
{
if ($type == 'numeric') $value = price($value);
else $value = (! empty($value) ? dol_nl2br($value) : '&nbsp;');
echo $value;
}
}
} }
else else
{ {

7
htdocs/core/js/editinplace.js
View File

@ -57,13 +57,6 @@ $(document).ready(function() {
cancel : cancelInPlace, cancel : cancelInPlace,
submit : submitInPlace, submit : submitInPlace,
indicator : indicatorInPlace, indicator : indicatorInPlace,
loadurl : urlLoadInPlace,
loaddata : {
type: 'numeric',
element: element,
table_element: table_element,
fk_element: fk_element
},
submitdata : { submitdata : {
type: 'numeric', type: 'numeric',
element: element, element: element,