Skip to content

1597 edit event btn #1688

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
Shenderaz wants to merge 5 commits into
base: development
Choose a base branch
from
Open

1597 edit event btn #1688

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4610fee
Change the url to view and add conditions for the btn
Shenderaz Feb 12, 2026
9bd65dc
Give permision to specific users to view the btn and change the url l…
Shenderaz Mar 25, 2026
d9b32c9
Update app/templates/events/eventList.html
bakobagassas Mar 27, 2026
81634c2
Merge branch 'development' into 1597Edit_event_btn
Shenderaz Apr 7, 2026
3f442af
Merge branch 'development' into 1597Edit_event_btn
bakobagassas Apr 7, 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
12 changes: 9 additions & 3 deletions app/templates/events/eventList.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ <h1 class="text-center">Events List for {{selectedTerm.description}}</h1>
{% endif %}
{% if user.isCeltsAdmin or user.isProgramManagerFor(event.program)%}
{% set link_class = 'link-secondary' if event.isPastStart else 'link-primary' %}
<td><a href="/event/{{event.id}}/edit" class="{{link_class}}">{{event.name}}</a></td>
<td><a href="/event/{{event.id}}/view" class="{{link_class}}">{{event.name}}</a></td>
Copy link
Copy Markdown
Contributor

@bakobagassas bakobagassas Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we changing the "edit" to "view" ?

{% else %}
<td><a href="/event/{{event.id}}/view" class="link-primary">{{event.name}}</a></td>
{% endif %}
Expand All @@ -128,8 +128,8 @@ <h1 class="text-center">Events List for {{selectedTerm.description}}</h1>
<td nowrap>{{event.timeStart.strftime('%-I:%M %p')}} - {{event.timeEnd.strftime('%-I:%M %p')}}</td>
<td class="text-dark">{{event.location}}</td>
{% endif %}
{% if user.isAdmin %}
<td>
{% if user.isCeltsAdmin or user.isProgramManagerFor(event.program)%}
Copy link
Copy Markdown
Contributor

@bakobagassas bakobagassas Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we changing "isAdmin" to "isCeltsAmin" or "isProgramManagerFor" ? because isAdmin includes student staff and now we are excluding them

<td style="white-space: nowrap;">
{% if event.isPastStart %}
{% set isPastStart = "true" %}
{% else %}
Expand All @@ -141,9 +141,15 @@ <h1 class="text-center">Events List for {{selectedTerm.description}}</h1>
<button class="btn {{btn_class}}" onclick="showEmailModal({{event.id}}, 'Unknown', {{ selectedTerm }}, {{ isPastStart }}, '{{defaultTemplate}}')">
<span class="bi bi-envelope-fill"> {{btn_text}}</span>
</button>
<a class="btn {{btn_class}} ms-2" href="/event/{{ event.id }}/edit"><span class="bi bi-pencil-fill"></span> Edit Event</a>
</td>
</td>
{% else %}
<td>
{% if user.isProgramManagerFor(event.program) %}
{% set btn_class = 'btn-secondary' if event.isPastStart or event.isCanceled else 'btn-primary' %}
<a class="btn {{btn_class}}" href="/event/{{ event.id }}/edit"><span class="bi bi-pencil-fill"></span> Edit Event</a>
{% endif %}
Comment on lines +149 to +152
Copy link

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the {% else %} branch of {% if user.isCeltsAdmin or user.isProgramManagerFor(event.program) %}, the nested {% if user.isProgramManagerFor(event.program) %} condition can never be true, so this Edit button code is unreachable. Remove the dead conditional/code, or restructure the outer condition if you intended program managers to hit this branch (e.g., show only Edit without Invite).

Suggested change
{% if user.isProgramManagerFor(event.program) %}
{% set btn_class = 'btn-secondary' if event.isPastStart or event.isCanceled else 'btn-primary' %}
<a class="btn {{btn_class}}" href="/event/{{ event.id }}/edit"><span class="bi bi-pencil-fill"></span> Edit Event</a>
{% endif %}

Copilot uses AI. Check for mistakes.
{% if event.id in rsvpedEventsID %}
<button type="button" class="btn btn-danger" onclick="removeRsvpForEvent({{event.id}})">Remove RSVP</button>
{% elif (not event.isPastStart) and (event.isRsvpRequired) and (not event.isCanceled) %}
Expand Down
Loading