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

Fix: possibility to defined another value instead 50%

Browse Source
This commit is contained in:
Regis Houssin 2012-08-20 10:38:48 +02:00
parent c6d008fb1b
commit 5dc10cfcae
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/comm/action/fiche.php
View File

@ -478,14 +478,14 @@ if ($action == 'create')
print '<tr><td width="10%">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>'; print '<tr><td width="10%">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
print '<td>'; print '<td>';
$percent=-1; $percent=-1;
if (isset($_GET['percentage']) || isset($_POST['percentage'])) if (GETPOST('percentage'))
{ {
$percent=GETPOST('percentage'); $percent=GETPOST('percentage');
} }
else else
{ {
if (GETPOST("afaire") == 1) $percent=0; if (GETPOST("afaire") == 1) $percent=0;
if (GETPOST("afaire") == 2) $percent=100; else if (GETPOST("afaire") == 2) $percent=100;
} }
print $htmlactions->form_select_status_action('formaction',$percent,1,'complete'); print $htmlactions->form_select_status_action('formaction',$percent,1,'complete');
print '</td></tr>'; print '</td></tr>';

17
htdocs/core/class/html.formactions.class.php
View File

@ -84,18 +84,22 @@ class FormActions
}); });
function select_status() { function select_status() {
var selected = $('#select' + htmlname).val(); var defaultvalue = $('#select' + htmlname).val();
var percentage = $('input[name=percentage]'); var percentage = $('input[name=percentage]');
percentage.val((selected>=0?selected:'')); var selected = '".(isset($selected)?$selected:'')."';
if (selected == -1) { var value = (selected>0?selected:(defaultvalue>=0?defaultvalue:''));
percentage.val(value);
if (defaultvalue == -1) {
percentage.attr('disabled', 'disabled'); percentage.attr('disabled', 'disabled');
$('.hideifna').hide(); $('.hideifna').hide();
} }
else if (selected == 0) { else if (defaultvalue == 0) {
percentage.attr('disabled', 'disabled'); percentage.attr('disabled', 'disabled');
$('.hideifna').show(); $('.hideifna').show();
} }
else if (selected == 100) { else if (defaultvalue == 100) {
percentage.attr('disabled', 'disabled'); percentage.attr('disabled', 'disabled');
$('.hideifna').show(); $('.hideifna').show();
} }
@ -108,13 +112,12 @@ class FormActions
print '<select '.($canedit?'':'disabled="disabled" ').'name="status" id="select'.$htmlname.'" class="flat">'; print '<select '.($canedit?'':'disabled="disabled" ').'name="status" id="select'.$htmlname.'" class="flat">';
foreach($listofstatus as $key => $val) foreach($listofstatus as $key => $val)
{ {
print '<option value="'.$key.'"'.($selected == $key?' selected="selected"':'').'>'.$val.'</option>'; print '<option value="'.$key.'"'.(($selected == $key) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected="selected"' : '').'>'.$val.'</option>';
} }
print '</select>'; print '</select>';
if ($selected == 0 || $selected == 100) $canedit=0; if ($selected == 0 || $selected == 100) $canedit=0;
print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled="disabled"').'>'; print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled="disabled"').'>';
print '<span class="hideifna">%</span>'; print '<span class="hideifna">%</span>';
//print ' <input type="hidden" name="percentage" value="'.$selected.'">';
} }
else else
{ {