Merge pull request #3433 from projectblacklight/release-4x-3431-dupli…

…cate-ids [4.x] Fix duplicate item panel IDs
projectblacklight · Feb 7, 2025 · 68264af · 68264af
2 parents 6a95f72 + 87a292d
commit 68264af
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/app/assets/javascripts/spotlight/spotlight.esm.js b/app/assets/javascripts/spotlight/spotlight.esm.js
diff --git a/app/assets/javascripts/spotlight/spotlight.esm.js.map b/app/assets/javascripts/spotlight/spotlight.esm.js.map
diff --git a/app/assets/javascripts/spotlight/spotlight.js b/app/assets/javascripts/spotlight/spotlight.js
diff --git a/app/assets/javascripts/spotlight/spotlight.js.map b/app/assets/javascripts/spotlight/spotlight.js.map
diff --git a/app/javascript/spotlight/admin/blocks/browse_block.js b/app/javascript/spotlight/admin/blocks/browse_block.js
@@ -36,7 +36,7 @@ SirTrevor.Blocks.Browse = (function(){
       }
       var resource_id = data.slug || data.id;
       var markup = `
-           <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId("item_" + data.id)}">
+           <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId(index)}">
             <input type="hidden" name="item[${index}][id]" value="${resource_id}" />
             <input type="hidden" name="item[${index}][full_title]" value="${(data.full_title || data.title)}" />
             <input data-property="weight" type="hidden" name="item[${index}][weight]" value="${data.weight}" />

diff --git a/app/javascript/spotlight/admin/blocks/browse_group_categories_block.js b/app/javascript/spotlight/admin/blocks/browse_group_categories_block.js
@@ -42,7 +42,7 @@ SirTrevor.Blocks.BrowseGroupCategories = (function(){
       }
       var resource_id = data.slug || data.id;
       var markup = `
-        <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId("item_" + data.id)}">
+        <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId(index)}">
           <input type="hidden" name="item[${index}][id]" value="${resource_id}" />
           <input type="hidden" name="item[${index}][title]" value="${data.title}" />
           <input data-property="weight" type="hidden" name="item[${index}][weight]" value="${data.weight}" />

diff --git a/app/javascript/spotlight/admin/blocks/resources_block.js b/app/javascript/spotlight/admin/blocks/resources_block.js
@@ -70,7 +70,7 @@ Core.Block.Resources = (function(){
       }
       var resource_id = data.slug || data.id;
       var markup = `
-          <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId("item_" + data.id)}">
+          <li class="field form-inline dd-item dd3-item" data-resource-id="${resource_id}" data-id="${index}" id="${this.formId(index)}">
             <input type="hidden" name="item[${index}][id]" value="${resource_id}" />
             <input type="hidden" name="item[${index}][title]" value="${data.title}" />
             ${this._itemPanelIiifFields(index, data)}

diff --git a/app/javascript/spotlight/admin/blocks/uploaded_items_block.js b/app/javascript/spotlight/admin/blocks/uploaded_items_block.js
@@ -70,7 +70,7 @@ SirTrevor.Blocks.UploadedItems = (function(){
       var dataUrl = data.url || data.file.url;
 
       var markup = `
-          <li class="field form-inline dd-item dd3-item" data-id="${index}" id="${this.formId("item_" + dataId)}">
+          <li class="field form-inline dd-item dd3-item" data-id="${index}" id="${this.formId(index)}">
             <input type="hidden" name="item[${index}][id]" value="${dataId}" />
             <input type="hidden" name="item[${index}][title]" value="${dataTitle}" />
             <input type="hidden" name="item[${index}][url]" data-item-grid-thumbnail="true"  value="${dataUrl}"/>