Skip to content

Email opt in out upgrade #1050

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

Open
onewheelskyward wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Email opt in out upgrade #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
421ee9b
Altered field for email publishing and added client-side requirement
onewheelskyward Apr 23, 2026
2b02d5d
Fixes #1048
onewheelskyward May 1, 2026
7098cce
Added input focus on fail to select
onewheelskyward May 1, 2026
8f95fad
Added the validation to the backend.
onewheelskyward May 1, 2026
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
13 changes: 12 additions & 1 deletion app/models/calEventValidator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,17 @@ function makeValidator(input, errors) {
return validator.toBoolean(str) ? 1 : 0;
}
},
// requires a 0, 1, true, or false value; empty is an error
requiredFlag(field, msg) {
const str = getString(field);
if (validator.isEmpty(str)) {
errors.addError(field, msg);
} else if (!validator.isBoolean(str)) {
errors.addError(field);
} else {
return validator.toBoolean(str) ? 1 : 0;
}
},
// if not specified, returns 0
// otherwise expects an int-like value
// greater than or equal to 0
Expand Down Expand Up @@ -215,7 +226,7 @@ function validateEvent(input) {
address: v.requireString('address', 'Address missing'),
name: v.requireString('organizer', 'Organizer missing'),
email: v.requireEmail('email'),
hideemail: v.optionalFlag('hideemail'),
hideemail: v.requiredFlag('hideemail', 'Please select whether or not to publish your email address'),
phone: v.nullString('phone'),
hidephone: v.optionalFlag('hidephone'),
contact: v.nullString('contact'),
Expand Down
16 changes: 10 additions & 6 deletions site/themes/s2b_hugo_theme/layouts/partials/cal/edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,13 +335,17 @@ <h2>
<input type="text" class="form-control" name="email" id="email" value="[[email]]" autocomplete="email" aria-describedby="email-help email-suggestion" required="true" aria-invalid="false" />
<p class="input-help" id="email-help">This must be a valid email address where we can reach you. A confirmation message will be mailed to this address.</p>
<div id="email-suggestion" aria-live="polite"></div>
</div>

<div>
<label class="control-label" for="hideemail">
<input type="checkbox" name="hideemail" id="hideemail" value="1" [[^ id ]]checked[[/ id ]] [[# hideemail ]]checked[[/ hideemail ]] />
Don't publish my email address online
</label>
</div>
<div class="form-group">
<label class="control-label req-label" for="hideemail">Publish email address online?</label>
<select class="form-control" name="hideemail" id="hideemail" required="true" aria-invalid="false" aria-describedby="hideemail-help hideemail-suggestion">
<option value="">Select one</option>
<option value="1" [[# hideemail ]]selected[[/ hideemail ]]>🚫 Don't publish my email address online</option>
<option value="0" [[# id ]][[^ hideemail ]]selected[[/ hideemail ]][[/ id ]]>✅ Do publish my email address online</option>
</select>
<p class="input-help" id="hideemail-help">This option chooses whether or not to publish your email address on the calendar.</p>
<div id="hideemail-suggestion" aria-live="polite"></div>
</div>

<div>Website for additional details</div>
Expand Down