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

DJIN#41196 flexfilespath bewerkbaar voor FACTAB (even hardcoded, met DB32 staat het goed in FAC_SET.SRC)

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34554
This commit is contained in:
Jos Groot Lipman
2017-07-06 12:13:41 +00:00
parent a51a01ef80
commit 3819f5b33b
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/FAC/fac_setting.asp
View File

@@ -43,15 +43,19 @@ var sql = "SELECT * FROM fac_setting s, prs_v_perslid_fullnames pf"
+ " AND fac_setting_key ="+fac_key;
var oRs = Oracle.Execute(sql);
if (!authFACFAC)
user.auth_required_or_abort(oRs("fac_setting_flags").Value & 1); // moet zichtbaar zijn voor PRSSYS
var functie_key = oRs("fac_functie_key").Value;
var sname = oRs("fac_setting_name").value;
var canView = authFACFAC ||
(oRs("fac_setting_flags").Value & 1) ||
(authFACTAB && (functie_key == authFACTAB.autfunctionkey || sname == 'flexfilespath'));
user.auth_required_or_abort(canView); // moet zichtbaar zijn voor PRSSYS
var isProtected = (functie_key != authPRSSYS.autfunctionkey);
canChange = (!isProtected ||
authFACFAC && functie_key == authFACFAC.autfunctionkey ||
authFACTAB && functie_key == authFACTAB.autfunctionkey)
authFACTAB && (functie_key == authFACTAB.autfunctionkey || sname == 'flexfilespath'))
%>
@@ -165,7 +169,6 @@ canChange = (!isProtected ||
if (canChange)
buttons.push ({title: L("lcl_submit"), icon: "opslaan.png", action: "doSubmit()" });
buttons.push( {title: L("lcl_cancel"), icon: "undo.png", action: "doCancel()" } );
var sname = oRs("fac_setting_name").value;
if (fac_key > 0)
{
var historytitle = sname;

4
APPL/FAC/fac_setting_save.asp
View File

@@ -31,10 +31,12 @@ var sql = "SELECT * FROM fac_setting s"
var oRs = Oracle.Execute(sql);
var functie_key = oRs("fac_functie_key").Value;
var sname = oRs("fac_setting_name").value;
var isProtected = (functie_key != authPRSSYS.autfunctionkey);
canChange = (!isProtected ||
authFACFAC && functie_key == authFACFAC.autfunctionkey ||
authFACTAB && functie_key == authFACTAB.autfunctionkey)
authFACTAB && (functie_key == authFACTAB.autfunctionkey || sname == 'flexfilespath'))
user.auth_required_or_abort(canChange);

20
APPL/FAC/fac_settings_list.asp
View File

@@ -28,6 +28,7 @@ var outputmode = getQParamInt("outputmode", 0);
var autfunction = "WEB_PRSSYS";
var authparams = user.checkAutorisation(autfunction);
var hasFACFAC = user.checkAutorisation("WEB_FACFAC", true);
var hasFACTAB = user.checkAutorisation("WEB_FACTAB", true);
var overruled = (getQParam("is_overrule", "") == "on")
FCLTHeader.Requires({ plugins: ["jQuery"] })
@@ -60,16 +61,15 @@ FCLTHeader.Requires({ plugins: ["jQuery"] })
+ " OR UPPER(fac_setting_pvalue) LIKE " + safe.quoted_sql_wild("%" + zoek + "%")
+ ")"
: "")
+ (smodule != "-1"
? " AND fac_setting_module = " + safe.quoted_sql(smodule)
: "")
+ (!hasFACFAC
? " AND BITAND (fac_setting_flags, 1) = 1" // zichtbaar voor PRSSYS
:"")
+ (overruled
? " AND fac_setting_pvalue IS NOT NULL"
:"")
+ " ORDER BY fac_setting_name";
if (smodule != "-1")
sqln += " AND fac_setting_module = " + safe.quoted_sql(smodule);
if (!hasFACFAC)
sqln += " AND (BITAND (fac_setting_flags, 1) = 1" // zichtbaar voor PRSSYS
+ (hasFACTAB? " OR fac_functie_code = 'WEB_FACTAB' OR fac_setting_name = 'flexfilespath'":"")
+ ")"
if (overruled)
sqln += " AND fac_setting_pvalue IS NOT NULL";
sqln += " ORDER BY fac_setting_name";