Skip to content

Commit ff3fe8a

Browse files
committed
removed print statements; removed subscribers in status list data
1 parent bb4e557 commit ff3fe8a

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

pgcommitfest/commitfest/templates/me.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{%extends "base.html"%}
22
{%load commitfest %}
33
{%block contents%}
4-
<p>
5-
<br/>
6-
<b>Status summary: </b>{%for id,title,num in statussummary%}<a href="?status={{id}}">{{title}}</a>: {{num}}. {%endfor%}
7-
</p>
8-
94
<a class="btn btn-default" href="/open/new/">New patch</a>
105
<a class="btn btn-default" href="/current/">Current commitfest</a></li>
116
<a class="btn btn-default" href="/open/">Open commitfest</a></li>
@@ -16,6 +11,13 @@
1611
</div>
1712
<button type="submit" class="btn btn-default">Search</button>
1813
</form>
14+
15+
<p>
16+
<br/>
17+
<b>Status summary: </b>{%for id,title,num in statussummary%}<a href="?status={{id}}">{{title}}</a>: {{num}}. {%endfor%}
18+
</p>
19+
20+
1921
{%include "filter_form.html" %}
2022
{%for p in patches %}
2123
{%ifchanged p.is_open%}

pgcommitfest/commitfest/views.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,15 @@ def me(request):
9595
INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status
9696
LEFT JOIN commitfest_patch_authors pa ON pa.patch_id=poc.patch_id
9797
LEFT JOIN commitfest_patch_reviewers pr ON pr.patch_id=poc.patch_id
98-
LEFT JOIN commitfest_patch_subscribers psubs ON psubs.patch_id=poc.patch_id
99-
WHERE commitfest_id=%(id)s
98+
WHERE commitfest_id=%(id)s
10099
AND (
101-
pa.user_id=%(user_id)s
100+
pa.user_id=%(user_id)s
102101
OR pr.user_id=%(user_id)s
103-
OR psubs.user_id=%(user_id)s
104102
)
105103
GROUP BY ps.status ORDER BY ps.sortkey""",
106104
{"id": cf.id, "user_id": request.user.id},
107105
)
108106
statussummary = curs.fetchall()
109-
print(statussummary)
110107

111108
return render(
112109
request,

0 commit comments

Comments
 (0)