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

Fix javascript error and input field for password extrafield in list

Browse Source
This commit is contained in:
Laurent Destailleur 2017-09-30 18:52:33 +02:00
parent 9ba8b9bf7e
commit 976cbd5f83
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/extrafields.class.php
View File

@ -1323,7 +1323,8 @@ class ExtraFields
} }
elseif ($type == 'password') elseif ($type == 'password')
{ {
$out='<input type="password" class="flat '.$showsize.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>'; // If prefix is 'search_', field is used as a filter, we use a common text field.
$out='<input type="'.($keysuffix=='search_'?'text':'password').'" class="flat '.$showsize.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>';
} }
if (!empty($hidden)) { if (!empty($hidden)) {
$out='<input type="hidden" value="'.$value.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" id="'.$keysuffix.'options_'.$key.$keyprefix.'"/>'; $out='<input type="hidden" value="'.$value.'" name="'.$keysuffix.'options_'.$key.$keyprefix.'" id="'.$keysuffix.'options_'.$key.$keyprefix.'"/>';

10
htdocs/core/js/lib_head.js.php
View File

@ -506,26 +506,26 @@ function getDateFromFormat(val,format)
if (substr == "MM" ||substr == "M") if (substr == "MM" ||substr == "M")
{ {
month=getIntegerInString(val,d,1,2); month=getIntegerInString(val,d,1,2);
d -= 2- month.length; if (month) d -= 2- month.length;
} }
if (substr == "dd") if (substr == "dd")
{ {
day=getIntegerInString(val,d,1,2); day=getIntegerInString(val,d,1,2);
d -= 2- day.length; if (day) d -= 2- day.length;
} }
if (substr == "HH" ||substr == "hh" ) if (substr == "HH" ||substr == "hh" )
{ {
hour=getIntegerInString(val,d,1,2); hour=getIntegerInString(val,d,1,2);
d -= 2- hour.length; if (dhouray) d -= 2- hour.length;
} }
if (substr == "mm"){ if (substr == "mm"){
minute=getIntegerInString(val,d,1,2); minute=getIntegerInString(val,d,1,2);
d -= 2- minute.length; if (minute) d -= 2- minute.length;
} }
if (substr == "ss") if (substr == "ss")
{ {
seconde=getIntegerInString(val,d,1,2); seconde=getIntegerInString(val,d,1,2);
d -= 2- seconde.length; if (seconde) d -= 2- seconde.length;
} }
i+=substr.length; i+=substr.length;