Skip to content

Commit acf80b7

Browse files
authored
Merge pull request #6905 from escattone/recent-revisions-bot-filter
add bots filter to recent revisions page
2 parents 098fe2c + 5da47da commit acf80b7

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

kitsune/sumo/static/sumo/scss/layout/_contributors.scss

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,12 @@
7474
width: 100%;
7575
max-width: none;
7676
margin: 0 0 p.$spacing-md 0;
77+
78+
&[type="checkbox"] {
79+
width: auto;
80+
margin-right: p.$spacing-md;
81+
margin-left: p.$spacing-xs;
82+
}
7783
}
7884

7985
img {
@@ -263,4 +269,4 @@ ol.headings-list {
263269
}
264270
}
265271
}
266-
}
272+
}

kitsune/wiki/forms.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,5 +419,6 @@ class RevisionFilterForm(forms.Form):
419419

420420
locale = forms.ChoiceField(label=_lazy("Locale:"), choices=languages, required=False)
421421
users = MultiUsernameFilterField(label=_lazy("Users:"), required=False)
422+
include_bots = forms.BooleanField(label=_lazy("Bots:"), required=False)
422423
start = forms.DateField(label=_lazy("Start:"), required=False)
423424
end = forms.DateField(label=_lazy("End:"), required=False)

kitsune/wiki/views.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,6 +1717,8 @@ def _execute_l10n_strategy(revision, trigger, user=None):
17171717
def recent_revisions(request):
17181718
request.GET = request.GET.copy()
17191719
fragment = request.GET.pop("fragment", None)
1720+
if not fragment:
1721+
request.GET.setdefault("include_bots", "on")
17201722
form = RevisionFilterForm(request.GET)
17211723

17221724
# Validate the form to populate cleaned_data, even with invalid usernames.
@@ -1731,6 +1733,9 @@ def recent_revisions(request):
17311733
if form.cleaned_data.get("users"):
17321734
filters.update(creator__in=form.cleaned_data["users"])
17331735

1736+
if not form.cleaned_data.get("include_bots"):
1737+
filters.update(creator__profile__account_type=Profile.AccountType.REGULAR)
1738+
17341739
start = form.cleaned_data.get("start")
17351740
end = form.cleaned_data.get("end")
17361741
if start or end:

0 commit comments

Comments
 (0)