Merge pull request #1068 from vishal-singh-webkul/gli-813

Added: Validation for the social name in the admin genders controller and changed the neutral gender to the other.
Qloapps · Jul 2, 2024 · 2ec5b51 · 2ec5b51
2 parents 01b84b7 + 347a3a2
commit 2ec5b51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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' => 'isCatalogName', 'required' => true, 'size' => 20),
         ),
     );
 

diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php
@@ -77,7 +77,7 @@ public function __construct()
                 '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 @@ public function renderForm()
                         array(
                             'id' => 'type_neutral',
                             'value' => 2,
-                            'label' => $this->l('Neutral')
+                            'label' => $this->l('Other')
                         )
                     )
                 ),