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

PCHD#55257 Contractbeheer - beperkte autorisatie

Browse Source 
svn path=/Website/trunk/; revision=41433
This commit is contained in:
Erik Groener
2019-03-11 07:55:08 +00:00
parent 7c40b0b5f5
commit bb16c2e1f2
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
APPL/CNT/cnt.inc
View File

@@ -1100,9 +1100,12 @@ cnt = { setcontractstatus:
// Inactivate/Sluiten CNTMSU + 0 + cnt_inactivate_mode = 0 CNTMSU + 0 + cnt_inactivate_mode = 1 Zie kolomen CNTUSE en CNTMAN
var haveCNTMSUrights = user.checkAutorisation("WEB_CNTMSU", true) != null; // Pas op: disciplineloos dus niet in cresult!
cresult.canChangeFlex = (((actief || inactief) && cresult.canMANwrite) ||
((!inactief) && S("cnt_contract_approval") == 1 && cresult.canUSEwrite)) &&
(pcnt_contract_key == newestkey);
cresult.canChangeFlex = (( ((actief || inactief) && cresult.canMANwrite)
|| ((!inactief) && S("cnt_contract_approval") == 1 && cresult.canUSEwrite)
)
&& (pcnt_contract_key == newestkey)
)
|| (S("cntuse_can_edit_datum") && this_cnt.canUSEwrite);
cresult.canSplit = cresult.canChangeFlex &&
!cnt_info.isAbonnement &&
!nieuw;

2
APPL/CNT/cnt_edit_contract.asp
View File

@@ -46,7 +46,7 @@ if (cnt_key > -1)
var cnt_info = cnt.cnt_contract_info(cnt_key); // nog heel beperkt
var this_cnt = cnt.func_enabled_contract(cnt_key, cnt_info); // Wat heb ik zoal aan rechten op dit contract?
user.auth_required_or_abort(this_cnt.canChange || (S("cntuse_can_edit_datum") && this_cnt.canUSEwrite && this_cnt.canMANwrite) );
user.auth_required_or_abort(this_cnt.canChange);
if (!cnt_info.locked_user_key || cnt_info.locked_user_key == user_key)
{

2
APPL/CNT/cnt_edit_contract_save.asp
View File

@@ -39,7 +39,7 @@ if (!isNew)
{
var cnt_info = cnt.cnt_contract_info(cnt_key); // Haal gegevens van het contract op.
var this_cnt = cnt.func_enabled_contract(cnt_key, cnt_info); // Wat heb ik zoal aan rechten op dit contract?
user.auth_required_or_abort(this_cnt.canChange || (S("cntuse_can_edit_datum") && this_cnt.canUSEread && this_cnt.canMANwrite) );
user.auth_required_or_abort(this_cnt.canChange);
}
else
{ // Nieuw contract

4
APPL/CNT/cnt_show_contract.asp
View File

@@ -216,7 +216,7 @@ var urlMail = "../shared/queuemail.asp?pcode=CNTMAI&defemail_key=" + defemail_ke
var isLocked = (cnt_info.locked_user_key && cnt_info.locked_user_key != user_key);
if (cnt_info.verwijderdatum == null && !isLocked)
{
if (this_cnt.canChange || (S("cntuse_can_edit_datum") && this_cnt.canUSEwrite && this_cnt.canMANwrite) )
if (this_cnt.canChange)
buttons.push({title: L("lcl_change"), icon: "wijzigen.png", action:"cnt_change()" });
if (this_cnt.canCopy)
buttons.push({title: L("lcl_cnt_copy"), icon: "fa-copy", action: "cnt_copy()"});
@@ -228,7 +228,7 @@ var urlMail = "../shared/queuemail.asp?pcode=CNTMAI&defemail_key=" + defemail_ke
buttons.push({title: L("lcl_shared_order"), icon: "mld_order.png", action:"cnt_orders()" });
}
if (this_cnt.canSplit || (S("cntuse_can_edit_datum") && this_cnt.canUSEwrite && this_cnt.canMANwrite) )
if (this_cnt.canSplit)
buttons.push({title: L("lcl_cnt_newversion"), icon: "newversion.png", action:"cnt_newversion()", tooltip: L("lcl_cnt_newversion_hint")}); // CNT#16529
if (this_cnt.canInactivate)
buttons.push({title: L("lcl_cnt_inactivate") , action:"cnt_inactivate()", icon: "cnt_inactive.png"});

2
APPL/CNT/cnt_split.asp
View File

@@ -21,7 +21,7 @@ var cnt_key = getQParamInt("cnt_key");
var cnt_info = cnt.cnt_contract_info(cnt_key);
var this_cnt = cnt.func_enabled_contract(cnt_key, cnt_info); // Wat heb ik zoal aan rechten op dit contract?
user.auth_required_or_abort(this_cnt.canSplit || (S("cntuse_can_edit_datum") && this_cnt.canUSEwrite && this_cnt.canMANwrite)); // Kan ik dit contract splitten
user.auth_required_or_abort(this_cnt.canSplit); // Kan ik dit contract splitten
var sql = "SELECT cnt_contract_looptijd_van mindate"
+ " , cnt_contract_looptijd_tot maxdate"