Merge branch 'ent-10646-15203-edicion-de-threshold-de-acciones' into 'develop'
Ent 10646 15203 edicion de threshold de acciones See merge request artica/pandorafms!5648
This commit is contained in:
commit
aa6c591a5e
|
@ -2130,10 +2130,8 @@ function html_print_extended_select_for_time(
|
||||||
$fields[$selected] = human_time_description_raw($selected, true);
|
$fields[$selected] = human_time_description_raw($selected, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($nothing) === true
|
hd(is_int($selected));
|
||||||
&& (empty($selected) === true
|
if (empty($nothing) === true && (is_int($selected) === true)) {
|
||||||
|| $selected === '0')
|
|
||||||
) {
|
|
||||||
$selected = 300;
|
$selected = 300;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2248,6 +2246,13 @@ function html_print_extended_select_for_time(
|
||||||
$('#".$uniq_name."_manual').show();
|
$('#".$uniq_name."_manual').show();
|
||||||
$('#".$uniq_name."_default').hide();
|
$('#".$uniq_name."_default').hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($('#text-".$uniq_name."_text').val() === '0') {
|
||||||
|
setTimeout(() => {
|
||||||
|
$('#".$uniq_name."_manual').hide();
|
||||||
|
$('#".$uniq_name."_default').show();
|
||||||
|
}, 100);
|
||||||
|
}
|
||||||
</script>";
|
</script>";
|
||||||
$returnString = ob_get_clean();
|
$returnString = ob_get_clean();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue