diff --git a/app/assets/javascripts/admins.js b/app/assets/javascripts/admins.js
index 3a1702d5..f8abf681 100644
--- a/app/assets/javascripts/admins.js
+++ b/app/assets/javascripts/admins.js
@@ -52,11 +52,19 @@ $(document).on('turbolinks:load', function(){
$(".merge-user").click(function() {
// Update the path of save button
$("#merge-save-access").attr("data-path", $(this).data("path"))
-
let userInfo = $(this).data("info")
+ $("#merge-to").html("") // Clear current inputs
- $("#merge-to").html("" + userInfo.name + "" + "" + userInfo.email + "" + "" + userInfo.uid + "")
-
+ let spanName = document.createElement("span"),
+ spanEmail = document.createElement("span"),
+ spanUid = document.createElement("span");
+ spanName.innerText = userInfo.name
+ spanEmail.setAttribute('class', 'text-muted d-block')
+ spanEmail.innerText = userInfo.email
+ spanUid.setAttribute('class', 'text-muted d-block')
+ spanUid.innerText = userInfo.uid
+
+ $("#merge-to").append(spanName, spanEmail, spanUid)
})
$("#mergeUserModal").on("show.bs.modal", function() {
@@ -81,7 +89,19 @@ $(document).on('turbolinks:load', function(){
let user = $(".selectpicker").selectpicker('val')
if (user != "") {
let userInfo = JSON.parse(user)
- $("#merge-from").html("" + userInfo.name + "" + "" + userInfo.email + "" + "" + userInfo.uid + "")
+ $("#merge-from").html("") // Clear current input
+
+ let spanName = document.createElement("span"),
+ spanEmail = document.createElement("span"),
+ spanUid = document.createElement("span");
+ spanName.innerText = userInfo.name
+ spanEmail.setAttribute('class', 'text-muted d-block')
+ spanEmail.innerText = userInfo.email
+ spanUid.setAttribute('class', 'text-muted d-block')
+ spanUid.id = 'from-uid'
+ spanUid.innerText = userInfo.uid
+
+ $("#merge-from").append(spanName, spanEmail, spanUid)
}
})
}