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

Fix: dbugage des empty box

Browse Source
This commit is contained in:
Regis Houssin 2007-12-05 01:46:56 +00:00
parent 0fe4408ce5
commit 65888c67a7
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/boxes.php
View File

@ -190,10 +190,12 @@ class InfoBox
$listarray=split(',',$list);
foreach ($listarray as $id)
{
//dolibarr_syslog("aaaaa".sizeof($listarray));
$i++;
$ii=sprintf('%02d',$i);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";
if (is_numeric($id))
{
//dolibarr_syslog("aaaaa".sizeof($listarray));
$i++;
$ii=sprintf('%02d',$i);
$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes";
$sql.= "(box_id, position, box_order, fk_user)";
$sql.= " values (";
$sql.= " ".$id.",";
@ -201,14 +203,15 @@ class InfoBox
$sql.= " '".$colonne.$ii."',";
$sql.= " ".$userid;
$sql.= ")";
dolibarr_syslog("InfoBox::saveboxorder sql=".$sql);
dolibarr_syslog("InfoBox::saveboxorder sql=".$sql);
$result = $this->db->query($sql);
if ($result < 0)
{
$error++;
break;
}
if ($result < 0)
{
$error++;
break;
}
}
}
}
if ($error)
@ -229,6 +232,6 @@ class InfoBox
$this->db->rollback();
return -1;
}
}
}
}
?>

22
htdocs/index.php
View File

@ -560,8 +560,8 @@ if (sizeof($boxarray))
{
$ii++;
//print 'box_id '.$boxarray[$ii]->box_id.' ';
//print 'box_order '.$boxarray[$ii]->box_order.'<br>';
$boxid_left[$key] = $boxarray[$key]->box_id;
//print 'box_order '.$boxarray[$ii]->box_order.'<br>';
$boxid_left[$key] = $boxarray[$key]->box_id;
// Affichage boite key
$box->loadBox();
$box->showBox();
@ -569,7 +569,7 @@ if (sizeof($boxarray))
}
// If no box on left, we show add an invisible empty box
if (! $ii)
if ($ii==0)
{
$box->box_id='A';
$box->info_box_head=array();
@ -586,22 +586,24 @@ if (sizeof($boxarray))
// print '<div id="right" style="position: absolute; display: block; width: 50%; padding: 0px; margin: 0px; float: right;">'."\n";
print '<div id="right" style="width: 50%; padding: 0px; margin: 0px; float: right;">'."\n";
$ii=0;
$boxarray=$infobox->listboxes("0",$user); // on régénère la liste pour éviter les erreurs avec les empty box
foreach ($boxarray as $key => $box)
{
if (eregi('^B',$box->box_order)) // colonne B
{
$ii++;
//print 'box_id '.$boxarray[$ii]->box_id.' ';
//print 'box_order '.$boxarray[$ii]->box_order.'<br>';
$boxid_right[$key] = $boxarray[$key]->box_id;
//print 'key:'.$key.'<br>';
//print 'box_id '.$boxarray[$key]->box_id.' ';
//print 'box_order '.$boxarray[$key]->box_order.'<br>';
$boxid_right[$key] = $boxarray[$key]->box_id;
// Affichage boite key
$box->loadBox();
$box->showBox();
}
}
// If no box on left, we show add an invisible empty box
if (! $ii)
// If no box on right, we show add an invisible empty box
if ($ii==0)
{
$box->box_id='B';
$box->info_box_head=array();
@ -609,9 +611,9 @@ if (sizeof($boxarray))
$box->showBox();
}
print "</div>\n";
print "</div>\n";
print "<!-- End box container -->\n";
print "\n";
print "\n";
print "</td></tr>";
print "</table>";