Merge branch 'MDL-64194-36_block_myoverview_incorrect_pagination' of https://github.com/tomdickman/moodle into MOODLE_36_STABLE

2019-04-01 14:36:24 +08:00
parent 21e0be247c a9883c6ee7
commit 77fe79ff6d
2 changed files with 2 additions and 2 deletions
@@ -499,7 +499,7 @@ function(
                        }

                        // Set the last page to either the current or next page
-                        if (loadedPages[currentPage].courses.length < pageData.limit) {
+                        if (loadedPages[currentPage].courses.length < pageData.limit || !remainingCourses.length) {
                            lastPage = currentPage;
                            actions.allItemsLoaded(currentPage);
                        } else if (loadedPages[currentPage + 1] != undefined