Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 23:55:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #13575 from howard-stearns/fix-connections-count

Browse source 
fix PAL connections count
This commit is contained in:
Howard Stearns 2018-07-10 14:58:15 -05:00 committed by GitHub
commit 5cf6cc0270
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/Pal.qml
View file

@ -765,7 +765,7 @@ Rectangle {
TableViewColumn {
id: connectionsUserNameHeader;
role: "userName";
title: connectionsTable.rowCount + (connectionsTable.rowCount === 1 ? " NAME" : " NAMES");
title: connectionsUserModel.totalEntries + (connectionsUserModel.totalEntries === 1 ? " NAME" : " NAMES");
width: connectionsNameCardWidth;
movable: false;
resizable: false;

8
interface/resources/qml/hifi/models/PSFListModel.qml
View file

@ -51,6 +51,8 @@ ListModel {
if (!delayedClear) { root.clear(); }
currentPageToRetrieve = 1;
retrievedAtLeastOnePage = false;
totalPages = 0;
totalEntries = 0;
}
// Page processing.
@ -59,6 +61,8 @@ ListModel {
property var processPage: function (data) { return data; }
property var listView; // Optional. For debugging.
property int totalPages: 0;
property int totalEntries: 0;
// Check consistency and call processPage.
function handlePage(error, response) {
var processed;
@ -79,8 +83,10 @@ ListModel {
if (response.current_page && response.current_page !== currentPageToRetrieve) { // Not all endpoints specify this property.
return fail("Mismatched page, expected:" + currentPageToRetrieve);
}
totalPages = response.total_pages || 0;
totalEntries = response.total_entries || 0;
processed = processPage(response.data || response);
if (response.total_pages && (response.total_pages === currentPageToRetrieve)) {
if (totalPages && (totalPages === currentPageToRetrieve)) {
currentPageToRetrieve = -1;
}