diff options
| -rw-r--r-- | src/routes/frontend.ts | 12 | ||||
| -rwxr-xr-x | views/event.handlebars | 12 |
2 files changed, 15 insertions, 9 deletions
diff --git a/src/routes/frontend.ts b/src/routes/frontend.ts index 23418df..8ddfbf6 100644 --- a/src/routes/frontend.ts +++ b/src/routes/frontend.ts @@ -142,7 +142,11 @@ router.get("/:eventID", async (req: Request, res: Response) => { if (el.number && el.number > 1) { el.name = `${el.name} (${el.number} people)`; } - return el; + return { + ...el, + // Backwards compatibility - if visibility is not set, default to public + visibility: el.visibility || "public", + }; }) .filter((obj, pos, arr) => { return ( @@ -159,13 +163,13 @@ router.get("/:eventID", async (req: Request, res: Response) => { } return acc; }, 0) || 0; - const visibleAttendees = event.attendees?.filter( + const visibleAttendees = eventAttendees?.filter( (attendee) => attendee.visibility === "public", ); - const hiddenAttendees = event.attendees?.filter( + const hiddenAttendees = eventAttendees?.filter( (attendee) => attendee.visibility === "private", ); - const numberOfHiddenAttendees = event.attendees?.reduce( + const numberOfHiddenAttendees = eventAttendees?.reduce( (acc, attendee) => { if ( attendee.status === "attending" && diff --git a/views/event.handlebars b/views/event.handlebars index 4a732e2..2440623 100755 --- a/views/event.handlebars +++ b/views/event.handlebars @@ -153,14 +153,16 @@ <li{{#if ../editingEnabled}} data-attendee-name="{{this.name}}" data-attendee-id="{{this._id}}"{{/if}}><span class="attendee-name">{{this.name}}</span>{{#if ../editingEnabled}} <a href="#" class="remove-attendee" data-toggle="modal" data-target="#removeAttendeeModal" title="Remove user from event"><i class="fas fa-user-times"></i></a>{{/if}}</li> {{/each}} {{#if editingEnabled}} - {{#each visibleAttendees}} - <li{{#if ../editingEnabled}} data-attendee-name="{{this.name}}" data-attendee-id="{{this._id}}"{{/if}}><span class="attendee-name">{{this.name}} (Hidden from public list)</span>{{#if ../editingEnabled}} <a href="#" class="remove-attendee" data-toggle="modal" data-target="#removeAttendeeModal" title="Remove user from event"><i class="fas fa-user-times"></i></a>{{/if}}</li> + {{#each hiddenAttendees}} + <li{{#if ../editingEnabled}} data-attendee-name="{{this.name}}" data-attendee-id="{{this._id}}"{{/if}}><span class="attendee-name">{{this.name}} (hidden from public list)</span>{{#if ../editingEnabled}} <a href="#" class="remove-attendee" data-toggle="modal" data-target="#removeAttendeeModal" title="Remove user from event"><i class="fas fa-user-times"></i></a>{{/if}}</li> {{/each}} {{/if}} </ul> - {{#if numberOfHiddenAttendees}} - <p class="text-center text-muted mb-0">+{{numberOfHiddenAttendees}} hidden attendee{{plural numberOfHiddenAttendees ""}}</p> - {{/if}} + {{#unless editingEnabled}} + {{#if numberOfHiddenAttendees}} + <p class="text-center text-muted mb-0">+{{numberOfHiddenAttendees}} hidden attendee{{plural numberOfHiddenAttendees ""}}</p> + {{/if}} + {{/unless}} {{else}} <p class="text-center text-muted mb-0">No attendees yet!</p> {{/if}} |