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

PNBR#25330 Kennisbank rechten scherper

Browse Source 
svn path=/Website/branches/v5.2.3/; revision=16452
This commit is contained in:
Jos Groot Lipman
2013-01-07 11:29:58 +00:00
parent 54cd3c258a
commit cba1400ff8
5 changed files with 29 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
APPL/FAC/fac_faq_list.asp
View File

@@ -30,7 +30,7 @@ var showall = getQParamInt("showall", 0) == 1;
var authparamsBOF = user.checkAutorisation("WEB_FAQBOF", true); // ziet alles
var authparamsFOF = user.checkAutorisation("WEB_FAQFOF", true); // ziet ook FO-items (en eigen items)
var authparamsUSE = user.checkAutorisation("WEB_FAQUSE", true); // ziet ook FO-items (en eigen items)
var authparamsUSE = user.checkAutorisation("WEB_FAQUSE", true); // ziet ook FE-items (en eigen items)
if (searchtext != null)
{
@@ -73,10 +73,12 @@ if (searchtext != null)
if (!authparamsBOF)
{
if (!authparamsFOF)
sql += " AND BITAND (fac_faq_level, 2) = 0";
if (!authparamsUSE)
sql += " AND BITAND (fac_faq_level, 1) = 0";
var bits = 0;
if (authparamsFOF)
bits += 2;
if (authparamsUSE)
bits += 1;
sql += " AND BITAND (fac_faq_level, " + bits + ") <> 0";
sql += " AND ROWNUM < " + S("faq_max_results")
+ " AND (fac_faq_datum < SYSDATE OR prs_perslid_key = " + user_key + ")"; // zelf ingevoerd zie je wel terug
}

2
APPL/MLD/mld.inc
View File

@@ -1437,7 +1437,7 @@ mld = {setmeldingstatus:
}
if (result.aantal_fofaq > 0)
{
result.canFAQUSEread = user.checkAutorisation("WEB_FAQFOF", true)!=null;
result.canFAQFOFread = user.checkAutorisation("WEB_FAQFOF", true)!=null;
}
oRs.Close();

45
APPL/MLD/mld_continue.js
View File

@@ -13,20 +13,6 @@ function process_stdm_info(data, stdmChanged) // stdmChanged is optioneel.
if ((window.stdm_info.mld_stdmelding_key||-1) < 0) // Als er geen melding (stdmelding) is geselecteerd dan return.
return;
var stdm_level = 1;
var stdm_aantal = stdm_info.aantal_fefaq;
if (!frontend)
{
stdm_level = 2;
stdm_aantal = stdm_info.aantal_fofaq;
}
if (stdm_aantal > 0 && stdm_info.canFAQUSEread && stdmChanged)
{
var url = "../mld/mld_faq.asp?stdm_key="+ $("#stdm").val() + "&faq_level=" + stdm_level;
FcltMgr.openModalDetail(url, L("lcl_mld_faq_stdmanswers"), { height: 200, width: 700, callback: mld_faq_list_callback } );
}
// Zet de discipline indien niet ingevuld.
if ($("#disc").val() <= 0 || frontend)
{
@@ -82,42 +68,11 @@ function callback_stdm_info(data, textStatus, jqXHR)
process_stdm_info(data, true); // Tweede parameter stdmChanged is true.
}
function mld_cancel()
{
FcltMgr.closeDetail(window, { cancel: true } );
}
function onChangeVakgroep(vakgroep_key)
{
$("#gebouw").removeClass("required");

18
APPL/MLD/mld_edit_melding.js
View File

@@ -403,18 +403,14 @@ function process_stdm_info(data, stdmChanged) // stdmChanged is optioneel.
if ((window.stdm_info.mld_stdmelding_key||-1) < 0) // Als er geen melding (stdmelding) is geselecteerd dan return.
return;
var stdm_level = 1;
var stdm_aantal = stdm_info.aantal_fefaq;
if (!frontend)
if (stdmChanged)
{
stdm_level = 2;
stdm_aantal = stdm_info.aantal_fofaq;
}
if (stdm_aantal > 0 && stdm_info.canFAQUSEread && stdmChanged)
{
var url = "../mld/mld_faq.asp?stdm_key="+ $("#stdm").val() + "&faq_level=" + stdm_level;
FcltMgr.openModalDetail(url, L("lcl_mld_faq_stdmanswers"), { height: 200, width: 700, callback: mld_faq_list_callback } );
if ((stdm_info.aantal_fefaq > 0 && stdm_info.canFAQUSEread) ||
(stdm_info.aantal_fofaq > 0 && stdm_info.canFAQFOFread))
{
var url = "../mld/mld_faq.asp?stdm_key="+ $("#stdm").val();
FcltMgr.openModalDetail(url, L("lcl_mld_faq_stdmanswers"), { height: 200, width: 700, callback: mld_faq_list_callback } );
}
}
// UWVA#15523: indien frontend, dan is het aan kunnen geven van de prio afhankelijk van de vakgroep

20
APPL/MLD/mld_faq.asp
View File

@@ -6,8 +6,9 @@
File: mld_faq.asp
Description: (Modal)dialoog om kennisbankitems aan melding te kunnen koppelen
Parameters: stdm_key
Context:
Note:
Context: Als net een melding is gekozen komt een popup met faq's
Note: Als je zowel FO als FE rechten hebt zie je alle faq's
voor deze melding
*/
%>
@@ -20,16 +21,17 @@
FCLTHeader.Requires({ plugins: ["jQuery"] })
var mld_stdmelding_key = getQParamInt("stdm_key");
var faq_level = getQParamInt("faq_level", -1);
var authparamsFOF = user.checkAutorisation("WEB_FAQFOF", true); // ziet (ook) FO-items
var authparamsUSE = user.checkAutorisation("WEB_FAQUSE", true); // ziet (ook) FE-items
%>
<html>
<head>
<% FCLTHeader.Generate() %>
<script>
<script type='text/javascript'>
$(document).ready(function ()
{
var params = FcltMgr.dialogArguments();
$(".faqvraag").click(function() {
$(this).siblings().last().toggle();
FcltMgr.resized();
@@ -43,6 +45,12 @@ var faq_level = getQParamInt("faq_level", -1);
<div id="faqsubhead"><%=L("lcl_faq_mld_2")%></div>
<ul id="faqanswerlist">
<%
var faq_bits = 0;
if (authparamsFOF)
faq_bits += 2;
if (authparamsUSE)
faq_bits += 1;
var sql = "SELECT fac_faq_key, fac_faq_question, fac_faq_answer, fac_faq_url, fac_faq_level"
+ " FROM fac_faq ff"
+ " WHERE (mld_stdmelding_key = " + mld_stdmelding_key
@@ -50,7 +58,7 @@ var faq_level = getQParamInt("faq_level", -1);
+ " AND ins_discipline_key = (SELECT mld_ins_discipline_key"
+ " FROM mld_stdmelding "
+ " WHERE mld_stdmelding_key = " + mld_stdmelding_key + ")))"
+ (faq_level != -1 ? " AND BITAND(fac_faq_level," + faq_level + ") = " + faq_level : "")
+ " AND BITAND(fac_faq_level," + faq_bits + ") <> 0"
+ " AND fac_faq_datum < SYSDATE"
+ " AND (fac_faq_lang = '" + user_lang + "' OR fac_faq_lang IS NULL)";
var oRs = Oracle.Execute(sql);