Skip to content

Commit ca56066

Browse files
committed
MOBILE-2178 database: Fix isEmpty and pagination in list
1 parent f8b847f commit ca56066

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

www/addons/mod/data/controllers/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ angular.module('mm.addons.mod_data')
190190
$scope.search.page);
191191
}
192192
}).then(function(entries) {
193-
$scope.numEntries = entries && entries.totalcount;
194-
$scope.isEmpty = $scope.numEntries <= 0 && $scope.offlineActions.length <= 0;
195-
$scope.hasNextPage = (($scope.search.page + 1) * mmaModDataPerPage) < $scope.numEntries;
193+
var numEntries = (entries && entries.entries && entries.entries.length) || 0;
194+
$scope.isEmpty = !numEntries && Object.keys($scope.offlineActions).length <= 0;
195+
$scope.hasNextPage = numEntries >= mmaModDataPerPage && (($scope.search.page + 1) * mmaModDataPerPage) < entries.totalcount;
196196
$scope.entriesRendered = "";
197197

198198
if (!$scope.isEmpty) {

www/addons/mod/data/templates/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
</div>
5050

5151
<div class="item" ng-if="search.searching && !isEmpty">
52-
<h2>{{ 'mma.mod_data.numrecords' | translate: {$a: numEntries } }}</h2>
5352
<a ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate}}</a>
5453
</div>
5554

www/core/scss/styles.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,3 +1683,7 @@ h2.invert {
16831683
::-webkit-calendar-picker-indicator, ::-webkit-inner-spin-button, ::-webkit-clear-button {
16841684
display: none;
16851685
}
1686+
1687+
*[ng-click] {
1688+
cursor: pointer;
1689+
}

0 commit comments

Comments
 (0)