Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added: Validation for the social name in the admin genders controller and changed the neutral gender to the other. #1068

Merged
merged 7 commits into from
Jul 2, 2024
Merged

Added: Validation for the social name in the admin genders controller and changed the neutral gender to the other. #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0a1d1f3
Updated: Neutural gender to other in the admin genders
vishal-singh-webkul May 21, 2024
0315a01
Added: empty space validation for the social title in admin genders c…
vishal-singh-webkul May 21, 2024
62944ad
Merge branch 'develop' into gli-813
vishal-singh-webkul May 27, 2024
d379a20
Merge branch 'develop' into gli-813
vishal-singh-webkul Jun 11, 2024
ec977a4
Merge branch 'develop' into gli-813
vishal-singh-webkul Jun 28, 2024
afe671a
Removed non required code and added validation in the Gender class
vishal-singh-webkul Jul 2, 2024
347a3a2
Update the validation for the gender name in the gender class
vishal-singh-webkul Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/Gender.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
),
);

Expand Down
4 changes: 2 additions & 2 deletions controllers/admin/AdminGendersController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -145,7 +145,7 @@ public function renderForm()
array(
'id' => 'type_neutral',
'value' => 2,
'label' => $this->l('Neutral')
'label' => $this->l('Other')
)
)
),
Expand Down