Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-13 19:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix modulebuilder

Browse Source
This commit is contained in:
Laurent Destailleur
2017-12-09 20:17:47 +01:00
parent f22e7ee24a
commit cc813df2a5
5 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
htdocs/core/class/commonobject.class.php
View File

@@ -4761,12 +4761,17 @@ abstract class CommonObject
$objectid = $this->id;
$label=$val['label'];
$type =$val['type'];
$size =$val['css'];
$label= $val['label'];
$type = $val['type'];
$size = $val['css'];
// Convert var to be able to share same code than showInputField of extrafields
if (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
if (preg_match('/varchar\((\d+)\)/', $type, $reg))
{
$type = 'varchar'; // convert varchar(xx) int varchar
$size = $reg[1];
}
elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
if (is_array($val['arrayofkeyval'])) $type='select';
if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
@@ -4835,6 +4840,7 @@ abstract class CommonObject
}
}
}
//var_dump($showsize.' '.$size);
if (in_array($type,array('date','datetime')))
{
@@ -4864,6 +4870,12 @@ abstract class CommonObject
$out='<input type="text" class="flat '.$showsize.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
}
elseif ($type == 'text')
{
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,0,ROWS_5,'90%');
$out=$doleditor->Create(1);
}
elseif ($type == 'html')
{
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
@@ -5287,12 +5299,17 @@ abstract class CommonObject
}
$objectid = $this->id;
$label=$val['label'];
$type =$val['type'];
$size =$val['css'];
$label = $val['label'];
$type = $val['type'];
$size = $val['css'];
// Convert var to be able to share same code than showOutputField of extrafields
if (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
if (preg_match('/varchar\((\d+)\)/', $type, $reg))
{
$type = 'varchar'; // convert varchar(xx) int varchar
$size = $reg[1];
}
elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
if (is_array($val['arrayofkeyval'])) $type='select';
if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link';
@@ -5327,20 +5344,42 @@ abstract class CommonObject
{
if ($type == 'date')
{
$showsize=10;
//$showsize=10;
$showsize = 'minwidth100imp';
}
elseif ($type == 'datetime')
{
$showsize=19;
//$showsize=19;
$showsize = 'minwidth200imp';
}
elseif ($type == 'int' || $type == 'integer')
elseif (in_array($type,array('int','double','price')))
{
$showsize=10;
//$showsize=10;
$showsize = 'maxwidth75';
}
elseif ($type == 'url')
{
$showsize='minwidth400';
}
elseif ($type == 'boolean')
{
$showsize='';
}
else
{
$showsize=round($size);
if ($showsize > 48) $showsize=48;
if (round($size) < 12)
{
$showsize = 'minwidth100';
}
else if (round($size) <= 48)
{
$showsize = 'minwidth200';
}
else
{
//$showsize=48;
$showsize = 'minwidth400';
}
}
}
@@ -5581,7 +5620,7 @@ abstract class CommonObject
}
}
}
elseif ($type == 'text')
elseif ($type == 'text' || $type == 'html')
{
$value=dol_htmlentitiesbr($value);
}