Merge lp:~jcsackett/launchpad/missing-results-count-in-chromium into lp:launchpad

[j.c.sackett]

Fixes display of results count on bug listing in chromium.

Summary
=======
Per bug 984871, the bug listing javascript removed the display of the total
number of results when showing navigation links (i.e. NNNN -> MMMM of $total
results).

This was because while it was passing a total from the BugListingModel into
the template, the total was never explicitly set within the model once passed
in via config, and an undefined result was passed to mustache. I have no idea
how it is that firefox continued to display the results count.

Implementation
==============
Add "total" to the ListingModel's ATTRs. It's already passed in via config, so
the YUI Base initializer magic takes care of everything.

Tests
=====
bin/test -vvct buglisting --layer=YUI

QA
==
Ensure the proper results count is displayed on a buglisting in
chrome/chromium.

LoC
===
This branch is preceeded by one that is -20 LoC, to make space for this fix.

Lint
====

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/javascript/buglisting.js

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'lib/lp/bugs/javascript/buglisting.js'
--- lib/lp/bugs/javascript/buglisting.js	2012-09-12 01:36:22 +0000
+++ lib/lp/bugs/javascript/buglisting.js	2012-09-13 19:57:19 +0000
@@ -30,22 +30,8 @@
      *  - batch_key: A string representing the position and ordering of the
      *    current batch, as returned by listing_navigator.get_batch_key
      */
-    module.BugListingModel = function () {
-        module.BugListingModel.superclass.constructor.apply(this, arguments);
-    };
-
-
-    module.BugListingModel.NAME = 'buglisting-model';
-
-
-    module.BugListingModel.ATTRS = {
-        field_visibility_defaults: {
-            value: null
-        }
-    };
-
-
-    Y.extend(module.BugListingModel, Y.Base, {
+    module.BugListingModel = Y.Base.create('buglisting-model', Y.Base, [],
+    {
         /**
          * Initializer sets up the History object that stores most of the
          * model data.
@@ -100,9 +86,13 @@
             var url = '?' + Y.QueryString.stringify(query);
             this.get('history').addValue('batch_key', batch_key, {url: url});
         }
+    }, {
+        ATTRS: {
+            field_visibility_defaults: { value: null },
+            total: { value: null }
+        }    
     });
 
-
     /**
      * Constructor.
      * current_url is used to determine search params.
@@ -114,45 +104,38 @@
      * io_provider is something providing the Y.io interface, typically used
      * for testing.  Defaults to Y.io.
      */
-    module.BugListingNavigator = function(config) {
-        module.BugListingNavigator.superclass.constructor.apply(
-            this, arguments);
-    };
-
-    module.BugListingNavigator.ATTRS = {
-    };
-
-    Y.extend(
-        module.BugListingNavigator,
-        Y.lp.app.listing_navigator.ListingNavigator, {
-        _bindUI: function () {
-            Y.lp.app.inlinehelp.init_help();
-        },
-
-        /**
-         * Return the model to use for rendering the batch.  This will include
-         * updates to field visibility.
-         */
-        get_render_model: function(current_batch) {
-            return Y.merge(
-                current_batch.mustache_model,
-                this.get('model').get_field_visibility());
-        },
-
-        make_model: function(batch_key, cache) {
-            return new module.BugListingModel({
-                batch_key: batch_key,
-                total: cache.total,
-                field_visibility: cache.field_visibility,
-                field_visibility_defaults: cache.field_visibility_defaults
-            });
-        }
-    });
+    module.BugListingNavigator = Y.Base.create(
+        '', Y.lp.app.listing_navigator.ListingNavigator, [],
+        {
+            _bindUI: function () {
+                Y.lp.app.inlinehelp.init_help();
+            },
+
+            /**
+             * Return the model to use for rendering the batch.  This will include
+             * updates to field visibility.
+             */
+            get_render_model: function(current_batch) {
+                return Y.merge(
+                    current_batch.mustache_model,
+                    this.get('model').get_field_visibility());
+            },
+
+            make_model: function(batch_key, cache) {
+                return new module.BugListingModel({
+                    batch_key: batch_key,
+                    total: cache.total,
+                    field_visibility: cache.field_visibility,
+                    field_visibility_defaults: cache.field_visibility_defaults
+                });
+            },
+
+        },{});
 
     /**
      * Factory to return a BugListingNavigator for the given page.
      */
-    module.BugListingNavigator.from_page = function() {
+    module.BugListingNavigator.from_page = function () {
         var target = Y.one('#client-listing');
         if (Y.Lang.isNull(target)){
             return null;
@@ -180,8 +163,7 @@
         navigator.clickAction('.last', navigator.last_batch);
         navigator.update_navigation_links();
         return navigator;
-    };
-
+    }
 
     /**
      * Helper view object for managing the buglisting code on the actual table
@@ -189,8 +171,7 @@
      *
      * @class TableView
      * @extends Y.Base
-     * @namespace lp.bugs.buglisting
-     *
+     * @namespace lp.bugs.buglisting *
      */
     module.TableView = Y.Base.create('buglisting-tableview', Y.Base,
         [], {