Merge lp:~cjohnston/loco-team-portal/bugfix-lp-539979 into lp:loco-team-portal

Proposed by Chris Johnston
Status: Rejected
Rejected by: Daniel Holbach
Proposed branch: lp:~cjohnston/loco-team-portal/bugfix-lp-539979
Merge into: lp:loco-team-portal
Diff against target: 16 lines (+5/-1)
1 file modified
loco_directory/templates/events/global_event_list.inc.html (+5/-1)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/bugfix-lp-539979
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+21761@code.launchpad.net

Description of the change

Changes N team events attend. to N local events and determines if the global event occurs on multiple days, and displays $date1 - $date2

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

I'm not sure... when does this below trigger?
{% ifequal global_event.date_begin|date global_event.date_end|date %}

Also, is the only difference between the two cases that also " - {{global_event.date_end|date}}" is shown?

Revision history for this message
Michael Hall (mhall119) wrote :

It's only showing the end date if it's different from the start date, aka: a multi-day event. If it's a single day only, there's no real need to show both start and end dates.

Revision history for this message
Chris Johnston (cjohnston) wrote :

It performs the actions request:

Maybe to make it shorter:
1) If dates are different: "Ubuntu Global Jam from 26.03.-28.03. (21 local events)".
2) Otherwise: "Ubuntu Global Jam on 26.03. (21 local events)".

Unmerged revisions

83. By Chris Johnston

Changes N team events attend. to N local events and determines if the global event occurs on multiple days, and displays $date1 - $date2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/templates/events/global_event_list.inc.html'
2--- loco_directory/templates/events/global_event_list.inc.html 2010-03-16 23:50:39 +0000
3+++ loco_directory/templates/events/global_event_list.inc.html 2010-03-20 00:00:40 +0000
4@@ -4,7 +4,11 @@
5 <td width="100%" valign="top" class="col2_container">
6 <ul>
7 {% for global_event in global_event_list %}
8-<li class="{% cycle 'col_left' 'col_right'%}"><a href="{{global_event.get_absolute_url }}">{{ global_event.name }}</a> {% trans "starts at: " %}{{ global_event.date_begin|date}} ({{global_event.teamevent_set.all.count}} {% trans "team events attend." %})</li>
9+{% ifequal global_event.date_begin|date global_event.date_end|date %}
10+<li class="{% cycle 'col_left' 'col_right'%}"><a href="{{global_event.get_absolute_url }}">{{ global_event.name }}</a> {% trans "starts at: " %}{{ global_event.date_begin|date}} ({{global_event.teamevent_set.all.count}} {% trans "local events" %})</li>
11+{% else %}
12+<li class="{% cycle 'col_left' 'col_right'%}"><a href="{{global_event.get_absolute_url }}">{{ global_event.name }}</a> {% trans "starts at: " %}{{ global_event.date_begin|date}} - {{ global_event.date_end|date}} ({{global_event.teamevent_set.all.count}} {% trans "local events" %})</li>
13+{% endifequal %}
14 {% endfor %}
15 </ul>
16 </td>

Subscribers

People subscribed via source and target branches