From f3880e76a1d8fce7bf676c0c7ca241fbbdd7a54c Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Tue, 18 Jul 2017 17:37:36 -0400
Subject: [PATCH] Fixed item of range

---
 awx/ui/client/src/shared/paginate/paginate.controller.js | 6 +-----
 awx/ui/client/src/shared/paginate/paginate.partial.html  | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/awx/ui/client/src/shared/paginate/paginate.controller.js b/awx/ui/client/src/shared/paginate/paginate.controller.js
index 6d72e9a0ff..a8ff92572a 100644
--- a/awx/ui/client/src/shared/paginate/paginate.controller.js
+++ b/awx/ui/client/src/shared/paginate/paginate.controller.js
@@ -41,10 +41,6 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q
             $scope.toPage();
         };
 
-        $scope.dataCount = function() {
-            return $filter('number')($scope.dataset.count);
-        };
-
         $scope.toPage = function(page) {
             if(page === 0 || page > $scope.last) {
                 return;
@@ -132,7 +128,7 @@ export default ['$scope', '$stateParams', '$state', '$filter', 'GetBasePath', 'Q
                 return `1 - ${$scope.pageSize}`;
             } else {
                 let floor = (($scope.current - 1) * parseInt($scope.pageSize)) + 1;
-                let ceil = floor + parseInt($scope.pageSize) < $scope.dataset.count ? floor + parseInt($scope.pageSize) : $scope.dataset.count;
+                let ceil = floor + parseInt($scope.pageSize) - 1 < $scope.dataset.count ? floor + parseInt($scope.pageSize) - 1 : $scope.dataset.count;
                 return `${floor} - ${ceil}`;
             }
         }
diff --git a/awx/ui/client/src/shared/paginate/paginate.partial.html b/awx/ui/client/src/shared/paginate/paginate.partial.html
index 532d715f61..9fab876eff 100644
--- a/awx/ui/client/src/shared/paginate/paginate.partial.html
+++ b/awx/ui/client/src/shared/paginate/paginate.partial.html
@@ -35,14 +35,14 @@
         <span id="total-pages">{{last}}</span>
         </span>
     </div>
-    <div class="Paginate-total page-label" ng-hide="dataCount === 0">
+    <div class="Paginate-total page-label" ng-hide="dataset.count === 0">
         <!-- TODO: Move the ITEMS line into paginate.directive.js
              so that i18n.sprintf("A of B") can be used but
              it seems $sce.trustAsHtml() does not work with html tag.
          -->
         <span class="Paginate-itemsOf" translate>ITEMS&nbsp;
             <span>{{dataRange}}</span>
-            <span ng-hide="dataset.count <= basePageSize">of {{dataCount()}}</span>
+            <span ng-hide="dataset.count <= basePageSize">of {{dataset.count | number}}</span>
         </span>
         <div class="Paginate-filteringDropdowns" ng-hide="hideViewPerPage || dataset.count <= basePageSize">
             <div class="Paginate-filterLabel" translate>VIEW PER PAGE</div>