@@ -82,50 +82,50 @@ def home(request):
8282 form = CommitFestFilterForm (request .GET )
8383 patch_list = patchlist (request , cf , personalized = True )
8484
85- if not patch_list .redirect :
86- # Get stats related to user for current commitfest (same as me() view)
87- curs .execute (
88- """SELECT
89- ps.status, ps.statusstring, count(*)
90- FROM commitfest_patchoncommitfest poc
91- INNER JOIN commitfest_patch p ON p.id = poc.patch_id
92- INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status
93- WHERE
94- ps.status = ANY(%(openstatuses)s)
95- AND (
96- EXISTS (
97- SELECT 1 FROM commitfest_patch_reviewers cpr WHERE cpr.patch_id=p.id AND cpr.user_id=%(user_id)s
98- )
99- OR EXISTS (
100- SELECT 1 FROM commitfest_patch_authors cpa WHERE cpa.patch_id=p.id AND cpa.user_id=%(user_id)s
101- )
102- OR p.committer_id=%(user_id)s
85+ if patch_list .redirect :
86+ return patch_list .redirect
87+
88+ # Get stats related to user for current commitfest (same as me() view)
89+ curs .execute (
90+ """SELECT
91+ ps.status, ps.statusstring, count(*)
92+ FROM commitfest_patchoncommitfest poc
93+ INNER JOIN commitfest_patch p ON p.id = poc.patch_id
94+ INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status
95+ WHERE
96+ ps.status = ANY(%(openstatuses)s)
97+ AND (
98+ EXISTS (
99+ SELECT 1 FROM commitfest_patch_reviewers cpr WHERE cpr.patch_id=p.id AND cpr.user_id=%(user_id)s
103100 )
104- GROUP BY ps.status ORDER BY ps.sortkey""" ,
105- {
106- "user_id" : request .user .id ,
107- "openstatuses" : PatchOnCommitFest .OPEN_STATUSES ,
108- },
109- )
110- statussummary = curs .fetchall ()
111-
112- context .update (
113- {
114- "show_dashboard" : True ,
115- "form" : form ,
116- "patches" : patch_list .patches ,
117- "statussummary" : statussummary ,
118- "all_tags" : {t .id : t for t in Tag .objects .all ()},
119- "has_filter" : patch_list .has_filter ,
120- "grouping" : patch_list .sortkey == 0 ,
121- "sortkey" : patch_list .sortkey ,
122- "openpatchids" : [
123- p ["id" ] for p in patch_list .patches if p ["is_open" ]
124- ],
125- "userprofile" : getattr (request .user , "userprofile" , UserProfile ()),
126- "is_experienced_user" : is_experienced_user ,
127- }
101+ OR EXISTS (
102+ SELECT 1 FROM commitfest_patch_authors cpa WHERE cpa.patch_id=p.id AND cpa.user_id=%(user_id)s
103+ )
104+ OR p.committer_id=%(user_id)s
128105 )
106+ GROUP BY ps.status ORDER BY ps.sortkey""" ,
107+ {
108+ "user_id" : request .user .id ,
109+ "openstatuses" : PatchOnCommitFest .OPEN_STATUSES ,
110+ },
111+ )
112+ statussummary = curs .fetchall ()
113+
114+ context .update (
115+ {
116+ "show_dashboard" : True ,
117+ "form" : form ,
118+ "patches" : patch_list .patches ,
119+ "statussummary" : statussummary ,
120+ "all_tags" : {t .id : t for t in Tag .objects .all ()},
121+ "has_filter" : patch_list .has_filter ,
122+ "grouping" : patch_list .sortkey == 0 ,
123+ "sortkey" : patch_list .sortkey ,
124+ "openpatchids" : [p ["id" ] for p in patch_list .patches if p ["is_open" ]],
125+ "userprofile" : getattr (request .user , "userprofile" , UserProfile ()),
126+ "is_experienced_user" : is_experienced_user ,
127+ }
128+ )
129129
130130 return render (request , "home.html" , context )
131131
0 commit comments