Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor bugs with uploads import

Browse Source
This commit is contained in:
Andrew 2022-10-02 15:54:13 -04:00
parent 5f8c0dab4c
commit 352a3e12e7
3 changed files with 207 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/classes/shared/tasks.py
View File

@ -673,6 +673,9 @@ class TasksManager:
user.id, {"pfp": self.helper.get_gravatar_image(user.email)} user.id, {"pfp": self.helper.get_gravatar_image(user.email)}
) )
# Search for old files in imports # Search for old files in imports
self.helper.ensure_dir_exists(
os.path.join(self.controller.project_root, "imports")
)
for file in os.listdir(os.path.join(self.controller.project_root, "imports")): for file in os.listdir(os.path.join(self.controller.project_root, "imports")):
if self.helper.is_file_older_than_x_days( if self.helper.is_file_older_than_x_days(
os.path.join(self.controller.project_root, "imports", file) os.path.join(self.controller.project_root, "imports", file)

11
app/frontend/templates/server/bedrock_wizard.html
View File

@ -313,7 +313,8 @@
<button id="zip_submit" type="submit" title="You must select server root dir first" disabled <button id="zip_submit" type="submit" title="You must select server root dir first" disabled
class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang']) class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
}}</button> }}</button>
<button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang']) <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
data['lang'])
}}</button> }}</button>
</div> </div>
</div> </div>
@ -460,7 +461,8 @@
<button id="upload_submit" type="submit" title="You must select server root dir first" disabled <button id="upload_submit" type="submit" title="You must select server root dir first" disabled
class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang']) class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
}}</button> }}</button>
<button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang']) <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
data['lang'])
}}</button> }}</button>
</div> </div>
</div> </div>
@ -641,6 +643,9 @@
} }
</script> </script>
<script> <script>
$(".tree-reset").on("click", function () {
location.href = "/server/bedrock_step1";
});
document.getElementById("root_files_button").addEventListener("click", function () { document.getElementById("root_files_button").addEventListener("click", function () {
if (document.forms["zip"]["server_path"].value != "") { if (document.forms["zip"]["server_path"].value != "") {
if (document.getElementById('root_files_button').classList.contains('clicked')) { if (document.getElementById('root_files_button').classList.contains('clicked')) {
@ -792,6 +797,8 @@
document.getElementById('main-tree-input-upload').setAttribute('value', data.path) document.getElementById('main-tree-input-upload').setAttribute('value', data.path)
getTreeView(data.path); getTreeView(data.path);
show_file_tree(); show_file_tree();
$("#root_files_button").attr("disabled", "disabled");
$("#root_upload_button").attr("disabled", "disabled");
}, 5000); }, 5000);
}); });

382
app/frontend/templates/server/wizard.html
View File

@ -423,7 +423,8 @@
<button id="zip_submit" type="submit" title="You must select server root dir first" disabled <button id="zip_submit" type="submit" title="You must select server root dir first" disabled
class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang']) class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
}}</button> }}</button>
<button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang']) <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
data['lang'])
}}</button> }}</button>
</div> </div>
</div> </div>
@ -588,7 +589,8 @@
<button id="upload_submit" type="submit" title="You must select server root dir first" disabled <button id="upload_submit" type="submit" title="You must select server root dir first" disabled
class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang']) class="btn btn-primary mr-2">{{ translate('serverWizard', 'importServerButton', data['lang'])
}}</button> }}</button>
<button type="reset" class="btn btn-danger mr-2">{{ translate('serverWizard', 'resetForm', data['lang']) <button type="button" class="btn btn-danger mr-2 tree-reset">{{ translate('serverWizard', 'resetForm',
data['lang'])
}}</button> }}</button>
</div> </div>
</div> </div>
@ -712,24 +714,24 @@
} }
.scroll { .scroll {
max-height: 12em; max - height: 12em;
overflow-y: auto; overflow - y: auto;
} }
.menu-btn { .menu - btn {
font-size: 0.9em; font - size: 0.9em;
padding: 2px 10px; padding: 2px 10px;
} }
.menu { .menu {
padding-top: 10px; padding - top: 10px;
z-index: 200; z - index: 200;
margin-top: 4px; margin - top: 4px;
position: absolute; position: absolute;
background-color: #2a2c44; background - color: #2a2c44;
} }
.menu-option { .menu - option {
padding: 6px 20px 6px; padding: 6px 20px 6px;
color: white; color: white;
} }
@ -738,66 +740,66 @@
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 0px; left: 0px;
width: 100%; width: 100 %;
height: 100%; height: 100 %;
z-index: 100; z - index: 100;
} }
</style> </style >
<style> <style>
/* Remove default bullets */ /* Remove default bullets */
.tree-view, .tree-view,
.tree-nested { .tree-nested {
list-style-type: none; list - style - type: none;
margin: 0; margin: 0;
padding: 0; padding: 0;
margin-left: 10px; margin-left: 10px;
} }
/* Style the items */ /* Style the items */
.tree-item, .tree-item,
.files-tree-title { .files-tree-title {
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
/* Prevent text selection */ /* Prevent text selection */
} }
/* Create the caret/arrow with a unicode, and style it */ /* Create the caret/arrow with a unicode, and style it */
.tree-caret .fa-folder { .tree-caret .fa-folder {
display: inline-block; display: inline-block;
} }
.tree-caret .fa-folder-open { .tree-caret .fa-folder-open {
display: none; display: none;
} }
/* Rotate the caret/arrow icon when clicked on (using JavaScript) */ /* Rotate the caret/arrow icon when clicked on (using JavaScript) */
.tree-caret-down .fa-folder { .tree-caret-down .fa-folder {
display: none; display: none;
} }
.tree-caret-down .fa-folder-open { .tree-caret-down .fa-folder-open {
display: inline-block; display: inline-block;
} }
/* Hide the nested list */ /* Hide the nested list */
.tree-nested { .tree-nested {
display: none; display: none;
} }
#op_logo { #op_logo {
position: relative; position: relative;
top: 50%; top: 50%;
transform: translateY(-50%); transform: translateY(-50%);
} }
</style> </style>
{% end %} {% end %}
{% block js%} {% block js %}
<script> <script>
var file; var file;
function sendFile() { function sendFile() {
file = $("#file")[0].files[0] file = $("#file")[0].files[0]
document.getElementById("upload_input").innerHTML = '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>' document.getElementById("upload_input").innerHTML = '<div class="progress"><div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">&nbsp;<i class="fa-solid fa-spinner"></i></div></div>'
let xmlHttpRequest = new XMLHttpRequest(); let xmlHttpRequest = new XMLHttpRequest();
let token = getCookie("_xsrf") let token = getCookie("_xsrf")
@ -816,13 +818,13 @@
xmlHttpRequest.setRequestHeader('X-FileName', fileName); xmlHttpRequest.setRequestHeader('X-FileName', fileName);
xmlHttpRequest.addEventListener('load', (event) => { xmlHttpRequest.addEventListener('load', (event) => {
if (event.target.responseText == 'success') { if (event.target.responseText == 'success') {
console.log('Upload for file', file.name, 'was successful!') console.log('Upload for file', file.name, 'was successful!')
document.getElementById("upload_input").innerHTML = '<div class="card-header header-sm d-flex justify-content-between align-items-center"><span id="file-uploaded" style="color: gray;">' + fileName + '</span> 🔒</div>'; document.getElementById("upload_input").innerHTML = '<div class="card-header header-sm d-flex justify-content-between align-items-center"><span id="file-uploaded" style="color: gray;">' + fileName + '</span> 🔒</div>';
document.getElementById("lower_half").style.visibility = "visible"; document.getElementById("lower_half").style.visibility = "visible";
} }
else { else {
alert('Upload failed with response: ' + event.target.responseText); alert('Upload failed with response: ' + event.target.responseText);
doUpload = false; doUpload = false;
} }
}, false); }, false);
xmlHttpRequest.addEventListener('error', (e) => { xmlHttpRequest.addEventListener('error', (e) => {
@ -832,60 +834,63 @@
} }
document.getElementById("root_files_button").addEventListener("click", function () { document.getElementById("root_files_button").addEventListener("click", function () {
if (document.forms["zip"]["server_path"].value != "") { if (document.forms["zip"]["server_path"].value != "") {
if (document.getElementById('root_files_button').classList.contains('clicked')) { if (document.getElementById('root_files_button').classList.contains('clicked')) {
document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>' document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
} else { } else {
document.getElementById('root_files_button').classList.add('clicked') document.getElementById('root_files_button').classList.add('clicked')
} }
path = document.forms["zip"]["server_path"].value; path = document.forms["zip"]["server_path"].value;
console.log(document.forms["zip"]["server_path"].value) console.log(document.forms["zip"]["server_path"].value)
var token = getCookie("_xsrf"); var token = getCookie("_xsrf");
var dialog = bootbox.dialog({ var dialog = bootbox.dialog({
message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>', message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
closeButton: false closeButton: false
}); });
$.ajax({ $.ajax({
type: "POST", type: "POST",
headers: { 'X-XSRFToken': token }, headers: {'X-XSRFToken': token },
url: '/ajax/unzip_server?id=-1&path=' + path, url: '/ajax/unzip_server?id=-1&path=' + path,
}); });
} else { } else {
bootbox.alert("You must input a path before selecting this button"); bootbox.alert("You must input a path before selecting this button");
} }
}); });
document.getElementById("root_upload_button").addEventListener("click", function () { document.getElementById("root_upload_button").addEventListener("click", function () {
if (file) { if (file) {
if (document.getElementById('root_upload_button').classList.contains('clicked')) { if (document.getElementById('root_upload_button').classList.contains('clicked')) {
document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>' document.getElementById('main-tree-div').innerHTML = '<input type="radio" id="main-tree-input-upload" name="root_path" value="" checked><span id="main-tree" class="files-tree-title tree-caret-down root-dir" data-path=""><i class="far fa-folder"></i><i class="far fa-folder-open"></i>{{ translate("serverFiles", "files", data["lang"]) }}</span></input>'
} else { } else {
document.getElementById('root_upload_button').classList.add('clicked') document.getElementById('root_upload_button').classList.add('clicked')
} }
var token = getCookie("_xsrf"); var token = getCookie("_xsrf");
var dialog = bootbox.dialog({ var dialog = bootbox.dialog({
message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>', message: '<p class="text-center mb-0"><i class="fa fa-spin fa-cog"></i> Please wait while we gather your files...</p>',
closeButton: false closeButton: false
}); });
$.ajax({ $.ajax({
type: "POST", type: "POST",
headers: { 'X-XSRFToken': token }, headers: {'X-XSRFToken': token },
url: '/ajax/unzip_server?id=-1&file=' + file.name, url: '/ajax/unzip_server?id=-1&file=' + file.name,
}); });
} else { } else {
bootbox.alert("You must input a path before selecting this button"); bootbox.alert("You must input a path before selecting this button");
} }
}); });
</script> </script>
<script> <script>
function dropDown(event) { $(".tree-reset").on("click", function () {
event.target.parentElement.children[1].classList.remove("d-none"); location.href = "/server/step1";
});
function dropDown(event) {
event.target.parentElement.children[1].classList.remove("d-none");
document.getElementById("overlay").classList.remove("d-none"); document.getElementById("overlay").classList.remove("d-none");
} }
function hide(event) { function hide(event) {
var items = document.getElementsByClassName('menu'); var items = document.getElementsByClassName('menu');
items.forEach(item => { items.forEach(item => {
item.classList.add("d-none"); item.classList.add("d-none");
@ -894,36 +899,36 @@
document.getElementById("overlay").classList.add("d-none"); document.getElementById("overlay").classList.add("d-none");
} }
$(document).ready(function () { $(document).ready(function () {
console.log('ready'); console.log('ready');
var forms = $('form.server-wizard'); var forms = $('form.server-wizard');
forms.each(function (i, formEl) { forms.each(function (i, formEl) {
var form = $(formEl); var form = $(formEl);
var min = form.find('[name=min_memory]'); var min = form.find('[name=min_memory]');
var max = form.find('[name=max_memory]'); var max = form.find('[name=max_memory]');
console.log(form, min, max) console.log(form, min, max)
min.change(function () { min.change(function () {
check_sizes(max, min, 'min'); check_sizes(max, min, 'min');
}); });
max.change(function () { max.change(function () {
check_sizes(max, min, 'max'); check_sizes(max, min, 'max');
}); });
}); });
}); });
function wait_msg(importing) { function wait_msg(importing) {
bootbox.alert({ bootbox.alert({
title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}', title: importing ? '{% raw translate("serverWizard", "importing", data["lang"]) %}' : '{% raw translate("serverWizard", "downloading", data["lang"]) %}',
message: '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}', message: '<i class="fas fa-cloud-download"></i> {% raw translate("serverWizard", "bePatient", data["lang"]) %}',
}); });
} }
function show_file_tree() { function show_file_tree() {
$("#dir_select").modal(); $("#dir_select").modal();
} }
function check_sizes(a, b, changed) { function check_sizes(a, b, changed) {
max_mem = parseFloat(a.val()); max_mem = parseFloat(a.val());
min_mem = parseFloat(b.val()); min_mem = parseFloat(b.val());
if (max_mem < min_mem && changed === 'min') { if (max_mem < min_mem && changed === 'min') {
a.val(min_mem) a.val(min_mem)
@ -933,7 +938,7 @@
} }
} }
function getTreeView(path) { function getTreeView(path) {
//If this value is still hidden we know the user is executing a zip import and not an upload //If this value is still hidden we know the user is executing a zip import and not an upload
if (document.getElementById("lower_half").visibility == "hidden") { if (document.getElementById("lower_half").visibility == "hidden") {
document.getElementById('zip_submit').disabled = false; document.getElementById('zip_submit').disabled = false;
@ -944,51 +949,51 @@
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: '/ajax/get_zip_tree?id=-1&path=' + path, url: '/ajax/get_zip_tree?id=-1&path=' + path,
dataType: 'text', dataType: 'text',
success: function (data) { success: function (data) {
console.log("got response:"); console.log("got response:");
console.log(data); console.log(data);
dataArr = data.split('\n'); dataArr = data.split('\n');
serverDir = dataArr.shift(); // Remove & return first element (server directory) serverDir = dataArr.shift(); // Remove & return first element (server directory)
text = dataArr.join('\n'); text = dataArr.join('\n');
try { try {
document.getElementById('main-tree-div').innerHTML += text; document.getElementById('main-tree-div').innerHTML += text;
document.getElementById('main-tree').parentElement.classList.add("clicked"); document.getElementById('main-tree').parentElement.classList.add("clicked");
} catch { } catch {
document.getElementById('files-tree').innerHTML = text; document.getElementById('files-tree').innerHTML = text;
} }
document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir); document.getElementsByClassName('files-tree-title')[0].setAttribute('data-path', serverDir);
document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files'); document.getElementsByClassName('files-tree-title')[0].setAttribute('data-name', 'Files');
}, },
}); });
} }
function getToggleMain(event) { function getToggleMain(event) {
path = event.target.parentElement.getAttribute('data-path'); path = event.target.parentElement.getAttribute('data-path');
document.getElementById("files-tree").classList.toggle("d-block"); document.getElementById("files-tree").classList.toggle("d-block");
document.getElementById(path + "span").classList.toggle("tree-caret-down"); document.getElementById(path + "span").classList.toggle("tree-caret-down");
document.getElementById(path + "span").classList.toggle("tree-caret"); document.getElementById(path + "span").classList.toggle("tree-caret");
} }
function getDirView(event) { function getDirView(event) {
path = event.target.parentElement.getAttribute('data-path'); path = event.target.parentElement.getAttribute('data-path');
if (document.getElementById(path).classList.contains('clicked')) { if (document.getElementById(path).classList.contains('clicked')) {
var toggler = document.getElementById(path + "span"); var toggler = document.getElementById(path + "span");
if (toggler.classList.contains('files-tree-title')) { if (toggler.classList.contains('files-tree-title')) {
document.getElementById(path + "ul").classList.toggle("d-block"); document.getElementById(path + "ul").classList.toggle("d-block");
document.getElementById(path + "span").classList.toggle("tree-caret-down"); document.getElementById(path + "span").classList.toggle("tree-caret-down");
} }
return; return;
} else { } else {
$.ajax({ $.ajax({
type: "GET", type: "GET",
@ -1021,53 +1026,56 @@
}); });
} }
} }
if (webSocket) { if (webSocket) {
webSocket.on('send_temp_path', function (data) { webSocket.on('send_temp_path', function (data) {
setTimeout(function () { setTimeout(function () {
var x = document.querySelector('.bootbox'); var x = document.querySelector('.bootbox');
if (x) { if (x) {
x.remove() x.remove()
} }
var x = document.querySelector('.modal-backdrop'); var x = document.querySelector('.modal-backdrop');
if (x) { if (x) {
x.remove() x.remove()
} }
document.getElementById('main-tree-input').setAttribute('value', data.path) document.getElementById('main-tree-input').setAttribute('value', data.path)
document.getElementById('main-tree-input-upload').setAttribute('value', data.path) document.getElementById('main-tree-input-upload').setAttribute('value', data.path)
getTreeView(data.path); getTreeView(data.path);
show_file_tree(); show_file_tree();
}, 5000); $("#root_files_button").attr("disabled", "disabled");
}); $("#root_upload_button").attr("disabled", "disabled");
}, 5000);
});
} }
function refreshCache() { function refreshCache() {
var token = getCookie("_xsrf") var token = getCookie("_xsrf")
document.getElementById("refresh-cache").classList.add("fa-spin") document.getElementById("refresh-cache").classList.add("fa-spin")
$.ajax({ $.ajax({
type: "POST", type: "POST",
headers: { 'X-XSRFToken': token }, headers: {'X-XSRFToken': token },
url: '/ajax/jar_cache', url: '/ajax/jar_cache',
success: function () { success: function () {
document.getElementById("refresh-cache").classList.remove("fa-sync"); document.getElementById("refresh-cache").classList.remove("fa-sync");
document.getElementById("refresh-cache").classList.remove("fa-spin"); document.getElementById("refresh-cache").classList.remove("fa-spin");
document.getElementById("refresh-cache").classList.add("fa-check"); document.getElementById("refresh-cache").classList.add("fa-check");
setTimeout(function () { setTimeout(function () {
location.reload(); location.reload();
}, 2000); }, 2000);
}, },
}); });
} }
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
var text = '{% raw data["js_server_types"] %}'; var text = '{% raw data["js_server_types"] %}';
var serverTypesLists = JSON.parse(text); var serverTypesLists = JSON.parse(text);
/* CountryChange() is called from the onchange event of a select element. /* CountryChange() is called from the onchange event of a select element.
* param selectObj - the select object which fired the on change event. * param selectObj - the select object which fired the on change event.
*/ */
function serverTypeChange(selectObj) { function serverTypeChange(selectObj) {
// get the index of the selected option // get the index of the selected option
var idx = document.getElementById('server_type').selectedIndex; var idx = document.getElementById('server_type').selectedIndex;
// get the value of the selected option // get the value of the selected option
@ -1076,9 +1084,9 @@
var which = document.getElementById('server_type').options[idx].value; var which = document.getElementById('server_type').options[idx].value;
} catch { } catch {
while (cSelect.options.length > 0) { while (cSelect.options.length > 0) {
cSelect.remove(0); cSelect.remove(0);
} }
return; return;
} }
let server_type = which.split('|')[0]; let server_type = which.split('|')[0];
let server = which.split('|')[1]; let server = which.split('|')[1];
@ -1095,29 +1103,29 @@
// create new options ordered by ascending // create new options ordered by ascending
cList[server].forEach(type => { cList[server].forEach(type => {
newOption = document.createElement("option"); newOption = document.createElement("option");
newOption.value = which + "|" + type; // assumes option string and value are the same newOption.value = which + "|" + type; // assumes option string and value are the same
newOption.text = type; newOption.text = type;
// add the new option // add the new option
try { try {
cSelect.add(newOption); // this will fail in DOM browsers but is needed for IE cSelect.add(newOption); // this will fail in DOM browsers but is needed for IE
} }
catch (e) { catch (e) {
cSelect.appendChild(newOption); cSelect.appendChild(newOption);
} }
}) })
} }
function serverJarChange(selectObj) { function serverJarChange(selectObj) {
let type_select = document.getElementById('server_jar') let type_select = document.getElementById('server_jar')
let tidx = type_select.selectedIndex; let tidx = type_select.selectedIndex;
let val = type_select.options[tidx].value; let val = type_select.options[tidx].value;
if (val == 'None') { if (val == 'None') {
var jcSelect = document.getElementById("server_type"); var jcSelect = document.getElementById("server_type");
while (jcSelect.options.length > 0) { while (jcSelect.options.length > 0) {
jcSelect.remove(0); jcSelect.remove(0);
} }
serverTypeChange(selectObj); serverTypeChange(selectObj);
return; return;
} }
// get the index of the selected option // get the index of the selected option
var jidx = selectObj.selectedIndex; var jidx = selectObj.selectedIndex;
@ -1136,17 +1144,17 @@
// create new options ordered by ascending // create new options ordered by ascending
jcList.forEach(type => { jcList.forEach(type => {
jnewOption = document.createElement("option"); jnewOption = document.createElement("option");
jnewOption.value = jwhich + "|" + type; // assumes option string and value are the same jnewOption.value = jwhich + "|" + type; // assumes option string and value are the same
jnewOption.text = type; jnewOption.text = type;
// add the new option // add the new option
try { try {
jcSelect.add(jnewOption); // this will fail in DOM browsers but is needed for IE jcSelect.add(jnewOption); // this will fail in DOM browsers but is needed for IE
} }
catch (e) { catch (e) {
jcSelect.appendChild(jnewOption); jcSelect.appendChild(jnewOption);
} }
}) })
serverTypeChange(selectObj); serverTypeChange(selectObj);
} }
</script> </script>
{% end %} {% end %}