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

[*] BO #PSFV-94 : update of the displayform method by helperForm in AdminShopUrlController

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9307 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2011-10-13 09:06:32 +00:00
parent 039271f118
commit 278dc40a5e
5 changed files with 241 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/HelperForm.php
+17 -15
View File
@@ -58,28 +58,29 @@ class HelperFormCore extends Helper
public function displayForm()
{
$allowEmployeeFormLang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
if ($allowEmployeeFormLang && !$this->context->cookie->employee_form_lang)
$this->context->cookie->employee_form_lang = (int)(Configuration::get('PS_LANG_DEFAULT'));
$useLangFromCookie = false;
$cookie = $this->context->cookie;
$allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
if ($allow_employee_form_lang && !$cookie->employee_form_lang)
$cookie->employee_form_lang = (int)Configuration::get('PS_LANG_DEFAULT');
$use_lang_from_cookie = false;
$languages = Language::getLanguages(false);
if ($allowEmployeeFormLang)
if ($allow_employee_form_lang)
foreach ($languages as $lang)
if ($this->context->cookie->employee_form_lang == $lang['id_lang'])
$useLangFromCookie = true;
if (!$useLangFromCookie)
$defaultFormLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
if ($cookie->employee_form_lang == $lang['id_lang'])
$use_lang_from_cookie = true;
if (!$use_lang_from_cookie)
$default_form_language = (int)Configuration::get('PS_LANG_DEFAULT');
else
$defaultFormLanguage = (int)($this->context->cookie->employee_form_lang);
$default_form_language = (int)$cookie->employee_form_lang;
$this->context->smarty->assign(array(
'firstCall' => $this->first_call,
'current' => self::$currentIndex,
'token' => $this->token,
'table' => $this->table,
'defaultFormLanguage' => $defaultFormLanguage,
'defaultFormLanguage' => $default_form_language,
'languages' => $languages,
'allowEmployeeFormLang' => $allowEmployeeFormLang,
'allowEmployeeFormLang' => $allow_employee_form_lang,
'form_id' => $this->id,
'back' => Tools::getValue('back'),
'fields' => $this->fields_form,
@@ -95,9 +96,10 @@ class HelperFormCore extends Helper
public function getFieldsRequired()
{
foreach ($this->fields_form['input'] as $input)
if (array_key_exists('required', $input) && $input['required'])
return true;
if (isset($this->fields_form['input']))
foreach ($this->fields_form['input'] as $input)
if (array_key_exists('required', $input) && $input['required'])
return true;
return false;
}