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

feature: nickname field added #7185

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feature: nickname field added #7185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a341821
feature: nickname field added
Oct 14, 2024
262da7d
Merge branch 'master' into issue-6651
etopipec Oct 14, 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
10 changes: 10 additions & 0 deletions src/PersonEditor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
$sFirstName = '';
$sMiddleName = '';
$sLastName = '';
$sNickName = '';
$sSuffix = '';
$iGender = 0;
$sAddress1 = '';
Expand Down Expand Up @@ -158,6 +159,7 @@
$sFirstName = InputUtils::legacyFilterInput($_POST['FirstName']);
$sMiddleName = InputUtils::legacyFilterInput($_POST['MiddleName']);
$sLastName = InputUtils::legacyFilterInput($_POST['LastName']);
$sNickName = InputUtils::legacyFilterInput($_POST['NickName']);
$sSuffix = InputUtils::legacyFilterInput($_POST['Suffix']);
$iGender = InputUtils::legacyFilterInput($_POST['Gender'], 'int');

Expand Down Expand Up @@ -398,6 +400,7 @@
->setFirstName($sFirstName)
->setMiddleName($sMiddleName)
->setLastName($sLastName)
->setNickName($sNickName)
->setSuffix($sSuffix)
->setGender($iGender)
->setAddress1($sAddress1)
Expand Down Expand Up @@ -523,6 +526,7 @@
$sFirstName = $per_FirstName;
$sMiddleName = $per_MiddleName;
$sLastName = $per_LastName;
$sNickName = $per_NickName;
$sSuffix = $per_Suffix;
$iGender = (int) $per_Gender;
$sAddress1 = $per_Address1;
Expand Down Expand Up @@ -644,6 +648,12 @@
value="<?= htmlentities(stripslashes($sTitle), ENT_NOQUOTES, 'UTF-8') ?>"
class="form-control" placeholder="<?= gettext('Mr., Mrs., Dr., Rev.') ?>">
</div>
<div class="col-md-3">
<label for="NickName"><?= gettext('NickName') ?>:</label>
<input type="text" name="NickName" id="NickName"
value="<?= htmlentities(stripslashes($sNickName), ENT_NOQUOTES, 'UTF-8') ?>"
class="form-control" placeholder="<?= gettext('Nickname') ?>">
</div>
</div>
<p />
<div class="row">
Expand Down
1 change: 1 addition & 0 deletions src/mysql/install/Install.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,7 @@ CREATE TABLE `person_per` (
`per_FirstName` varchar(50) default NULL,
`per_MiddleName` varchar(50) default NULL,
`per_LastName` varchar(50) default NULL,
`per_NickName` varchar(50) default NULL,
`per_Suffix` varchar(50) default NULL,
`per_Address1` varchar(50) default NULL,
`per_Address2` varchar(50) default NULL,
Expand Down
1 change: 1 addition & 0 deletions src/mysql/upgrade/5.9.0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ DELETE FROM list_lst WHERE lst_OptionName = 'bCanvasser';
DELETE FROM query_qry WHERE qry_ID = '27';
ALTER TABLE user_usr DROP COLUMN usr_Canvasser;
DELETE FROM permissions WHERE permission_name = 'canvasser';
ALTER TABLE person_per ADD per_NickName VARCHAR(50) NULL;
1 change: 1 addition & 0 deletions src/propel/schema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<column name="per_FirstName" phpName="FirstName" type="VARCHAR" size="50"/>
<column name="per_MiddleName" phpName="MiddleName" type="VARCHAR" size="50"/>
<column name="per_LastName" phpName="LastName" type="VARCHAR" size="50"/>
<column name="per_NickName" phpName="NickName" type="VARCHAR" size="50"/>
<column name="per_Suffix" phpName="Suffix" type="VARCHAR" size="50"/>
<column name="per_Address1" phpName="Address1" type="VARCHAR" size="50"/>
<column name="per_Address2" phpName="Address2" type="VARCHAR" size="50"/>
Expand Down
Loading