Skip to content

fix bug 977406 - exclude expired versions from front page graph #1971

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

Merged
lonnen merged 1 commit into from
Mar 29, 2014
Merged

fix bug 977406 - exclude expired versions from front page graph #1971

Show file tree
Hide file tree
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
10 changes: 9 additions & 1 deletion webapp-django/crashstats/crashstats/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,14 @@ def mocked_get(url, params, **options):
"version": "18.0",
"release": "Stable",
"id": 920},
{"product": "WaterWolf",
"throttle": "100.00",
"end_date": "2012-03-09",
"start_date": "2012-03-08",
"featured": true,
"version": "19.1",
"release": "Nightly",
"id": 928},
{"product": "WaterWolf",
"throttle": "100.00",
"end_date": "%(end_date)s",
Expand Down Expand Up @@ -725,7 +733,7 @@ def mocked_get(**options):

response = self.client.get(url)
eq_(response.status_code, 200)
ok_('Total Volume of GC Crashes for WaterWolf 20.0'
ok_('Total Volume of GC Crashes for WaterWolf 19.1'
in response.content)

response = self.client.get(invalid_version_url)
Expand Down
12 changes: 8 additions & 4 deletions webapp-django/crashstats/crashstats/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,20 +229,24 @@ def frontpage_json(request, default_context=None):
days = form.cleaned_data['duration']
assert isinstance(days, int) and days > 0, days

end_date = datetime.datetime.utcnow()
start_date = end_date - datetime.timedelta(days=days + 1)

if not versions:
versions = []
for release in default_context['currentversions']:
if release['product'] == product and release['featured']:
versions.append(release['version'])
current_end_date = (
datetime.datetime.strptime(release['end_date'], '%Y-%m-%d')
)
if end_date.date() <= current_end_date.date():
versions.append(release['version'])

default = request.session.get('date_range_type', 'report')
date_range_type = form.cleaned_data['date_range_type'] or default
assert date_range_type in date_range_types
request.session['date_range_type'] = date_range_type

end_date = datetime.datetime.utcnow()
start_date = end_date - datetime.timedelta(days=days + 1)

api = models.CrashesPerAdu()
crashes = api.get(
product=product,
Expand Down