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

New method to CommonObject to display extrafields data output

Browse Source 
Try for product
This commit is contained in:
jfefe 2013-03-30 17:43:21 +01:00
parent bd4e62a5e7
commit 3fe1b26136
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2189,6 +2189,44 @@ abstract class CommonObject
}
else return 0;
}
/**
* Function to show lines of extrafields with output datas
*
* @param object $extrafields extrafield Object
*
* return string
*/
function showOptionals($extrafields)
{
global $_POST;
$out = '';
if (! empty($this->array_options))
{
foreach($extrafields->attribute_label as $key=>$label)
{
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$this->array_options["options_".$key]);
if ($extrafields->attribute_type[$key] == 'separate')
{
$out = $extrafields->showSeparator($key);
}
else
{
// Convert date into timestamp format
if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
{
$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$this->array_options['options_'.$key];
}
$out .= '<tr><td>'.$label.'</td><td colspan="3">';
$out .= $extrafields->showOutputField($key,$value);
$out .= '</td></tr>'."\n";
}
}
}
return $out;
}
/**

21
htdocs/product/fiche.php
View File

@ -1247,26 +1247,7 @@ else
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook) && ! empty($extrafields->attribute_label))
{
foreach($extrafields->attribute_label as $key=>$label)
{
$value=(isset($_POST["options_".$key])?$_POST["options_".$key]:$object->array_options["options_".$key]);
if ($extrafields->attribute_type[$key] == 'separate')
{
print $extrafields->showSeparator($key);
}
else
{
// Convert date into timestamp format
if (in_array($extrafields->attribute_type[$key],array('date','datetime')))
{
$value = isset($_POST["options_".$key])?dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]):$object->array_options['options_'.$key];
}
print '<tr><td>'.$label.'</td><td colspan="3">';
print $extrafields->showOutputField($key,$value);
print '</td></tr>'."\n";
}
}
print $object->showOptionals($extrafields);
}
// Note