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

VEBE#39163 bijlagen worden nu meegekopieert en rechten zijn aangepast

Browse Source 
svn path=/Website/trunk/; revision=33495
This commit is contained in:
Koen Reefman
2017-04-14 10:28:04 +00:00
parent 41eb8ab470
commit 38915f4397
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/CNT/cnt.inc
View File

@@ -1057,7 +1057,7 @@ cnt = { setcontractstatus:
(haveCNTMSUrights && (S("cnt_inactivate_mode") == 0 || (S("cnt_inactivate_mode") == 1 && cresult.canMANwrite))) ||
canChangeAbonnement;
cresult.canCopy = (cresult.canMANwrite && cresult.canMANread) || (S("cnt_contract_approval") == 1 && cresult.canUSEwrite && cresult.canUSEread);
cresult.canCopy = cresult.canUSEwrite && cresult.canMANwrite;
cresult.canChangeAlg = cresult.canChange &&
!(actief && cresult.canUSEwrite && !cresult.canMANwrite && !haveCNTMSUrights); // Alleen nog status Actief(0) uitsluiten bij ALLEEN CNTUSE rechten (zie overzicht hierboven).
@@ -1112,7 +1112,6 @@ cnt = { setcontractstatus:
cresult.canUSEread = cresult.canRead("WEB_CNTUSE") || cresult.mijncontract;
cresult.canUSEwrite = cresult.canWrite("WEB_CNTUSE");
cresult.canReadAny = cresult.canUSEread || cresult.canMANread;
cresult.canCopy = (cresult.canMANwrite && cresult.canMANread) || (S("cnt_contract_approval") == 1 && cresult.canUSEwrite && cresult.canUSEread);
return cresult;
},

3
APPL/CNT/cnt_edit_contract.asp
View File

@@ -40,7 +40,6 @@ if (copy)
cnt_key = -1;
transitParam = "&cnt_key="+cnt_copy_key+"&cnt_copy=1";
}
__DoLog("Koen: " + transitParam);
if (cnt_key > -1)
{
var cnt_info = cnt.cnt_contract_info(cnt_key); // nog heel beperkt
@@ -54,7 +53,7 @@ if (cnt_key > -1)
cnt_info.locked_user_key = user_key;
}
}
else // nieuw contract
else // nieuw contract of copy
{
if (copy)
{

19
APPL/CNT/cnt_edit_contract_save.asp
View File

@@ -191,6 +191,23 @@ if (!warning)
if (copy) // copy scope as well
{
var flexsql = "SELECT k_old.cnt_kenmerk_key k_old"
+ ", k_old.cnt_kenmerk_key k_new"
+ " FROM cnt_srtkenmerk t"
+ ", cnt_discipline s"
+ ", cnt_kenmerk k_old"
+ ", cnt_contract c_old"
+ " WHERE c_old.cnt_contract_key = " + cnt_copy_key
+ " AND s.ins_discipline_key = c_old.ins_discipline_key"
+ " AND k_old.cnt_srtcontract_key = s.ins_discipline_key"
+ " AND t.cnt_srtkenmerk_kenmerktype IN ('F', 'E', 'M') "
+ " AND k_old.cnt_kenmerk_verwijder IS NULL "
+ " AND k_old.cnt_srtkenmerk_key = t.cnt_srtkenmerk_key "
+ " AND t.cnt_srtkenmerk_verwijder IS NULL";
CopyFlexFolders("CNT/" + subfolderKey("C", cnt_copy_key), "CNT/" + subfolderKey("C", cnt_key), flexsql);
var copyPlaatsScopeSql = "INSERT INTO cnt_contract_plaats (cnt_contract_key,"
+ " cnt_alg_plaats_code,"
+ " cnt_alg_plaats_key,"
@@ -214,8 +231,6 @@ if (!warning)
+ " WHERE cnt_contract_key = " + cnt_copy_key
+ " AND cnt_contract_object_verwijder IS NULL";
Oracle.Execute(copyObjectScopeSql);
}
if (!isNew && (cntUpd.trackarray.length || flextrack.length))