admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCHD#53196 tabblad titels beginnend met ' leverden problemen op, pins met lege titel namen (fac_menu_altlabel) ook, deze worden er nu uitgehaald. (Ook in DB33to34)

Browse Source 
svn path=/Website/branches/v2017.3/; revision=37845
This commit is contained in:
Koen Reefman
2018-05-03 15:14:00 +00:00
parent bfb3dafe32
commit 19f1220f9d
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/FAC/fac_current_tab_save.asp
View File

@@ -68,6 +68,9 @@ if (!oRs.eof)
// Bestaande autoopen, dus verwijderen // Bestaande autoopen, dus verwijderen
var sql_d = "DELETE FROM fac_menu" var sql_d = "DELETE FROM fac_menu"
+ " WHERE fac_menu_key = " + oRs("fac_menu_key").Value; + " 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); Oracle.Execute(sql_d, true);
result.toaster = (taboption == "T" ? L("lcl_current_tab_unsaved") : L("lcl_current_fav_unsaved")); result.toaster = (taboption == "T" ? L("lcl_current_tab_unsaved") : L("lcl_current_fav_unsaved"));
removed = true; removed = true;

2
APPL/Localscripts/FcltJquery.js
View File

@@ -408,7 +408,7 @@ function fcltPrompt(title, defval, fnSuccess, params)
{ {
text: L("lcl_submit"), text: L("lcl_submit"),
click: function () { click: function () {
if ($("#fcltPrompt").val() == "") if ($.trim($("#fcltPrompt").val()) == "")
{ {
$("#fcltPrompt").addClass("missing"); $("#fcltPrompt").addClass("missing");
FcltMgr.alert(L("lcl_shared_validator_missing")); FcltMgr.alert(L("lcl_shared_validator_missing"));

4
APPL/Localscripts/FcltMgr.js
View File

@@ -372,8 +372,8 @@ var FcltMgr =
this._counter++; this._counter++;
var theId = "ID"+this._counter; var theId = "ID"+this._counter;
titel = titel ||L("lcl_shared_loading"); titel = titel || L("lcl_shared_loading");
var org_titel = titel; var org_titel = titel.replace(/'/g, "'");
var telang = false; var telang = false;
if (titel.length > 25) if (titel.length > 25)
{ {