Fixes bug 943301 - Created permission to run long queries in search a…

…nd report/list pages.
mozilla-services · Dec 18, 2013 · 794b121 · 794b121
1 parent 13ae068
commit 794b121
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/webapp-django/crashstats/crashstats/management/__init__.py b/webapp-django/crashstats/crashstats/management/__init__.py
@@ -16,6 +16,7 @@
     'view_rawdump': 'View Raw Dumps',
     'view_exploitability': 'View Exploitability Results',
     'view_flash_exploitability': 'View Flash Exploitability Results',
+    'run_long_queries': 'Run Long Queries',
 }
 
 

diff --git a/webapp-django/crashstats/crashstats/tests/test_views.py b/webapp-django/crashstats/crashstats/tests/test_views.py
@@ -1834,8 +1834,8 @@ def mocked_get(url, **options):
 
         # Test an out-of-range date range for a logged in user
         user = self._login()
-        user.is_superuser = True
-        user.save()
+        group = self._create_group_with_permission('run_long_queries')
+        user.groups.add(group)
 
         response = self.client.get(url, {
             'query': 'js::',

diff --git a/webapp-django/crashstats/crashstats/views.py b/webapp-django/crashstats/crashstats/views.py
@@ -1099,7 +1099,7 @@ def report_list(request, partial=None, default_context=None):
         range_unit
     )
 
-    if request.user.is_superuser:
+    if request.user.has_perm('crashstats.run_long_queries'):
         # The user is an admin and is allowed to perform bigger queries
         max_query_range = settings.QUERY_RANGE_MAXIMUM_DAYS_ADMIN
     else:
@@ -1671,7 +1671,7 @@ def query(request, default_context=None):
             params['date_range_unit']
         )
 
-        if request.user.is_superuser:
+        if request.user.has_perm('crashstats.run_long_queries'):
             # The user is an admin and is allowed to perform bigger queries
             max_query_range = settings.QUERY_RANGE_MAXIMUM_DAYS_ADMIN
             error_type = 'exceeded_maximum_date_range_admin'