diff --git a/APPL/FAC/fac_current_tab_save.asp b/APPL/FAC/fac_current_tab_save.asp index 93f67d30f7..c0bdb946bd 100644 --- a/APPL/FAC/fac_current_tab_save.asp +++ b/APPL/FAC/fac_current_tab_save.asp @@ -68,6 +68,9 @@ if (!oRs.eof) // Bestaande autoopen, dus verwijderen var sql_d = "DELETE FROM fac_menu" + " WHERE fac_menu_key = " + oRs("fac_menu_key").Value; + // The following 2 lines can be removed after DB34 + if (autoopenttl == L("lcl_shared_loading")) + sql_d += " OR (prs_perslid_key = " + user_key + " AND fac_menu_altlabel IS NULL)" Oracle.Execute(sql_d, true); result.toaster = (taboption == "T" ? L("lcl_current_tab_unsaved") : L("lcl_current_fav_unsaved")); removed = true; diff --git a/APPL/Localscripts/FcltJquery.js b/APPL/Localscripts/FcltJquery.js index 3b5ed3d7a2..98efe44cd4 100644 --- a/APPL/Localscripts/FcltJquery.js +++ b/APPL/Localscripts/FcltJquery.js @@ -408,7 +408,7 @@ function fcltPrompt(title, defval, fnSuccess, params) { text: L("lcl_submit"), click: function () { - if ($("#fcltPrompt").val() == "") + if ($.trim($("#fcltPrompt").val()) == "") { $("#fcltPrompt").addClass("missing"); FcltMgr.alert(L("lcl_shared_validator_missing")); diff --git a/APPL/Localscripts/FcltMgr.js b/APPL/Localscripts/FcltMgr.js index 93d538f50a..6502a1c9ba 100644 --- a/APPL/Localscripts/FcltMgr.js +++ b/APPL/Localscripts/FcltMgr.js @@ -372,8 +372,8 @@ var FcltMgr = this._counter++; var theId = "ID"+this._counter; - titel = titel ||L("lcl_shared_loading"); - var org_titel = titel; + titel = titel || L("lcl_shared_loading"); + var org_titel = titel.replace(/'/g, "'"); var telang = false; if (titel.length > 25) {