mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge: - client: check if data loaded before the request with older_than 

* commit '85d6994719a724e8dd0828bb90c459a422767d12':
  - client: check if data loaded before the request with older_than
This commit is contained in:
Ildar Kamalov 2019-09-27 14:57:26 +03:00
parent 6a65c79a03 85d6994719
commit 75a8f9f850
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/Logs/index.js
View File

@ -265,7 +265,7 @@ class Logs extends Component {
fetchData = (state) => { fetchData = (state) => {
const { pageSize, page, pages } = state; const { pageSize, page, pages } = state;
const { allLogs, filter } = this.props.queryLogs; const { allLogs, filter } = this.props.queryLogs;
const isLastPage = page + 1 === pages; const isLastPage = pages && (page + 1 === pages);
if (isLastPage) { if (isLastPage) {
const lastRow = allLogs[allLogs.length - 1]; const lastRow = allLogs[allLogs.length - 1];

2
client/src/reducers/queryLogs.js
View File

@ -90,7 +90,7 @@ const queryLogs = handleActions(
logs: [], logs: [],
interval: 1, interval: 1,
allLogs: [], allLogs: [],
pages: 1, pages: 0,
total: 0, total: 0,
enabled: true, enabled: true,
older_than: '', older_than: '',