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

Show blank field if Secondary Email not set. #417

Merged
merged 1 commit into from
Mar 1, 2025
Merged

Show blank field if Secondary Email not set. #417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions MerlinAU.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<script language="JavaScript" type="text/javascript">

/**----------------------------**/
/** Last Modified: 2025-Feb-25 **/
/** Last Modified: 2025-Mar-01 **/
/** Intended for 1.4.0 Release **/
/**----------------------------**/

Expand Down Expand Up @@ -1108,9 +1108,9 @@ function ToggleEmailDependents (isEmailNotifyChecked)
}
}

/**-------------------------------------**/
/** Added by Martinski W. [2025-Jan-27] **/
/**-------------------------------------**/
/**----------------------------------------**/
/** Modified by Martinski W. [2025-Mar-01] **/
/**----------------------------------------**/
function SetUpEmailNotificationFields()
{
let emailFormat = document.getElementById('emailFormat');
Expand All @@ -1119,8 +1119,15 @@ function SetUpEmailNotificationFields()

if (emailFormat)
{ emailFormat.value = custom_settings.FW_New_Update_EMail_FormatType || 'HTML'; }

// If not yet set show a blank field instead of 'TBD' //
if (secondaryEmail)
{ secondaryEmail.value = custom_settings.FW_New_Update_EMail_CC_Address || 'TBD'; }
{
if (custom_settings.FW_New_Update_EMail_CC_Address === 'TBD')
{ secondaryEmail.value = ''; }
else
{ secondaryEmail.value = custom_settings.FW_New_Update_EMail_CC_Address; }
}

if (emailNotificationsEnabled && emailFormat && secondaryEmail)
{
Expand Down