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

Fix: possibility to add options

Browse Source
This commit is contained in:
Regis Houssin 2012-03-22 19:46:29 +08:00
parent 19940e5f58
commit ed46d0d65f
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3409,22 +3409,20 @@ class Form
} }
$out.='>'; $out.='>';
$newval=($translate?$langs->trans(ucfirst($value)):$value);
if ($key_in_label) if ($key_in_label)
{ {
$newval=($translate?$langs->trans($value):$value);
$selectOptionValue = dol_htmlentitiesbr($key.' - '.($maxlen?dol_trunc($newval,$maxlen):$newval)); $selectOptionValue = dol_htmlentitiesbr($key.' - '.($maxlen?dol_trunc($newval,$maxlen):$newval));
$out.=$selectOptionValue;
} }
else else
{ {
$newval=($translate?$langs->trans($value):$value);
$selectOptionValue = dol_htmlentitiesbr($maxlen?dol_trunc($newval,$maxlen):$newval); $selectOptionValue = dol_htmlentitiesbr($maxlen?dol_trunc($newval,$maxlen):$newval);
if ($value == '' || $value == '-') { if ($value == '' || $value == '-') {
$selectOptionValue=' '; $selectOptionValue=' ';
} }
$out.=$selectOptionValue;
} }
$out.=$selectOptionValue;
$out.="</option>\n"; $out.="</option>\n";
} }
} }

11
htdocs/core/class/html.formfile.class.php
View File

@ -60,7 +60,7 @@ class FormFile
* @param Object $object Object to use (when attachment is done on an element) * @param Object $object Object to use (when attachment is done on an element)
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='') function form_attach_new_file($url, $title='', $addcancel=0, $sectionid=0, $perm=1, $size=50, $object='', $options='')
{ {
global $conf,$langs; global $conf,$langs;
@ -82,7 +82,14 @@ class FormFile
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table width="100%" class="nobordernopadding">'; print '<table width="100%" class="nobordernopadding">';
print '<tr><td width="50%" valign="top">'; print '<tr>';
if (! empty($options))
{
print '<td>'.$options.'</td>';
}
print '<td width="50%" valign="top" nowrap="nowrap">';
$max=$conf->global->MAIN_UPLOAD_DOC; // En Kb $max=$conf->global->MAIN_UPLOAD_DOC; // En Kb
$maxphp=@ini_get('upload_max_filesize'); // En inconnu $maxphp=@ini_get('upload_max_filesize'); // En inconnu