Skip to content

Commit

Permalink
fix for glossery always being overwritten.
Browse files Browse the repository at this point in the history
  • Loading branch information
TimoBoer committed Aug 29, 2023
1 parent 422d11c commit 390838e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions editor/js/toolbox.js
Expand Up @@ -4671,7 +4671,7 @@ var EDITOR = (function ($, parent) {
var grid_id = '#' + id + '_jqgrid';
var current_grid_data = JSON.stringify($(grid_id).jqGrid("getRowData"))
var form_data = new FormData(this);
if ($('#csv_merge_categoryInfo').is(":checked")) {
if ($('#csv_merge_glossary').is(":checked")) {
form_data.append("merge", "Merge");
}
form_data.append('old_data', current_grid_data)
Expand All @@ -4680,7 +4680,8 @@ var EDITOR = (function ($, parent) {

function upload_file(form_data){
var conf = false;
$('#csv_merge_categoryInfo').is(":checked") ? conf = confirm(language.UploadCSV.Info2.$label) : conf = confirm(language.UploadCSV.Info.$label);
debugger;
$('#csv_merge_glossary').is(":checked") ? conf = confirm(language.UploadCSV.Info2.$label) : conf = confirm(language.UploadCSV.Info.$label);

if(conf) {
$.ajax({
Expand Down

0 comments on commit 390838e

Please sign in to comment.