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

UWVA#25933: mogelijkheid aanpassing reply to-adres bij handmatig doorsturen.

Browse Source 
svn path=/Website/trunk/; revision=18008
This commit is contained in:
Maykel Geerdink
2013-05-30 13:54:52 +00:00
parent fdab4ba9d9
commit 97246d89c7
10 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/IMP/imp_search_rap.asp
View File

@@ -39,7 +39,7 @@ var import_filenaam = oRs("fac_import_filenaam").value;
// Heb ik rechten om rapportage te zien
var this_imp = imp.func_enabled_import(import_key);
user.auth_required_or_abort(this_imp.canRead);
user.auth_required_or_abort(this_imp.canReadAny);
%>
<html>

18
APPL/INS/ins.inc
View File

@@ -463,11 +463,11 @@ ins = {checkAutLevel:
alg_key, // alg_key
null); // hier zou alleen een prs_key in mogen, we testen zo afzonderlijk
iresult.canRead = iresult.canRead("WEB_SLEBOF");
var canWrite = iresult.canWrite("WEB_SLEBOF");
iresult.canDelete = canWrite; // Verwijderen
iresult.canChange = canWrite; // Wijzigen
iresult.canCopy = canWrite; // Kopi<70>ren
iresult.canReadSLEBOF = iresult.canRead("WEB_SLEBOF");
var canWriteSLEBOF = iresult.canWrite("WEB_SLEBOF");
iresult.canDelete = canWriteSLEBOF; // Verwijderen
iresult.canChange = canWriteSLEBOF; // Wijzigen
iresult.canCopy = canWriteSLEBOF; // Kopi<70>ren
iresult.isSleCil = true;
}
else // Gewone objecten
@@ -499,10 +499,10 @@ ins = {checkAutLevel:
true); // nog even optional
if (!iresult || !iresult.anyfound)
return null;
var canWrite = prs.canWriteAfdeling(afd_key, "WEB_INSMAN");
iresult.canDelete = canWrite; // Verwijderen
iresult.canChange = canWrite; // Wijzigen
iresult.canCopy = canWrite; // Kopi<70>ren
var canWriteINSMAN = prs.canWriteAfdeling(afd_key, "WEB_INSMAN");
iresult.canDelete = canWriteINSMAN; // Verwijderen
iresult.canChange = canWriteINSMAN; // Wijzigen
iresult.canCopy = canWriteINSMAN; // Kopi<70>ren
}
else if (ins_alg_ruimte_type == "P")
{

3
APPL/MLD/mld.inc
View File

@@ -2091,6 +2091,9 @@ mld = {setmeldingstatus:
isVerantwoordelijke ||
isApprovedRead;
mresult.canReadBOF = mresult.canRead("WEB_ORDBOF");
mresult.canReadORD = mresult.canRead("WEB_MLDORD");
// Als ik enige leesrechten of schrijfrechten heb (bij schrijfrechten heb ik ook leesrechten) en ik ben geen fiatteur dan mag ik opdracht notities wijzigen/toevoegen.
mresult.canShowOpdrNote = mresult.canReadAny && !isVerantwoordelijke; // Als ik enige leesrechten heb en ik ben geen fiatteur.
mresult.canEditOpdrNote = mresult.canShowOpdrNote;

6
APPL/MLD/mld_edit_opdr_save.asp
View File

@@ -121,6 +121,7 @@ var authparamsORDBOF = user.checkAutorisation("WEB_ORDBOF", true);
var authparamsORDBO2 = user.checkAutorisation("WEB_ORDBO2", true);
var authparamsMLDORD = user.checkAutorisation("WEB_MLDORD", true);
var authparamsORDFIN = user.checkAutorisation("WEB_ORDFIN", true); // User mag gegevens aanpassen, zelfs als al TV (FSN#1791/FSN#11381) (mldfin)
var hasBOread = authparamsORDBOF || authparamsORDBO2 || authparamsMLDORD; // Als je write rechten hebt heb je zeker ook read rechten.
user.auth_required_or_abort(autoorder || authparamsORDBOF || authparamsORDBO2 || authparamsMLDORD);
@@ -613,7 +614,10 @@ if (isNew && act_key <= 0) // nieuwe opdracht
if (S("mld_opdr_ask_mail_if_unknown") && !requestApproval && !interne_uitvoerder)
{
var subjectMail = L("lcl_mld_opdr_description") + " " + mld_key + "/" + volgnr;
var urlMail = "../shared/queuemail.asp?pcode=ORDMAI&defemail_key=-1&key="+opdr_key+"&pshowcompany=1" + "&subject=" + Server.URLencode(subjectMail);
var urlMail = "../shared/queuemail.asp?pcode=ORDMAI&defemail_key=-1&key=" + opdr_key
+ "&pshowcompany=1"
+ "&subject=" + Server.URLencode(subjectMail)
+ "&mailfrom=" + (hasBOread? 1 : 0);
var url = protectQS.create(urlMail);
// Net als autoprint en asksend de parameter queuemail met doneParams mee geven zodat bij het sluiten ../shared/queuemail.asp wordt aangeroepen in CloseDetail.

7
APPL/MLD/mld_show_melding.asp
View File

@@ -51,11 +51,16 @@ var stdm_info = mld.mld_stdmeldinginfo(mld_melding.stdm);
var verynew = getQParamInt("verynew", 0) == 1 && (mld_melding.mld_status == 2 || mld_melding.mld_status == 0)&& !mld_melding.parent_key;
var this_mld = mld.func_enabled_melding(mld_key, {verynew: verynew}); // Wat heb ik zoal aan rechten op deze specifieke melding
var hasFOBOread = this_mld.canFOread || this_mld.canBOread;
user.auth_required_or_abort(this_mld.canReadAny);
lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var subjectMail = L("lcl_mld_complain") + " " + mld_key;
var urlMail="../shared/queuemail.asp?pcode=MLDMAI&defemail_key=" + mld_melding.melder_key + "&key=" + mld_key + "&subject=" + Server.URLencode(subjectMail);
var urlMail = "../shared/queuemail.asp?pcode=MLDMAI&defemail_key=" + mld_melding.melder_key
+ "&key=" + mld_key
+ "&subject=" + Server.URLencode(subjectMail)
+ "&mailfrom=" + (hasFOBOread? 1 : 0);
%>
<html>

7
APPL/MLD/mld_show_opdr.asp
View File

@@ -40,6 +40,7 @@ var frontend = (!fronto & !backo & !minfo);
var opdr_key = getQParamInt("opdr_key");
var this_opdr = mld.func_enabled_opdracht(opdr_key); // wat mag ik zoal op deze opdracht
var hasBOread = this_opdr.canReadBOF || this_opdr.canReadORD;
user.auth_required_or_abort(this_opdr.canReadAny);
// INITIALISATIE MET DE INITIEEL WEER TE GEVEN GEGEVENS
@@ -189,7 +190,11 @@ if (!oRs2.eof)
defemail_type = oRs2("defemail_type").value
}
var subjectMail = L("lcl_shared_order") + " " + mld_opdr.mld_key + "/" + mld_opdr.volgnr;
var urlMail="../shared/queuemail.asp?pcode=ORDMAI&defemail_key=" + defemail_key + "&defemail_type=" + defemail_type + "&key=" + opdr_key + "&subject=" + Server.URLencode(subjectMail);
var urlMail = "../shared/queuemail.asp?pcode=ORDMAI&defemail_key=" + defemail_key
+ "&defemail_type=" + defemail_type
+ "&key=" + opdr_key
+ "&subject=" + Server.URLencode(subjectMail)
+ "&mailfrom=" + (hasBOread? 1 : 0);
%>
<html>

2
APPL/MRK/mrk.inc
View File

@@ -78,7 +78,7 @@
false, // checkOptimistic
true); // isOptional
mresult.canRead = mresult.canRead("WEB_MRKBOF") || mresult.canRead("WEB_MRKUSE");
mresult.canReadAny = mresult.canRead("WEB_MRKBOF") || mresult.canRead("WEB_MRKUSE");
mresult.canChange = mresult.canWrite("WEB_MRKBOF") || (mresult.canWrite("WEB_MRKUSE") && prs_key == user_key);
mresult.canDelete = mresult.canWrite("WEB_MRKBOF") || (mresult.canWrite("WEB_MRKUSE") && prs_key == user_key);
mresult.canAdd = mresult.canWrite("WEB_MRKBOF") || (mresult.canWrite("WEB_MRKUSE") && prs_key == user_key);

2
APPL/MRK/mrk_delete.asp
View File

@@ -23,7 +23,7 @@ var mrk_key = getFParamInt("mrk_key");
var message = "";
var this_mrk = mrk.func_enabled_mrkbericht(mrk_key); // Wat heb ik zoal aan rechten
user.auth_required_or_abort(this_mrk.canRead);
user.auth_required_or_abort(this_mrk.canReadAny);
message = mrk.deleteBericht(mrk_key);

2
APPL/MRK/mrk_show_bericht.asp
View File

@@ -35,7 +35,7 @@ var mrk_key = getQParamInt("mrk_key");
var mrk_bericht = mrk.bericht_info(mrk_key); // Globale variabele met alle mrk_bericht informatie
var this_mrk = mrk.func_enabled_mrkbericht(mrk_key); // Wat heb ik zoal aan rechten
user.auth_required_or_abort(this_mrk.canRead);
user.auth_required_or_abort(this_mrk.canReadAny);
%>
<html>

6
APPL/PRJ/prj_show_scenario.asp
View File

@@ -68,7 +68,11 @@ if (!prj_verdieping) prj_verdieping = -1;
oRs.close();
var subjectMail = L("lcl_prj_scenario") + " " + prj_key;
var urlMail="../shared/queuemail.asp?pcode=PRJMAI&defemail_key=" + prj_perslidkey + "&defemail_type=P" + "&key=" + prj_key + "&subject=" + Server.URLencode(subjectMail);
var urlMail = "../shared/queuemail.asp?pcode=PRJMAI&defemail_key=" + prj_perslidkey
+ "&defemail_type=P"
+ "&key=" + prj_key
+ "&subject=" + Server.URLencode(subjectMail)
+ "&mailfrom=" + (authparamsBOF? 1 : 0); // Als je write rechten hebt heb je zeker ook read rechten.
%>
<html>
<head>