Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

fix(#1701): Events page displays year for events scheduled to start or end at a future year #2500

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

Merged
merged 15 commits into from
Sep 26, 2024
Merged

fix(#1701): Events page displays year for events scheduled to start or end at a future year #2500

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1502c10
Add Methods To Check If Event Starts And Ends This Year
alvindera97 Dec 25, 2020
4198812
Set Up Templates For Querying Start And End Years
alvindera97 Dec 25, 2020
ff1ad8b
Insert New Test Data And Update test_views.py
alvindera97 Dec 25, 2020
e3125d9
Time Tag Now Shows Year For Events With Details Not Within The Curren…
alvindera97 Dec 25, 2020
178742b
Move All Test Data To Functional Test
alvindera97 Dec 25, 2020
e0fdf7c
Functional Test For Displaying Year Of Event For Future Events Now Im…
alvindera97 Dec 27, 2020
115af08
Remove Functional Test For Displaying Year Of Future Event
alvindera97 Dec 27, 2020
aa4d55b
Handle Case When Call To Next Event Returns None
alvindera97 Apr 9, 2022
207a0af
Fix Erroneous Addition To Dev Requirements
alvindera97 Aug 8, 2024
c7cfabd
Merge remote-tracking branch 'upstream/main' into fix-issue-1701
alvindera97 Aug 8, 2024
fa6e0ce
Merge branch 'main' into fix-issue-1701
JacobCoffee Sep 16, 2024
6a18a62
Refactor Tests For Relevant Year String Rendering At Events Page
alvindera97 Sep 19, 2024
23569b9
Merge remote-tracking branch 'origin/main' into fix-issue-1701
alvindera97 Sep 20, 2024
c4db8d4
Merge remote-tracking branch 'upstream/main' into fix-issue-1701
alvindera97 Sep 20, 2024
1150e6a
Merge branch 'main' into fix-issue-1701
JacobCoffee Sep 26, 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
Prev Previous commit
Next Next commit
Set Up Templates For Querying Start And End Years 
Passed variables to the time_tag template [time_tag.html] that checks if an event was scheduled to start or end with the current year.
  • Loading branch information
@alvindera97
alvindera97 committed Apr 8, 2022
commit 4198812511cc9b2cce9ca5c8192fdb8508fc98a3
8 changes: 8 additions & 0 deletions 8 templates/events/event_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,12 @@ <h2 class="widget-title"><span aria-hidden="true" class="icon-calendar"></span>U
<h3 class="event-title"><a href="{{ object.get_absolute_url }}">{{ object.title|striptags }}</a></h3>
<p>
{% with object.next_time as next_time %}
{% with object.is_scheduled_to_start_this_year as scheduled_start_this_year %}
{% with object.is_scheduled_to_end_this_year as scheduled_end_this_year %}
{% include "events/includes/time_tag.html" %}
{% endwith %}
{% endwith %}
{% endwith %}

{% if object.venue %}
<span class="event-location">{% if object.venue.url %}<a href="{{ object.venue.url }}">{% endif %}{{ object.venue.name }}{% if object.venue.url %}</a>{% endif %}{% if object.venue.address %}, {{ object.venue.address }}{% endif %}</span>
Expand All @@ -65,8 +69,12 @@ <h3 class="widget-title just-missed">You just missed...</h3>
<h3 class="event-title"><a href="{{ object.get_absolute_url }}">{{ object.title|striptags }}</a></h3>
<p>
{% with object.previous_time as next_time %}
{% with object.is_scheduled_to_start_this_year as scheduled_start_this_year %}
{% with object.is_scheduled_to_end_this_year as scheduled_end_this_year %}
{% include "events/includes/time_tag.html" %}
{% endwith %}
{% endwith %}
{% endwith %}

{% if object.venue %}
<span class="event-location">{% if object.venue.url %}<a href="{{ object.venue.url }}">{% endif %}{{ object.venue.name }}{% if object.venue.url %}</a>{% endif %}{% if object.venue.address %}, {{ object.venue.address }}{% endif %}</span>
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.