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

KFNS#47407 Kennisbank betekenis displaymode teruggezet zodat deze weer gelijk is aan 2017.1

Browse Source 
svn path=/Website/branches/v2017.2/; revision=35831
This commit is contained in:
Koen Reefman
2017-10-27 07:57:47 +00:00
parent b8b38bad46
commit 04872defb7
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/FAC/fac_edit_faq.asp
View File

@@ -123,9 +123,9 @@ else
label: L("lcl_faq_level")
});
var displaySql = " SELECT 0, " + safe.qL("lcl_faq_display_popup") + " FROM DUAL"
var displaySql = " SELECT 2, " + safe.qL("lcl_faq_display_popup") + " FROM DUAL"
+ " UNION ALL SELECT 1, " + safe.qL("lcl_faq_display_screen") + " FROM DUAL"
+ " UNION ALL SELECT 2, " + safe.qL("lcl_faq_display_both_edit") + " FROM DUAL";
+ " UNION ALL SELECT 0, " + safe.qL("lcl_faq_display_both_edit") + " FROM DUAL";
FCLTselector("fac_faq_displaymode",
displaySql,

4
APPL/FAC/fac_show_faq.asp
View File

@@ -141,9 +141,9 @@ var canChange = canWriteFAQBOF || (canWriteFAQFOF && datum == null)
BLOCK_START("mldInfo", L("lcl_faq_itemadm"));
ROFIELDTR("fld", L("lcl_faq_level"), fac.getfaqleveltext(level));
var displaySql = " SELECT 0, " + safe.qL("lcl_faq_display_popup") + " FROM DUAL"
var displaySql = " SELECT 2, " + safe.qL("lcl_faq_display_popup") + " FROM DUAL"
+ " UNION ALL SELECT 1, " + safe.qL("lcl_faq_display_screen") + " FROM DUAL"
+ " UNION ALL SELECT 2, " + safe.qL("lcl_faq_display_both_show") + " FROM DUAL";
+ " UNION ALL SELECT 0, " + safe.qL("lcl_faq_display_both_show") + " FROM DUAL";
FCLTselector("fld",
displaySql,

8
APPL/MLD/mld.inc
View File

@@ -2775,7 +2775,7 @@ mld = {setmeldingstatus:
var filtWHERE = " AND ff.fac_faq_key = sf.fac_faq_key"
+ " AND ff.fac_faq_key = af.fac_faq_key"
+ " AND ff.fac_faq_displaymode <> 0"
+ " AND ff.fac_faq_displaymode <> 2"
+ " AND af.alg_onroerendgoed_keys = og.alg_onroerendgoed_keys(+)"
+ " AND ";
@@ -2815,7 +2815,7 @@ mld = {setmeldingstatus:
+ " , alg_v_onroerendgoed og";
var filtWHERE = " AND ff.fac_faq_key = af.fac_faq_key"
+ " AND ff.fac_faq_displaymode <> 0"
+ " AND ff.fac_faq_displaymode <> 2"
+ " AND af.alg_onroerendgoed_keys = og.alg_onroerendgoed_keys(+)";
// Stdmfilter
@@ -2882,7 +2882,7 @@ mld = {setmeldingstatus:
{
var displaymode = oRs("displaymode").Value;
// Displaymode 0; No fixed display; 1; No pop-up; 2; Show both
// Displaymode 0; Show both; 1; No pop-up; 2; No fixed display
if (!(displaymode & 1)) // Popup
{
if ( ((S("faq_kennisbank_popup") & 1) && canFAQUSEread) // Voor FE
@@ -2890,7 +2890,7 @@ mld = {setmeldingstatus:
result.popup_faq = true;
}
if (displaymode != 0)
if (displaymode != 2)
{
var data = { faq_key: oRs("fac_faq_key").Value,
has_kenm: oRs("aantal_kenm").Value > 0,

4
APPL/MLD/mld_show_melding.js
View File

@@ -358,10 +358,10 @@ function mld_show_kennisbank(data)
$(this).toggleClass('flexcollapsed');
FcltMgr.resized(window);
});
$tbl.append($newrow)
$tbl.append($newrow);
var safeanswer = $("<span>").text(data.fixed_faq[i].answer).text().replace(/\n/g, "<br>");
if (data.fixed_faq[i].hurl)
safeanswer += "<br><a href={0} target='_new'>{1}</a>".format(fixed_faq[i].hurl, fixed_faq[i].hlnk);
safeanswer += "<br><a href={0} target='_new'>{1}</a>".format(data.fixed_faq[i].hurl, data.fixed_faq[i].hlnk);
else if (data.fixed_faq[i].has_kenm)
safeanswer += "<br><div class='faqlink'><a href='javascript:showFaq("+data.fixed_faq[i].faq_key+")'>"+L('lcl_more')+"</a></div>";
$tbl.append("<tr style='display:none' class='"+data.fixed_faq[i].faq_type+"'><td class='fixedfaqanswer'><span='fclthtml'>" + safeanswer + "</span></td></tr>");