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

Fix: Missing condition

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-05 21:06:48 +02:00
parent 9e6a9f1b12
commit 4d59ecb049
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
htdocs/core/class/html.formother.class.php
View File

@ -261,7 +261,7 @@ class FormOther
// Print a select with each of them // Print a select with each of them
$moreforfilter ='<select class="flat" name="'.$htmlname.'">'; $moreforfilter ='<select class="flat" name="'.$htmlname.'">';
$moreforfilter.='<option value="">&nbsp;</option>'; // Should use -1 to say nothing $moreforfilter.='<option value="">&nbsp;</option>'; // Should use -1 to say nothing
if (is_array($tab_categs)) if (is_array($tab_categs))
{ {
foreach ($tab_categs as $categ) foreach ($tab_categs as $categ)
@ -271,7 +271,7 @@ class FormOther
$moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>'; $moreforfilter.='>'.dol_trunc($categ['fulllabel'],50,'middle').'</option>';
} }
} }
if ($nocateg) if ($nocateg)
{ {
$langs->load("categories"); $langs->load("categories");
$moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected="selected"':'').'>- '.$langs->trans("NotCategorized").' -</option>'; $moreforfilter.='<option value="-2"'.($selected == -2 ? ' selected="selected"':'').'>- '.$langs->trans("NotCategorized").' -</option>';
@ -829,26 +829,29 @@ class FormOther
$selectboxlist=$form->selectarray('boxcombo', $arrayboxtoactivatelabel,'',1); $selectboxlist=$form->selectarray('boxcombo', $arrayboxtoactivatelabel,'',1);
} }
print '<script type="text/javascript" language="javascript"> if (! empty($conf->use_javascript_ajax))
jQuery(document).ready(function() { {
jQuery("#boxcombo").change(function() { print '<script type="text/javascript" language="javascript">
var boxid=jQuery("#boxcombo").val(); jQuery(document).ready(function() {
if (boxid > 0) { jQuery("#boxcombo").change(function() {
var left_list = cleanSerialize(jQuery("#left").sortable("serialize")); var boxid=jQuery("#boxcombo").val();
var right_list = cleanSerialize(jQuery("#right").sortable("serialize")); if (boxid > 0) {
var boxorder = \'A:\' + left_list + \'-B:\' + right_list; var left_list = cleanSerialize(jQuery("#left").sortable("serialize"));
jQuery.ajax({ url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\', var right_list = cleanSerialize(jQuery("#right").sortable("serialize"));
async: false var boxorder = \'A:\' + left_list + \'-B:\' + right_list;
}); jQuery.ajax({ url: \''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\',
//jQuery.get(\''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\'); async: false
window.location.search=\'mainmenu='.GETPOST("mainmenu").'&leftmenu='.GETPOST('leftmenu').'&action=addbox&boxid=\'+boxid; });
//window.location.href=\''.$_SERVER["PHP_SELF"].'\'; //jQuery.get(\''.DOL_URL_ROOT.'/core/ajax/box.php?boxorder=\'+boxorder+\'&boxid=\'+boxid+\'&zone='.$areacode.'&userid='.$user->id.'\');
} window.location.search=\'mainmenu='.GETPOST("mainmenu").'&leftmenu='.GETPOST('leftmenu').'&action=addbox&boxid=\'+boxid;
});'; //window.location.href=\''.$_SERVER["PHP_SELF"].'\';
if (! count($arrayboxtoactivatelabel)) print 'jQuery("#boxcombo").hide();'; }
print ' });';
}); if (! count($arrayboxtoactivatelabel)) print 'jQuery("#boxcombo").hide();';
</script>'; print '
});
</script>';
}
print load_fiche_titre((count($boxactivated)?$langs->trans("OtherInformationsBoxes"):''),$selectboxlist,'','','otherboxes'); print load_fiche_titre((count($boxactivated)?$langs->trans("OtherInformationsBoxes"):''),$selectboxlist,'','','otherboxes');