Merge branch 'master' into edit-views-class-name

girder · Nov 13, 2024 · b23fbab · b23fbab
2 parents 87584d5 + d5f0c24
commit b23fbab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 ### Bug Fixes
 
 - Fix an issue searching for annotation metadata on items that a user doesn't have permissions to view ([#1723](../../pull/1723))
+- Fix a typo in a column header ([#1727](../../pull/1727))
 
 ## 1.30.2
 

diff --git a/girder/girder_large_image/__init__.py b/girder/girder_large_image/__init__.py
@@ -541,7 +541,7 @@ def addSettingsToConfig(config, user, name=None):
                 columns.append({'type': 'image', 'value': value, 'title': value.title()})
 
     columns.append({'type': 'record', 'value': 'name', 'title': 'Name'})
-    columns.append({'type': 'record', 'value': 'controls', 'title': 'Contols'})
+    columns.append({'type': 'record', 'value': 'controls', 'title': 'Controls'})
     columns.append({'type': 'record', 'value': 'size', 'title': 'Size'})
 
     if 'itemList' not in config:

diff --git a/girder/girder_large_image/web_client/views/configView.js b/girder/girder_large_image/web_client/views/configView.js
@@ -279,7 +279,7 @@ var ConfigView = View.extend({
             const li = {
                 columns: [
                     {type: 'record', value: 'name', title: 'Name'},
-                    {type: 'record', value: 'controls', title: 'Contols'},
+                    {type: 'record', value: 'controls', title: 'Controls'},
                     {type: 'record', value: 'size', title: 'Size'}]
             };
             const val = {itemList: li, itemListDialog: li};