1 files changed, 8 insertions, 5 deletions

diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html
index 091e11a51e..d48ad92020 100644
--- a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html
+++ b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html
@@ -58,9 +58,12 @@
     }
 
     // load cookie for number of entries to be displayed on page
-    pagesize = $.cookie('count');
-    if (!pagesize)
-        pagesize = 10;
+    if ({{request.GET.count}} != "") {
+      pagesize = {{request.GET.count}};
+    } else {
+      pagesize = $.cookie('_count');
+    }
+
     $('.pagesize option').prop('selected', false)
                          .filter('[value="' + pagesize + '"]')
                          .attr('selected', true);
@@ -81,9 +84,9 @@
     $('.progress, .lead span').tooltip({container:'table', placement:'top'});
 
     $(".pagesize").change(function () {
-        reload_params({"count":$(this).val()});
         // save cookie with pagesize
-        $.cookie("count", $(this).val(), { path : $(location).attr('pathname') });
+        $.cookie("_count", $(this).val(), { path : $(location).attr('pathname') });
+        reload_params({"count":$(this).val()});
     });
 });
 </script>