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

[*] BO #PSFV-94 : Added AdminAccessController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9896 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-11-04 15:52:31 +00:00
parent 851763fc2a
commit eb6620fabe
8 changed files with 614 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AdminController.php
+14 -7
View File
@@ -74,6 +74,8 @@ class AdminControllerCore extends Controller
public $tpl_form_vars = array();
public $tpl_list_vars = array();
public $fields_value = false;
/** @var array Errors displayed after post processing */
public $_errors = array();
@@ -1364,6 +1366,8 @@ class AdminControllerCore extends Controller
$this->content .= $this->context->smarty->fetch($this->context->smarty->template_dir[0].'form_submit_ajax.tpl');
if ($this->fields_form && is_array($this->fields_form))
{
if (empty($this->toolbar_title))
$this->initToolbarTitle();
$this->getlanguages();
$helper = new HelperForm($this);
$helper->override_folder = $this->tpl_folder;
@@ -1377,6 +1381,8 @@ class AdminControllerCore extends Controller
$helper->allow_employee_form_lang = $this->allow_employee_form_lang;
$helper->fields_value = $this->getFieldsValue($this->object);
$helper->toolbar_btn = $this->toolbar_btn;
$helper->title = $this->toolbar_title;
$helper->show_toolbar = $this->show_toolbar;
$helper->no_back = isset($this->no_back) ? $this->no_back : false;
$helper->tpl_vars = $this->tpl_form_vars;
if ($this->tabAccess['view'])
@@ -1852,13 +1858,14 @@ class AdminControllerCore extends Controller
public function getFieldsValue($obj)
{
foreach ($this->fields_form['input'] as $input)
if (empty($this->fields_value[$input['name']]))
if (isset($input['lang']) && $input['lang'])
foreach ($this->_languages as $language)
$this->fields_value[$input['name']][$language['id_lang']] = $this->getFieldValue($obj, $input['name'], $language['id_lang']);
else
$this->fields_value[$input['name']] = $this->getFieldValue($obj, $input['name']);
if (isset($this->fields_form['input']))
foreach ($this->fields_form['input'] as $input)
if (empty($this->fields_value[$input['name']]))
if (isset($input['lang']) && $input['lang'])
foreach ($this->_languages as $language)
$this->fields_value[$input['name']][$language['id_lang']] = $this->getFieldValue($obj, $input['name'], $language['id_lang']);
else
$this->fields_value[$input['name']] = $this->getFieldValue($obj, $input['name']);
return $this->fields_value;
}
classes/HelperForm.php
+4
View File
@@ -40,6 +40,9 @@ class HelperFormCore extends Helper
public $fields_value = array();
public $table;
/** @var if not null, a title will be added on that list */
public $title = null;
/**
* Used to override default 'submitAdd' parameter in form action attribute
* @var string
@@ -83,6 +86,7 @@ class HelperFormCore extends Helper
'title' => $this->title,
'firstCall' => $this->first_call,
'current' => $this->currentIndex,
'title' => $this->title,
'token' => $this->token,
'table' => $this->table,
'languages' => $this->languages,