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

Clean database. Fix with firefox.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-03-05 12:15:47 +01:00
parent a3fcb5ac5a
commit e9b9491a35
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/install/mysql/migration/repair.sql
View File

@ -94,3 +94,10 @@ UPDATE llx_product p SET p.stock= (SELECT SUM(ps.reel) FROM llx_product_stock ps
-- DROP TABLE llx_product_fournisseur; -- DROP TABLE llx_product_fournisseur;
-- ALTER TABLE llx_product_fournisseur_price DROP COLUMN fk_product_fournisseur; -- ALTER TABLE llx_product_fournisseur_price DROP COLUMN fk_product_fournisseur;
ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur; ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur;
-- Fix: deprecated tag to new one
update llx_opensurvey_sondage set format = 'D' where format = 'D+';
update llx_opensurvey_sondage set format = 'A' where format = 'A+';

17
htdocs/opensurvey/results.php
View File

@ -157,7 +157,7 @@ if ($testmodifier)
} }
// Add column (not for date) // Add column (not for date)
if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && ($object->format == "A")) if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && $object->format == "A")
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
@ -181,8 +181,9 @@ if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && ($object->format
} }
// Add column (with format date) // Add column (with format date)
if (isset($_POST["ajoutercolonne"]) && ($object->format == "D")) if (isset($_POST["ajoutercolonne"]) && $object->format == "D")
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
@ -276,7 +277,7 @@ if (isset($_POST["ajoutercolonne"]) && ($object->format == "D"))
// Delete line // Delete line
for ($i = 0; $i < $nblignes; $i++) for ($i = 0; $i < $nblignes; $i++)
{ {
if (isset($_POST["effaceligne$i"])) if (GETPOST("effaceligne".$i) || GETPOST("effaceligne".$i."_x") || GETPOST("effaceligne".$i.".x")) // effacelignei for chrome, effacelignei_x for firefox
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
@ -311,7 +312,8 @@ for ($i = 0; $i < $nblignes; $i++)
// Delete column // Delete column
for ($i = 0; $i < $nbcolonnes; $i++) for ($i = 0; $i < $nbcolonnes; $i++)
{ {
if (isset($_POST["effacecolonne$i"]) && $nbcolonnes > 1) if ((GETPOST("effacecolonne".$i) || GETPOST("effacecolonne".$i."_x") || GETPOST("effacecolonne".$i.".x"))
&& $nbcolonnes > 1) // effacecolonnei for chrome, effacecolonnei_x for firefox
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
@ -462,19 +464,20 @@ dol_fiche_end();
print '</form>'."\n"; print '</form>'."\n";
print '<div class="tabsAction">'; print '<div class="tabsAction">';
print '<a class="butAction" href="exportcsv.php?id=' . $numsondage . '">'.$langs->trans("ExportSpreadsheet") .' (.CSV)' . '</a>'; print '<a class="butAction" href="exportcsv.php?id=' . $numsondage . '">'.$langs->trans("ExportSpreadsheet") .' (.CSV)' . '</a>';
print '</div>'; print '</div>';
// Add form to add a field
// Show form to add a new field/column
if (GETPOST('ajoutsujet')) if (GETPOST('ajoutsujet'))
{ {
// Security check // Security check
if (!$user->rights->opensurvey->write) accessforbidden(); if (!$user->rights->opensurvey->write) accessforbidden();
//on recupere les données et les sujets du sondage
print '<form name="formulaire" action="" method="POST">'."\n"; print '<form name="formulaire" action="" method="POST">'."\n";
print '<input type="hidden" name="backtourl" value="'.GETPOST('backtourl').'">'; print '<input type="hidden" name="backtourl" value="'.GETPOST('backtourl').'">';
@ -706,7 +709,7 @@ if ($object->format=="D")
} }
else else
{ {
//affichage des sujets du sondage // Show titles
print '<tr>'."\n"; print '<tr>'."\n";
print '<td></td>'."\n"; print '<td></td>'."\n";
print '<td></td>'."\n"; print '<td></td>'."\n";