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

Fix: Evite mauvais ordre si page de choix ordre export soumise 2 fois.

Browse Source
This commit is contained in:
Laurent Destailleur 2006-01-22 17:41:25 +00:00
parent 826a7905ab
commit 040de4ccc0
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/exports/export.class.php
View File

@ -118,11 +118,15 @@ class Export
$this->array_export_alias[$i]=$module->export_alias_array[$r]; $this->array_export_alias[$i]=$module->export_alias_array[$r];
// Charge fichier lang en rapport // Charge fichier lang en rapport
foreach($module->getLangFilesArray() as $key) $langtoload=$module->getLangFilesArray();
if (is_array($langtoload))
{ {
$langs->load($key); foreach($langtoload as $key)
{
$langs->load($key);
}
} }
dolibarr_syslog("Export chargé pour le module ".$modulename." en index ".$i.", dataset=".$module->export_code[$r].", nbre de champs=".sizeof($module->export_fields_code[$r])); dolibarr_syslog("Export chargé pour le module ".$modulename." en index ".$i.", dataset=".$module->export_code[$r].", nbre de champs=".sizeof($module->export_fields_code[$r]));
$i++; $i++;
} }

9
htdocs/exports/export.php
View File

@ -91,9 +91,12 @@ if ($action=='downfield' || $action=='upfield')
} }
} }
//print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)"); //print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)");
$array_selected[$_GET["field"]]=$newpos; if ($newcode) // Si newcode trouvé (prtoection contre resoumission de page
$array_selected[$newcode]=$pos; {
$_SESSION["export_selected_fields"]=$array_selected; $array_selected[$_GET["field"]]=$newpos;
$array_selected[$newcode]=$pos;
$_SESSION["export_selected_fields"]=$array_selected;
}
} }
if ($step == 1 || $action == 'cleanselect') if ($step == 1 || $action == 'cleanselect')