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

Fix: Fix a lot of broken features when renaming produit to product

Browse Source
This commit is contained in:
Laurent Destailleur 2010-06-02 08:57:27 +00:00
parent 982be7db04
commit 4363bb493d
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/conf.class.php
View File

@ -248,7 +248,9 @@ class Conf
$this->fournisseur->commande->dir_temp =$rootfordata."/fournisseur/commande/temp"; $this->fournisseur->commande->dir_temp =$rootfordata."/fournisseur/commande/temp";
$this->fournisseur->facture->dir_output =$rootfordata."/fournisseur/facture"; $this->fournisseur->facture->dir_output =$rootfordata."/fournisseur/facture";
$this->fournisseur->facture->dir_temp =$rootfordata."/fournisseur/facture/temp"; $this->fournisseur->facture->dir_temp =$rootfordata."/fournisseur/facture/temp";
// Module service // Module product/service
$this->product->dir_output=$rootfordata."/produit";
$this->product->dir_temp =$rootfordata."/produit/temp";
$this->service->dir_output=$rootfordata."/produit"; $this->service->dir_output=$rootfordata."/produit";
$this->service->dir_temp =$rootfordata."/produit/temp"; $this->service->dir_temp =$rootfordata."/produit/temp";
// Module contrat // Module contrat

14
htdocs/core/photos_resize.php
View File

@ -46,6 +46,7 @@ if ($_POST["action"] == 'confirm_resize' && (isset($_POST["file"]) != "") && (is
{ {
$product=new Product($db); $product=new Product($db);
$result=$product->fetch($_POST["id"]); $result=$product->fetch($_POST["id"]);
if ($result <= 0) dol_print_error($db,'Failed to load object');
$dir=$conf->product->dir_output; // By default $dir=$conf->product->dir_output; // By default
if ($product->type == 0) $dir=$conf->product->dir_output; if ($product->type == 0) $dir=$conf->product->dir_output;
if ($product->type == 1) $dir=$conf->service->dir_output; if ($product->type == 1) $dir=$conf->service->dir_output;
@ -55,7 +56,7 @@ if ($_POST["action"] == 'confirm_resize' && (isset($_POST["file"]) != "") && (is
if ($result == $fullpath) if ($result == $fullpath)
{ {
header("Location: ".DOL_URL_ROOT."/product/photos.php?id=".$_POST["product"].'&action=addthumb&file='.urldecode($_POST["file"])); header("Location: ".DOL_URL_ROOT."/product/photos.php?id=".$_POST["id"].'&action=addthumb&file='.urldecode($_POST["file"]));
exit; exit;
} }
else else
@ -71,6 +72,7 @@ if ($_POST["action"] == 'confirm_crop')
{ {
$product=new Product($db); $product=new Product($db);
$result=$product->fetch($_POST["id"]); $result=$product->fetch($_POST["id"]);
if ($result <= 0) dol_print_error($db,'Failed to load object');
$dir=$conf->product->dir_output; // By default $dir=$conf->product->dir_output; // By default
if ($product->type == 0) $dir=$conf->product->dir_output; if ($product->type == 0) $dir=$conf->product->dir_output;
if ($product->type == 1) $dir=$conf->service->dir_output; if ($product->type == 1) $dir=$conf->service->dir_output;
@ -80,7 +82,7 @@ if ($_POST["action"] == 'confirm_crop')
if ($result == $fullpath) if ($result == $fullpath)
{ {
header("Location: ".DOL_URL_ROOT."/product/photos.php?id=".$_POST["product"].'&action=addthumb&file='.urldecode($_POST["file"])); header("Location: ".DOL_URL_ROOT."/product/photos.php?id=".$_POST["id"].'&action=addthumb&file='.urldecode($_POST["file"]));
exit; exit;
} }
else else
@ -123,8 +125,8 @@ print $langs->trans("NewLength").': <input class="flat" name="sizex" size="10" t
print $langs->trans("NewHeight").': <input class="flat" name="sizey" size="10" type="text" > px &nbsp; <br>'; print $langs->trans("NewHeight").': <input class="flat" name="sizey" size="10" type="text" > px &nbsp; <br>';
print '<input type="hidden" name="file" value="'.$_GET['file'].'" />'; print '<input type="hidden" name="file" value="'.$_GET['file'].'" />';
print '<input type="hidden" name="action" value="confirm_resize" />'; print '<input type="hidden" name="action" value="confirm_resize" />';
print '<input type="hidden" name="product" value="'.$_GET['id'].'" />'; print '<input type="hidden" name="product" value="'.$_REQUEST['id'].'" />';
print '<input type="hidden" name="id" value="'.$_GET['id'].'" />'; print '<input type="hidden" name="id" value="'.$_REQUEST['id'].'" />';
print '<br><input class="button" name="sendit" value="'.dol_escape_htmltag($langs->trans("Resize")).'" type="submit" />'; print '<br><input class="button" name="sendit" value="'.dol_escape_htmltag($langs->trans("Resize")).'" type="submit" />';
print '</fieldset>'; print '</fieldset>';
print '<br></form>'; print '<br></form>';
@ -157,8 +159,8 @@ print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$_GET['id'].'" method="post"
<input type="hidden" id="file" name="file" value="'.urlencode($original_file).'" /> <input type="hidden" id="file" name="file" value="'.urlencode($original_file).'" />
<input type="hidden" id="action" name="action" value="confirm_crop" /> <input type="hidden" id="action" name="action" value="confirm_crop" />
<input type="hidden" id="product" name="product" value="'.$_GET['id'].'" /> <input type="hidden" id="product" name="product" value="'.$_REQUEST['id'].'" />
<input type="hidden" name="id" value="'.$_GET['id'].'" /> <input type="hidden" name="id" value="'.$_REQUEST['id'].'" />
<br><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Recenter")).'" /> <br><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Recenter")).'" />
</form>'; </form>';
print '</fieldset>'; print '</fieldset>';

1
htdocs/product/photos.php
View File

@ -46,6 +46,7 @@ $result=restrictedArea($user,'produit|service',$id,'product','','',$fieldid);
$mesg = ''; $mesg = '';
$dir = (!empty($conf->product->dir_output)?$conf->product->dir_output:$conf->service->dir_output); $dir = (!empty($conf->product->dir_output)?$conf->product->dir_output:$conf->service->dir_output);
/* /*
* Actions * Actions
*/ */