Snippets and Library dropdowns not working for multiple (#2156)

relates to xibosignage/xibo#3169
xibosignage · Oct 16, 2023 · 6a86718 · 6a86718
1 parent d7ea055
commit 6a86718
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/modules/calendar-form-edit.twig b/modules/calendar-form-edit.twig
@@ -242,9 +242,9 @@
                         <div class="ckeditor_controls row inline-editor-hide container-fluid" data-linked-to="template">
                             <div class="col-sm-6">
                                 <div class="form-group row">
-                                    <label class="col-sm-4 control-label" for="ckeditor_snippets_select">{% trans "Snippets" %}</label>
+                                    <label class="col-sm-4 control-label" for="ckeditor_snippets_select_template">{% trans "Snippets" %}</label>
                                     <div class="col-sm-8 ckeditor_select_container">
-                                        <select id="ckeditor_snippets_select"
+                                        <select id="ckeditor_snippets_select_template"
                                         class="ckeditor_snippets_select form-control"
                                         data-linked-to="template">
                                             <option value=""></option>
@@ -262,9 +262,9 @@
                             </div>
                             <div class="col-sm-6">
                                 <div class="form-group row">
-                                    <label class="col-sm-4 control-label" for="ckeditor_library_select2">{% trans "Library" %}</label>
+                                    <label class="col-sm-4 control-label" for="ckeditor_library_select1">{% trans "Library" %}</label>
                                     <div class="col-sm-8 ckeditor_select_container">
-                                        <select id="ckeditor_library_select2"
+                                        <select id="ckeditor_library_select1"
                                                 class="ckeditor_library_select form-control"
                                                 data-width="100%"
                                                 data-linked-to="template"
@@ -313,9 +313,9 @@
                         <div class="ckeditor_controls row current-event-template" data-linked-to="currentEventTemplate">
                             <div class="col-sm-6">
                                 <div class="form-group row">
-                                    <label class="col-sm-4 control-label" for="ckeditor_snippets_select">{% trans "Snippets" %}</label>
+                                    <label class="col-sm-4 control-label" for="ckeditor_snippets_select_current">{% trans "Snippets" %}</label>
                                     <div class="col-sm-8 ckeditor_select_container">
-                                        <select id="ckeditor_snippets_select"
+                                        <select id="ckeditor_snippets_select_current"
                                         class="ckeditor_snippets_select form-control"
                                         data-linked-to="currentEventTemplate">
                                             <option value=""></option>

diff --git a/modules/forecastio-form-edit.twig b/modules/forecastio-form-edit.twig
@@ -281,11 +281,11 @@
 
                         <div class="ckeditor_controls inline-editor-hide container-fluid" data-linked-to="currentTemplate">
                             <div class="form-group row localSelect">
-                                <label class="col-sm-2 control-label" for="ckeditor_snippets_select">{% trans "Snippets" %}</label>
+                                <label class="col-sm-2 control-label" for="ckeditor_snippets_select_current">{% trans "Snippets" %}</label>
                                 <div class="col-sm-10 ckeditor_select_container weather-type-targets">
                                     {% set weatherSnippets = module.getWeatherSnippets() %}
 
-                                    <select id="ckeditor_snippets_select" 
+                                    <select id="ckeditor_snippets_select_current" 
                                         class="ckeditor_snippets_select form-control"
                                         data-linked-to="currentTemplate"
                                         data-filter-class="">
@@ -315,15 +315,15 @@
                             <h4 class="col-12 text-left">{% trans "Daily Forecast Template" %}</h4>
                         </div>
 
-                        <div class="ckeditor_controls inline-editor-hide container-fluid" data-linked-to="currentTemplate">
+                        <div class="ckeditor_controls inline-editor-hide container-fluid" data-linked-to="dailyTemplate">
                             <div class="form-group row localSelect">
-                                <label class="col-sm-2 control-label" for="ckeditor_snippets_select">{% trans "Snippets" %}</label>
+                                <label class="col-sm-2 control-label" for="ckeditor_snippets_select_daily">{% trans "Snippets" %}</label>
                                 <div class="col-sm-10 ckeditor_select_container weather-type-targets">
                                     {% set weatherSnippets = module.getWeatherSnippets() %}
 
-                                    <select id="ckeditor_snippets_select" 
+                                    <select id="ckeditor_snippets_select_daily" 
                                         class="ckeditor_snippets_select form-control"
-                                        data-linked-to="currentTemplate"
+                                        data-linked-to="dailyTemplate"
                                         data-filter-class="">
                                         <option value=""></option>
 

diff --git a/modules/xibo-calendar-render.js.map b/modules/xibo-calendar-render.js.map