Skip to content

Filters out 'Moved to other CF' patches from draft commitfest pages #100

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

Open
Aditya-Sarna wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Filters out 'Moved to other CF' patches from draft commitfest pages #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 20 additions & 6 deletions pgcommitfest/commitfest/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,10 @@ def patchlist(request, cf, personalized=False):
whereclauses.append("poc.status=ANY(%(openstatuses)s)")
else:
whereclauses.append("poc.commitfest_id=%(cid)s")
# Exclude "Moved to other CF" patches from draft commitfests
if cf.draft:
whereclauses.append("poc.status != %(status_moved)s")
whereparams["status_moved"] = PatchOnCommitFest.STATUS_MOVED

if personalized:
# For now we can just order by these names in descending order, because
Expand Down Expand Up @@ -616,12 +620,22 @@ def commitfest(request, cfid):
return patch_list.redirect

# Generate patch status summary.
curs.execute(
"SELECT ps.status, ps.statusstring, count(*) FROM commitfest_patchoncommitfest poc INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status WHERE commitfest_id=%(id)s GROUP BY ps.status ORDER BY ps.sortkey",
{
"id": cf.id,
},
)
if cf.draft:
# Exclude "Moved to other CF" status from draft commitfests
curs.execute(
"SELECT ps.status, ps.statusstring, count(*) FROM commitfest_patchoncommitfest poc INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status WHERE commitfest_id=%(id)s AND poc.status != %(status_moved)s GROUP BY ps.status ORDER BY ps.sortkey",
{
"id": cf.id,
"status_moved": PatchOnCommitFest.STATUS_MOVED,
},
)
else:
curs.execute(
"SELECT ps.status, ps.statusstring, count(*) FROM commitfest_patchoncommitfest poc INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status WHERE commitfest_id=%(id)s GROUP BY ps.status ORDER BY ps.sortkey",
{
"id": cf.id,
},
)
statussummary = curs.fetchall()
statussummary.append([-1, "Total", sum((r[2] for r in statussummary))])

Expand Down