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

HSLE#36898 Vastpinnen tabbladen: max aantal vergroten

Browse Source 
svn path=/Website/trunk/; revision=31090
This commit is contained in:
Erik Groener
2016-10-14 08:39:06 +00:00
parent 3ba16303e3
commit 0eda3301ca
2 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/FAC/Facilitor.asp
View File

@@ -85,10 +85,13 @@
var oRs = Oracle.Execute(sql);
while (!oRs.eof)
{
autoopen.push({ u: oRs("fac_menu_alturl").Value || "",
t: oRs("fac_menu_altlabel").Value || "",
f: oRs("fac_menu_filter").Value || ""
});
var menu_tab = { u: oRs("fac_menu_alturl").Value || "",
t: oRs("fac_menu_altlabel").Value || "",
f: oRs("fac_menu_filter").Value || ""
};
if (menu_tab.u == S("fac_firstlogin_url"))
menu_tab.activate = true;
autoopen.push(menu_tab);
oRs.MoveNext();
}
oRs.Close();

42
APPL/Shared/Login.inc
View File

@@ -116,14 +116,12 @@ function doLogin(prs_key, params)
+ " ( fac_menu_altlabel"
+ " , fac_menu_alturl"
+ " , fac_menu_altgroep"
+ " , fac_menu_filter"
+ " , prs_perslid_key"
+ " , fac_menu_volgnr"
+ " ) VALUES"
+ " (" + safe.quoted_sql(L("lcl_firstlogin_url"))
+ " ," + safe.quoted_sql(S("fac_firstlogin_url"))
+ " ,5"
+ " ,'{\"first_date\":\"' || TO_CHAR(SYSDATE,'dd-mm-yyyy') || '\"}'"
+ " ," + user_key
+ " ,(SELECT 10 + COALESCE(MAX(fac_menu_volgnr), 0)"
+ " FROM fac_menu"
@@ -134,41 +132,13 @@ function doLogin(prs_key, params)
}
else
{
var sql = "SELECT fac_menu_key"
+ " , fac_menu_filter"
+ " FROM fac_menu"
var sql = "DELETE FROM fac_menu"
+ " WHERE fac_menu_altgroep = 5"
+ " AND fac_menu_altlabel = " + safe.quoted_sql(L("lcl_firstlogin_url"))
+ " AND prs_perslid_key = " + user_key;
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
var v_key = oRs("fac_menu_key").Value;
var v_filter = JSON.parse(oRs("fac_menu_filter").Value) || {};
if (!v_filter.first_date)
{
sql = "UPDATE fac_menu"
+ " SET fac_menu_filter = '{\"first_date\":\"' || TO_CHAR(SYSDATE,'dd-mm-yyyy') || '\"}'"
+ " WHERE fac_menu_key = " + v_key;
Oracle.Execute(sql, true);
__Log("Autoopen expire date for welcome.asp set");
}
else
{
var firstDate = new Date(v_filter.first_date);
var expireDate = new Date();
expireDate.setDate(expireDate.getDate() - S("fac_firstlogin_expire"));
__Log("Autoopen expire date: " + expireDate);
if (firstDate < expireDate)
{
sql = "DELETE FROM fac_menu"
+ " WHERE fac_menu_key = " + v_key;
Oracle.Execute(sql, true);
__Log("Welcome.asp expired and removed");
}
}
}
oRs.Close();
+ " AND fac_menu_alturl = " + safe.quoted_sql(S("fac_firstlogin_url"))
+ " AND prs_perslid_key = " + user_key
+ " AND fac_menu_aanmaak < SYSDATE - " + S("fac_firstlogin_expire");
Oracle.Execute(sql, true);
__Log("Welcome.asp expired and removed");
}
var fac_lang = getQParamSafe("fac_lang", "").toUpperCase(); // overrule via param