Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: compatibility with edit in place

Browse Source 
Qual: use generic function and remove unused
Todo: Type of product combobox is not compatible with edit in place
This commit is contained in:
Regis Houssin
2012-03-04 09:43:56 +01:00
parent 00b7ad4a78
commit 68ce569d05
5 changed files with 27 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,6 +62,7 @@ if((isset($_GET['field']) && ! empty($_GET['field']))
if ($element == 'propal') $element = 'propale';
else if ($element == 'fichinter') $element = 'ficheinter';
else if ($element == 'product') $element = 'produit';
else if ($element == 'order_supplier') {
$element = 'fournisseur';
$subelement = 'commande';

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

@@ -69,6 +69,7 @@ if((isset($_POST['field']) && ! empty($_POST['field']))
if ($element == 'propal') $element = 'propale';
else if ($element == 'fichinter') $element = 'ficheinter';
else if ($element == 'product') $element = 'produit';
else if ($element == 'order_supplier') {
$element = 'fournisseur';
$subelement = 'commande';

8
htdocs/core/class/html.form.class.php
View File

@@ -80,8 +80,9 @@ class Form
global $conf,$langs;
$ret='';
if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE))
// TODO change for compatibility
if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;/',$typeofdata))
{
if ($perm)
{
@@ -128,7 +129,8 @@ class Form
$ret='';
// When option to edit inline is activated
if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE))
// TODO change for compatibility
if (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && ! preg_match('/^select;/',$typeofdata))
{
$ret.=$this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $success);
}