bug 1325460: rule history ui broken by bug 1285975 (#201). r=ninadbhat

mozilla-releng · Dec 28, 2016 · 5656112 · 5656112
1 parent 9f0a093
commit 5656112
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/agent/tox.ini b/agent/tox.ini
@@ -11,7 +11,9 @@ setenv =
 deps =
     asynctest
     flake8
-    coverage
+# Pin coverage to work around https://bitbucket.org/ned/coveragepy/issues/541/coverage-43-breaks-nosetest-with-coverage
+# Long term fix: https://bugzilla.mozilla.org/show_bug.cgi?id=1326046
+    coverage==4.2
     pyflakes
     pytest
     pytest-catchlog

diff --git a/ui/app/js/controllers/rules_controller.js b/ui/app/js/controllers/rules_controller.js
@@ -130,7 +130,9 @@ function($scope, $routeParams, $location, $timeout, Rules, Search, $modal, $rout
   $scope.removeFilterSearchWord = Search.removeFilterSearchWord;
 
   $scope.filterBySelect = function(rule) {
-    if ($scope.pr_ch_selected[0].toLowerCase() === "all rules") {
+    // Always return all entries if "all rules" is the filter
+    // or if $scope.rule_id is set (meaning we're on the history page).
+    if ($scope.pr_ch_selected[0].toLowerCase() === "all rules" || $scope.rule_id) {
       return true;
     }
     else if ($scope.pr_ch_selected && $scope.pr_ch_selected.length > 1) {