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

PNBR#41284 kennisbankitems tonen nu: 0;popup 1;altijd tonen 2;beide

Browse Source 
svn path=/Website/trunk/; revision=34961
This commit is contained in:
Koen Reefman
2017-08-16 13:22:27 +00:00
parent a3a6e8cbe5
commit 2970852750
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/FAC/fac_edit_faq.asp
View File

@@ -123,7 +123,16 @@ else
label: L("lcl_faq_level")
});
RWCHECKBOXTR("fac_faq_displaymode", "fldcheck", L("lcl_faq_displaymode"), !displaymode); // KFNS#38663 inverted
var displaySql = " SELECT 0, '" + L("lcl_faq_display_popup") + "' FROM DUAL UNION ALL "
+ " SELECT 1, '" + L("lcl_faq_display_screen") + "' FROM DUAL UNION ALL "
+ " SELECT 2, '" + L("lcl_faq_display_both_edit")+ "' FROM DUAL";
FCLTselector("fac_faq_displaymode",
displaySql,
{ label: L("lcl_faq_displaymode"),
initKey: displaymode
});
RWFIELDTR("fac_bron", "fld", L("lcl_faq_bron"), source);
if (!canWriteFAQBOF && datum==null)
ROFIELDTR("fld", L("lcl_faq_datum"), L("lcl_faq_needaccept"));

4
APPL/FAC/fac_edit_faq_save.asp
View File

@@ -30,14 +30,12 @@ var authparamsFAQBOF = user.checkAutorisation("WEB_FAQBOF", true); // Backoffice
var canWriteFAQFOF = authparamsFAQFOF && authparamsFAQFOF.PRSwritelevel < 9 && authparamsFAQFOF.ALGwritelevel < 9;
var canWriteFAQBOF = authparamsFAQBOF && authparamsFAQBOF.PRSwritelevel < 9 && authparamsFAQBOF.ALGwritelevel < 9;
var displaymode = getFParam("fac_faq_displaymode", "off") == "on" ? 0 : 1; // KFNS#38663 inverted
var fields = [ { dbs: "fac_faq_question", typ: "varchar", frm: "fac_question", len: 200 },
{ dbs: "fac_faq_answer", typ: "varchar", frm: "fac_answer" },
{ dbs: "fac_faq_source", typ: "varchar", frm: "fac_bron", len: 60 },
{ dbs: "fac_faq_url", typ: "varchar", frm: "fac_url" },
{ dbs: "fac_faq_level", typ: "number", frm: "fac_faq_level" },
{ dbs: "fac_faq_displaymode", typ: "number", val: displaymode },
{ dbs: "fac_faq_displaymode", typ: "number", frm: "fac_faq_displaymode" },
{ dbs: "prs_perslid_key", typ: "key", val: user_key },
{ dbs: "fac_faq_datum", typ: "date", frm: "date_from" },
{ dbs: "fac_faq_lang", typ: "varchar", frm: "fac_faq_lang" },

14
APPL/FAC/fac_show_faq.asp
View File

@@ -15,6 +15,7 @@
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/iface.inc" -->
<!-- #include file="../Shared/persoonselector.inc" -->
<!-- #include file="../Shared/selector.inc" -->
<!-- #include file="../fac/fac.inc" -->
<!-- #include file="faq_flexkenmerk.inc" -->
@@ -139,7 +140,18 @@ var canChange = canWriteFAQBOF || (canWriteFAQFOF && datum == null)
{
BLOCK_START("mldInfo", L("lcl_faq_itemadm"));
ROFIELDTR("fld", L("lcl_faq_level"), fac.getfaqleveltext(level));
ROCHECKBOXTR("fldcheck", L("lcl_faq_displaymode"), !displaymode);
var displaySql = " SELECT 0, '" + L("lcl_faq_display_popup") + "' FROM DUAL UNION ALL "
+ " SELECT 1, '" + L("lcl_faq_display_screen") + "' FROM DUAL UNION ALL "
+ " SELECT 2, '" + L("lcl_faq_display_both_show")+ "' FROM DUAL";
FCLTselector("fld",
displaySql,
{ label: L("lcl_faq_displaymode"),
initKey: displaymode,
readonly: true
});
ROFIELDTR("fld", L("lcl_faq_bron"), source, { suppressEmpty: true});
FCLTpersoonselector("sgPers",
"sgPers",

2
APPL/MLD/mld_faq.asp
View File

@@ -113,7 +113,7 @@ user.auth_required_or_abort(authparamsUSE || authparamsFOF);
+ " FROM fac_faq ff, "
+ " mld_stdmeldingfaq sf"
+ " WHERE fac_faq_datum < SYSDATE"
+ " AND fac_faq_displaymode = 0"
+ " AND fac_faq_displaymode <> 1"
+ " AND BITAND(fac_faq_level," + faq_bits + ") <> 0"
+ " AND (fac_faq_lang = " + safe.quoted_sql(user_lang) + " OR fac_faq_lang IS NULL)"
+ filtWHERE