dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Bo : Fixed #PSTEST-1055 & #PSFV-768 : update call identifier

Browse Source
This commit is contained in:
lLefevre
2012-04-06 14:07:08 +00:00
parent 6012536630
commit bc310b252d
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl
View File

@@ -193,7 +193,7 @@
<form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
{if $form_id}
<input type="hidden" name="id_{$table}" id="id_{$table}" value="{$form_id}" />
<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
{/if}
{assign var=tabsize value=count($tabs)}

4
admin-dev/themes/default/template/helpers/form/form.tpl
View File

@@ -44,7 +44,7 @@
{block name="defaultForm"}
<form id="{$table}_form" class="defaultForm {$name_controller}" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
{if $form_id}
<input type="hidden" name="id_{$table}" id="id_{$table}" value="{$form_id}" />
<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
{/if}
{foreach $fields as $f => $fieldset}
<fieldset id="fieldset_{$f}">
@@ -247,7 +247,7 @@
<div id="image">
{$fields_value.image}
<p align="center">{l s='File size'} {$fields_value.size}kb</p>
<a href="{$current}&id_{$table}={$form_id}&token={$token}&deleteImage=1">
<a href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
</a>
</div><br />

4
classes/controller/AdminController.php
View File

@@ -1714,7 +1714,7 @@ class AdminControllerCore extends Controller
if (Tools::isSubmit('submitFilter'.$this->table) || $this->context->cookie->{'submitFilter'.$this->table} !== false)
$this->filter = true;
$this->id_object = (int)Tools::getValue('id_'.$this->table);
$this->id_object = (int)Tools::getValue($this->identifier);
/* Delete object image */
if (isset($_GET['deleteImage']))
@@ -1793,7 +1793,7 @@ class AdminControllerCore extends Controller
else
$this->errors[] = Tools::displayError('You do not have permission to add here.');
}
elseif (isset($_GET['update'.$this->table]) && isset($_GET['id_'.$this->table]))
elseif (isset($_GET['update'.$this->table]) && isset($_GET[$this->identifier]))
{
$this->display = 'edit';
if ($this->tabAccess['edit'] !== '1')

1
classes/helper/HelperForm.php
View File

@@ -153,6 +153,7 @@ class HelperFormCore extends Helper
'current' => $this->currentIndex,
'token' => $this->token,
'table' => $this->table,
'identifier' => $this->identifier,
'name_controller' => $this->name_controller,
'languages' => $this->languages,
'defaultFormLanguage' => $this->default_form_language,