From 0a1d1f3552229667ffe3a713c5784d043333a165 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 21 May 2024 15:40:31 +0530 Subject: [PATCH 1/4] Updated: Neutural gender to other in the admin genders --- controllers/admin/AdminGendersController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 57a9ef514..7331a9c4c 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -77,7 +77,7 @@ class AdminGendersControllerCore extends AdminController 'list' => array( 0 => $this->l('Male'), 1 => $this->l('Female'), - 2 => $this->l('Neutral') + 2 => $this->l('Other') ), 'filter_key' => 'a!type', 'callback' => 'displayGenderType', @@ -145,7 +145,7 @@ class AdminGendersControllerCore extends AdminController array( 'id' => 'type_neutral', 'value' => 2, - 'label' => $this->l('Neutral') + 'label' => $this->l('Other') ) ) ), From 0315a01104ba93e50c702af3e179e7aee74b279a Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 21 May 2024 16:32:24 +0530 Subject: [PATCH 2/4] Added: empty space validation for the social title in admin genders controller --- controllers/admin/AdminGendersController.php | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 7331a9c4c..74135754b 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -204,6 +204,31 @@ class AdminGendersControllerCore extends AdminController return $this->fields_list['type']['list'][$value]; } + public function postProcess() + { + if (Tools::isSubmit('submitAdd'.$this->table) || Tools::isSubmit('submitAdd'.$this->table.'AndStay')) { + $languages = Language::getLanguages(false); + $defaultLangId = Configuration::get('PS_LANG_DEFAULT'); + $objDefaultLanguage = Language::getLanguage((int) $defaultLangId); + + if ($defaultLangTitle = Tools::getValue('name_'.$defaultLangId)) { + if (!trim($defaultLangTitle)) { + $this->errors[] = $this->l('Social title is required at least in ').$objDefaultLanguage['name']; + } else { + foreach ($languages as $lang) { + if (trim(Tools::getValue('name_'.$lang['id_lang']))) { + if (!Validate::isGenericName(Tools::getValue('name_'.$lang['id_lang']))) { + $this->errors[] = $this->l('Invalid social title in ').$lang['name']; + } + } + } + } + } + } + + parent::postProcess(); + } + protected function postImage($id) { if (isset($this->fieldImageSettings['name']) && isset($this->fieldImageSettings['dir'])) { From afe671a9ebadbbe1c10bb04d64f099250149b889 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 2 Jul 2024 10:52:51 +0530 Subject: [PATCH 3/4] Removed non required code and added validation in the Gender class --- classes/Gender.php | 2 +- controllers/admin/AdminGendersController.php | 25 -------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/classes/Gender.php b/classes/Gender.php index f3da94ad1..b903bd14f 100644 --- a/classes/Gender.php +++ b/classes/Gender.php @@ -44,7 +44,7 @@ class GenderCore extends ObjectModel 'type' => array('type' => self::TYPE_INT, 'required' => true), /* Lang fields */ - 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isString', 'required' => true, 'size' => 20), + 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 20), ), ); diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 74135754b..7331a9c4c 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -204,31 +204,6 @@ class AdminGendersControllerCore extends AdminController return $this->fields_list['type']['list'][$value]; } - public function postProcess() - { - if (Tools::isSubmit('submitAdd'.$this->table) || Tools::isSubmit('submitAdd'.$this->table.'AndStay')) { - $languages = Language::getLanguages(false); - $defaultLangId = Configuration::get('PS_LANG_DEFAULT'); - $objDefaultLanguage = Language::getLanguage((int) $defaultLangId); - - if ($defaultLangTitle = Tools::getValue('name_'.$defaultLangId)) { - if (!trim($defaultLangTitle)) { - $this->errors[] = $this->l('Social title is required at least in ').$objDefaultLanguage['name']; - } else { - foreach ($languages as $lang) { - if (trim(Tools::getValue('name_'.$lang['id_lang']))) { - if (!Validate::isGenericName(Tools::getValue('name_'.$lang['id_lang']))) { - $this->errors[] = $this->l('Invalid social title in ').$lang['name']; - } - } - } - } - } - } - - parent::postProcess(); - } - protected function postImage($id) { if (isset($this->fieldImageSettings['name']) && isset($this->fieldImageSettings['dir'])) { From 347a3a28ccf8587d5f22b0bfecd97f7dfd1b9559 Mon Sep 17 00:00:00 2001 From: "vishalsingh.qlo325" Date: Tue, 2 Jul 2024 13:19:31 +0530 Subject: [PATCH 4/4] Update the validation for the gender name in the gender class --- classes/Gender.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Gender.php b/classes/Gender.php index b903bd14f..35034c55d 100644 --- a/classes/Gender.php +++ b/classes/Gender.php @@ -44,7 +44,7 @@ class GenderCore extends ObjectModel 'type' => array('type' => self::TYPE_INT, 'required' => true), /* Lang fields */ - 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 20), + 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 20), ), );