Merge pull request #422 from girder/work-around-settings-cache-issue

Work around an issue with Girder's settings' cache.
girder · Feb 12, 2020 · 8f927d8 · 8f927d8
2 parents c988020 + eaf6b4d
commit 8f927d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,10 @@
 ## Unreleased
 
 ### Features
-- Added a GET large_image/sources endpoint to list versions of all installed sources
+- Added a GET large_image/sources endpoint to list versions of all installed sources (#421)
+
+### Bug Fixes
+- Fixed an issue where changing the annotation history setting when Girder's settings' cache was enable wouldn't take effect until after a restart (#422)
 
 ## Version 1.0.2
 

diff --git a/girder_annotation/girder_large_image_annotation/models/annotation.py b/girder_annotation/girder_large_image_annotation/models/annotation.py
@@ -502,10 +502,8 @@ def _copyAnnotationsFromOtherItem(self, srcItemId, destItem):
 
     def _onSettingChange(self, event):
         settingDoc = event.info
-        if settingDoc['key'] in (
-                constants.PluginSettings.LARGE_IMAGE_ANNOTATION_HISTORY, ):
-            self._historyEnabled = Setting().get(
-                constants.PluginSettings.LARGE_IMAGE_ANNOTATION_HISTORY)
+        if settingDoc['key'] == constants.PluginSettings.LARGE_IMAGE_ANNOTATION_HISTORY:
+            self._historyEnabled = settingDoc['value']
 
     def _loadAndMigrateAnnotation(self, id, *args, **kwargs):
         """