Depending on timing, annotations could be inappropriately paged.

girder · Oct 20, 2022 · 140f6bd · 140f6bd
1 parent c9e8d46
commit 140f6bd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Bug Fixes
 - Fixed overcaching annotations ([#983](../../pull/983))
+- Depending on timing, annotations could be inappropriately paged ([#984](../../pull/984))
 
 ## 1.17.1
 

diff --git a/girder_annotation/girder_large_image_annotation/web_client/models/AnnotationModel.js b/girder_annotation/girder_large_image_annotation/web_client/models/AnnotationModel.js
@@ -229,6 +229,8 @@ let AnnotationModel = AccessControlledModel.extend({
                         }
                         return null;
                     });
+                } else {
+                    this._nextFetch = null;
                 }
             }
             if (this._inFetch !== 'centroids') {
@@ -247,7 +249,9 @@ let AnnotationModel = AccessControlledModel.extend({
                 if (this._nextFetch) {
                     var nextFetch = this._nextFetch;
                     this._nextFetch = null;
-                    nextFetch();
+                    if (this._pageElements !== false) {
+                        nextFetch();
+                    }
                 }
             }
         });