Fix - newly created notes/repositories/sources/media/submitters show HTML in select field

5 files changed, 176 insertions, 160 deletions

diff --git a/resources/views/modals/create-media-object.phtml b/resources/views/modals/create-media-object.phtml
index 26fa69108a..8586a0cc71 100644
--- a/resources/views/modals/create-media-object.phtml
+++ b/resources/views/modals/create-media-object.phtml
@@ -14,39 +14,42 @@
 </form>
 
 <script>
-  // Submit the modal form using AJAX
-  document.getElementById('wt-modal-form').addEventListener('submit', function(event) {
-    event.preventDefault();
-    let form          = event.target;
-    let modal_content = document.querySelector('#wt-ajax-modal .modal-content');
-    let select        = document.getElementById(modal_content.dataset.selectId);
+    // Submit the modal form using AJAX
+    document.getElementById("wt-modal-form").addEventListener("submit", function (event) {
+        event.preventDefault();
+        let form          = event.target;
+        let modal_content = document.querySelector("#wt-ajax-modal .modal-content");
+        let select        = document.getElementById(modal_content.dataset.selectId);
 
-    $.ajax({
-      url:         form.action,
-      type:        form.method,
-      data:        new FormData(form),
-      async:       false,
-      cache:       false,
-      contentType: false,
-      processData: false,
-      success:     function (data) {
-        if (select) {
-          // If this modal was activated by the "new" button in a select2
-          // edit control, then insert the result and select it.
-          $(select)
-            .select2()
-            .empty()
-            .append(new Option(data.text, data.id)).val(data.id)
-            .trigger('change');
+        $.ajax({
+            url:         form.action,
+            type:        form.method,
+            data:        new FormData(form),
+            async:       false,
+            cache:       false,
+            contentType: false,
+            processData: false,
+            success:     function (data) {
+                if (select) {
+                    // If this modal was activated by the "new" button in a select2
+                    // edit control, then insert the result and select it.
+                    let option       = new Option(data.text, data.id, true, true);
+                    option.innerHTML = option.innerText;
 
-          $('#wt-ajax-modal').modal('hide');
-        } else {
-          modal_content.innerHTML = data.html;
-        }
-      },
-      failure:     function (data) {
-        modal_content.innerHTML = data.html;
-      }
+                    $(select)
+                        .select2()
+                        .empty()
+                        .append(option)
+                        .trigger("change");
+
+                    $("#wt-ajax-modal").modal("hide");
+                } else {
+                    modal_content.innerHTML = data.html;
+                }
+            },
+            failure:     function (data) {
+                modal_content.innerHTML = data.html;
+            },
+        });
     });
-  });
 </script>
diff --git a/resources/views/modals/create-note-object.phtml b/resources/views/modals/create-note-object.phtml
index d1cf9d7f6c..e6b9c684e5 100644
--- a/resources/views/modals/create-note-object.phtml
+++ b/resources/views/modals/create-note-object.phtml
@@ -14,39 +14,43 @@
 </form>
 
 <script>
-  // Submit the modal form using AJAX
-  document.getElementById('wt-modal-form').addEventListener('submit', function(event) {
-    event.preventDefault();
-    let form          = event.target;
-    let modal_content = document.querySelector('#wt-ajax-modal .modal-content');
-    let select        = document.getElementById(modal_content.dataset.selectId);
+    // Submit the modal form using AJAX
+    document.getElementById("wt-modal-form").addEventListener("submit", function (event) {
+        event.preventDefault();
+        let form          = event.target;
+        let modal_content = document.querySelector("#wt-ajax-modal .modal-content");
+        let select        = document.getElementById(modal_content.dataset.selectId);
 
-    $.ajax({
-      url:         form.action,
-      type:        form.method,
-      data:        new FormData(form),
-      async:       false,
-      cache:       false,
-      contentType: false,
-      processData: false,
-      success:     function (data) {
-        if (select) {
-          // If this modal was activated by the "new" button in a select2
-          // edit control, then insert the result and select it.
-          $(select)
-            .select2()
-            .empty()
-            .append(new Option(data.text, data.id)).val(data.id)
-            .trigger('change');
+        $.ajax({
+            url:         form.action,
+            type:        form.method,
+            data:        new FormData(form),
+            async:       false,
+            cache:       false,
+            contentType: false,
+            processData: false,
+            success:     function (data) {
+                if (select) {
+                    // If this modal was activated by the "new" button in a select2
+                    // edit control, then insert the result and select it.
+                    let option       = new Option(data.text, data.id, true, true);
+                    option.innerHTML = option.innerText;
+                    option.innerHTML = data.text;
 
-          $('#wt-ajax-modal').modal('hide');
-        } else {
-          modal_content.innerHTML = data.html;
-        }
-      },
-      failure:     function (data) {
-        modal_content.innerHTML = data.html;
-      }
+                    $(select)
+                        .select2()
+                        .empty()
+                        .append(option)
+                        .trigger("change");
+
+                    $("#wt-ajax-modal").modal("hide");
+                } else {
+                    modal_content.innerHTML = data.html;
+                }
+            },
+            failure:     function (data) {
+                modal_content.innerHTML = data.html;
+            },
+        });
     });
-  });
 </script>
diff --git a/resources/views/modals/create-repository.phtml b/resources/views/modals/create-repository.phtml
index 2fe82ff154..9a2ebb393c 100644
--- a/resources/views/modals/create-repository.phtml
+++ b/resources/views/modals/create-repository.phtml
@@ -14,39 +14,42 @@
 </form>
 
 <script>
-  // Submit the modal form using AJAX
-  document.getElementById('wt-modal-form').addEventListener('submit', function(event) {
-    event.preventDefault();
-    let form          = event.target;
-    let modal_content = document.querySelector('#wt-ajax-modal .modal-content');
-    let select        = document.getElementById(modal_content.dataset.selectId);
+    // Submit the modal form using AJAX
+    document.getElementById("wt-modal-form").addEventListener("submit", function (event) {
+        event.preventDefault();
+        let form          = event.target;
+        let modal_content = document.querySelector("#wt-ajax-modal .modal-content");
+        let select        = document.getElementById(modal_content.dataset.selectId);
 
-    $.ajax({
-      url:         form.action,
-      type:        form.method,
-      data:        new FormData(form),
-      async:       false,
-      cache:       false,
-      contentType: false,
-      processData: false,
-      success:     function (data) {
-        if (select) {
-          // If this modal was activated by the "new" button in a select2
-          // edit control, then insert the result and select it.
-          $(select)
-            .select2()
-            .empty()
-            .append(new Option(data.text, data.id)).val(data.id)
-            .trigger('change');
+        $.ajax({
+            url:         form.action,
+            type:        form.method,
+            data:        new FormData(form),
+            async:       false,
+            cache:       false,
+            contentType: false,
+            processData: false,
+            success:     function (data) {
+                if (select) {
+                    // If this modal was activated by the "new" button in a select2
+                    // edit control, then insert the result and select it.
+                    let option       = new Option(data.text, data.id, true, true);
+                    option.innerHTML = option.innerText;
 
-          $('#wt-ajax-modal').modal('hide');
-        } else {
-          modal_content.innerHTML = data.html;
-        }
-      },
-      failure:     function (data) {
-        modal_content.innerHTML = data.html;
-      }
+                    $(select)
+                        .select2()
+                        .empty()
+                        .append(option)
+                        .trigger("change");
+
+                    $("#wt-ajax-modal").modal("hide");
+                } else {
+                    modal_content.innerHTML = data.html;
+                }
+            },
+            failure:     function (data) {
+                modal_content.innerHTML = data.html;
+            },
+        });
     });
-  });
 </script>
diff --git a/resources/views/modals/create-source.phtml b/resources/views/modals/create-source.phtml
index 0bc7ed6494..ce6e6ae761 100644
--- a/resources/views/modals/create-source.phtml
+++ b/resources/views/modals/create-source.phtml
@@ -14,39 +14,42 @@
 </form>
 
 <script>
-  // Submit the modal form using AJAX
-  document.getElementById('wt-modal-form').addEventListener('submit', function(event) {
-    event.preventDefault();
-    let form          = event.target;
-    let modal_content = document.querySelector('#wt-ajax-modal .modal-content');
-    let select        = document.getElementById(modal_content.dataset.selectId);
+    // Submit the modal form using AJAX
+    document.getElementById("wt-modal-form").addEventListener("submit", function (event) {
+        event.preventDefault();
+        let form          = event.target;
+        let modal_content = document.querySelector("#wt-ajax-modal .modal-content");
+        let select        = document.getElementById(modal_content.dataset.selectId);
 
-    $.ajax({
-      url:         form.action,
-      type:        form.method,
-      data:        new FormData(form),
-      async:       false,
-      cache:       false,
-      contentType: false,
-      processData: false,
-      success:     function (data) {
-        if (select) {
-          // If this modal was activated by the "new" button in a select2
-          // edit control, then insert the result and select it.
-          $(select)
-            .select2()
-            .empty()
-            .append(new Option(data.text, data.id)).val(data.id)
-            .trigger('change');
+        $.ajax({
+            url:         form.action,
+            type:        form.method,
+            data:        new FormData(form),
+            async:       false,
+            cache:       false,
+            contentType: false,
+            processData: false,
+            success:     function (data) {
+                if (select) {
+                    // If this modal was activated by the "new" button in a select2
+                    // edit control, then insert the result and select it.
+                    let option       = new Option(data.text, data.id, true, true);
+                    option.innerHTML = option.innerText;
 
-          $('#wt-ajax-modal').modal('hide');
-        } else {
-          modal_content.innerHTML = data.html;
-        }
-      },
-      failure:     function (data) {
-        modal_content.innerHTML = data.html;
-      }
+                    $(select)
+                        .select2()
+                        .empty()
+                        .append(option)
+                        .trigger("change");
+
+                    $("#wt-ajax-modal").modal("hide");
+                } else {
+                    modal_content.innerHTML = data.html;
+                }
+            },
+            failure:     function (data) {
+                modal_content.innerHTML = data.html;
+            },
+        });
     });
-  });
 </script>
diff --git a/resources/views/modals/create-submitter.phtml b/resources/views/modals/create-submitter.phtml
index 8dac93c235..222726022e 100644
--- a/resources/views/modals/create-submitter.phtml
+++ b/resources/views/modals/create-submitter.phtml
@@ -14,39 +14,42 @@
 </form>
 
 <script>
-  // Submit the modal form using AJAX
-  document.getElementById('wt-modal-form').addEventListener('submit', function(event) {
-    event.preventDefault();
-    let form          = event.target;
-    let modal_content = document.querySelector('#wt-ajax-modal .modal-content');
-    let select        = document.getElementById(modal_content.dataset.selectId);
+    // Submit the modal form using AJAX
+    document.getElementById("wt-modal-form").addEventListener("submit", function (event) {
+        event.preventDefault();
+        let form          = event.target;
+        let modal_content = document.querySelector("#wt-ajax-modal .modal-content");
+        let select        = document.getElementById(modal_content.dataset.selectId);
 
-    $.ajax({
-      url:         form.action,
-      type:        form.method,
-      data:        new FormData(form),
-      async:       false,
-      cache:       false,
-      contentType: false,
-      processData: false,
-      success:     function (data) {
-        if (select) {
-          // If this modal was activated by the "new" button in a select2
-          // edit control, then insert the result and select it.
-          $(select)
-            .select2()
-            .empty()
-            .append(new Option(data.text, data.id)).val(data.id)
-            .trigger('change');
+        $.ajax({
+            url:         form.action,
+            type:        form.method,
+            data:        new FormData(form),
+            async:       false,
+            cache:       false,
+            contentType: false,
+            processData: false,
+            success:     function (data) {
+                if (select) {
+                    // If this modal was activated by the "new" button in a select2
+                    // edit control, then insert the result and select it.
+                    let option       = new Option(data.text, data.id, true, true);
+                    option.innerHTML = option.innerText;
 
-          $('#wt-ajax-modal').modal('hide');
-        } else {
-          modal_content.innerHTML = data.html;
-        }
-      },
-      failure:     function (data) {
-        modal_content.innerHTML = data.html;
-      }
+                    $(select)
+                        .select2()
+                        .empty()
+                        .append(option)
+                        .trigger("change");
+
+                    $("#wt-ajax-modal").modal("hide");
+                } else {
+                    modal_content.innerHTML = data.html;
+                }
+            },
+            failure:     function (data) {
+                modal_content.innerHTML = data.html;
+            },
+        });
     });
-  });
 </script>