Merge lp:~svwilliams/summit/track-page into lp:~cjohnston/summit/track-page

Proposed by Stephen V. Williams
Status: Merged
Approved by: Chris Johnston
Approved revision: 235
Merge reported by: Chris Johnston
Merged at revision: not available
Proposed branch: lp:~svwilliams/summit/track-page
Merge into: lp:~cjohnston/summit/track-page
Diff against target: 38 lines (+3/-3)
3 files modified
summit/schedule/models/leadmodel.py (+1/-1)
summit/schedule/models/trackmodel.py (+1/-1)
summit/schedule/templates/schedule/tracks.html (+1/-1)
To merge this branch: bzr merge lp:~svwilliams/summit/track-page
Reviewer Review Type Date Requested Status
Chris Johnston Pending
Review via email: mp+84354@code.launchpad.net

Commit message

removed the related_name in lead model.track which fixed the zero loop for track leads

Description of the change

new modification to fix missing leader list

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/models/leadmodel.py'
2--- summit/schedule/models/leadmodel.py 2011-11-21 15:21:29 +0000
3+++ summit/schedule/models/leadmodel.py 2011-12-03 04:01:25 +0000
4@@ -29,7 +29,7 @@
5
6 class Lead(models.Model):
7 summit = models.ForeignKey(Summit)
8- track = models.ForeignKey(Track, related_name='lead')
9+ track = models.ForeignKey(Track)
10 lead = models.ForeignKey(Attendee, related_name='lead')
11
12 class Meta:
13
14=== modified file 'summit/schedule/models/trackmodel.py'
15--- summit/schedule/models/trackmodel.py 2011-12-02 01:11:52 +0000
16+++ summit/schedule/models/trackmodel.py 2011-12-03 04:01:25 +0000
17@@ -30,7 +30,7 @@
18 color = models.CharField(max_length=6, null=False, blank=False, default='FFFFFF')
19 description = models.TextField(max_length=1000, blank=False, null=True)
20 allow_adjacent_sessions = models.BooleanField(default=False)
21-
22+
23 class Meta:
24 app_label = 'schedule'
25 ordering = ('summit', 'title', 'slug')
26
27=== modified file 'summit/schedule/templates/schedule/tracks.html'
28--- summit/schedule/templates/schedule/tracks.html 2011-12-03 02:38:50 +0000
29+++ summit/schedule/templates/schedule/tracks.html 2011-12-03 04:01:25 +0000
30@@ -17,7 +17,7 @@
31 <li>
32 <h3><a href="/{{ summit.name }}/track/{{ track.slug|lower }}">{{ track.title }}</a></h3>
33 <p>{{ track.description }}</p>
34-{% for lead in track.lead_set.all %}
35+Track Leader: {% for lead in track.lead_set.all %}
36 {{ lead.lead }}
37 {% endfor %}
38 </li>

Subscribers

People subscribed via source and target branches