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

UWVA#48807: SLE: Kan een sleutel niet wijzigen (mis het icoontje).

Browse Source 
svn path=/Website/branches/v2017.2/; revision=35997
This commit is contained in:
Maykel Geerdink
2017-11-15 09:15:15 +00:00
parent f4dc5e9e74
commit f794aa0e98
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/INS/ins.inc
View File

@@ -541,7 +541,8 @@ ins = {checkAutLevel:
iresult.writeslebof = writeslebof;
iresult.writeslefof = writeslefof;
iresult.canDelete = writeslebof; // Verwijderen
iresult.canChange = writeslebof || objectbeheerder; // Wijzigen
iresult.canChange = writeslebof; // Wijzigen
iresult.canChangeOwn = objectbeheerder;
iresult.canChangeAlg = iresult.canChange; // Wijzigen algemene gegevens
iresult.canCopy = writeslebof; // Kopi<70>ren
iresult.isSleCil = true;
@@ -557,7 +558,7 @@ ins = {checkAutLevel:
// Daarom niet al te hard er uit klappen hier.
iresult.canReadAny = true;
iresult.canChange = iresult.canChange;
iresult.canChangeOwn = iresult.canChange || ((iresult.readuse || iresult.readman) && objectbeheerder);
iresult.canChangeOwn = (iresult.readuse || iresult.readman) && objectbeheerder;
if (params && params.srtcont_key > 0)
{

30
APPL/INS/ins_edit_deel.asp
View File

@@ -642,7 +642,7 @@ var ins_deel_aantal = 1;
extraParamField: "autonum",
extracode: "A",
onChange: "onChangeDiscipline", // disgroepChanged
readonly: (disc_key > 0 || ins_key > 0 || copy) || (!this_ins.canChangeAlg && !this_ins.canChangeOwn),
readonly: (disc_key > 0 || ins_key > 0 || copy) || (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn)),
required: true
});
@@ -653,7 +653,7 @@ var ins_deel_aantal = 1;
autfunction: autfunction,
onChange: "onChangeSrtgroep",
urlAdd: [{urlParam: "disc_key", field: "disc"}],
readonly: (ins_key > 0 || copy || module == "SLE") || (!this_ins.canChangeAlg && !this_ins.canChangeOwn),
readonly: (ins_key > 0 || copy || module == "SLE") || (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn)),
required: true
});
@@ -669,7 +669,7 @@ var ins_deel_aantal = 1;
extraParamField: "binding",
extracode: "B",
module: module,
readonly: (ins_key > 0 || copy || module == "SLE") || (!this_ins.canChangeAlg && !this_ins.canChangeOwn),
readonly: (ins_key > 0 || copy || module == "SLE") || (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn)),
required: true
});
@@ -697,15 +697,15 @@ var ins_deel_aantal = 1;
(ins_key > 0 || copy) && isNext < 0? desc : new_desc,
{ maxlength: 60,
required: true,
readonly: (!this_ins.canChangeAlg && !this_ins.canChangeOwn) || !(autonum & 2)
readonly: (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn)) || !(autonum & 2)
});
if (S("ins_explode_objects") == 0)
RWFIELDTR("count", "fldshort", L("lcl_amount") + (srtdeel_eenheid ? "&nbsp;(" + srtdeel_eenheid+")" : ""), ins_deel_aantal, {datatype: "float", readonly: (!this_ins.canChangeAlg && !this_ins.canChangeOwn), required: true});
RWFIELDTR("count", "fldshort", L("lcl_amount") + (srtdeel_eenheid ? "&nbsp;(" + srtdeel_eenheid+")" : ""), ins_deel_aantal, {datatype: "float", readonly: (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn)), required: true});
else if(ins_key < 0 || isNext > 0 )
{
RWFIELDTR("count", "fldshort", L("lcl_count"), 1, {datatype: "number", readonly: (!this_ins.canChangeAlg && !this_ins.canChangeOwn)});
RWFIELDTR("count", "fldshort", L("lcl_count"), 1, {datatype: "number", readonly: (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn))});
}
RWFIELDTR("opmerk", "fld", L("lcl_ins_opmerking"), opmerk, {maxlength: 320, readonly: (!this_ins.canChangeAlg && !this_ins.canChangeOwn)}); %>
RWFIELDTR("opmerk", "fld", L("lcl_ins_opmerking"), opmerk, {maxlength: 320, readonly: (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn))}); %>
</table>
</td>
<td align="center">
@@ -745,17 +745,17 @@ var ins_deel_aantal = 1;
{ datum: aanmaak,
label: L("lcl_last_action"),
required: true,
readonly: (!this_ins.canChangeAlg && !this_ins.canChangeOwn),
readonly: (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn)),
volgnr: 1
});
FCLTcalendar("vervaldatum",
{ datum: vervaldatum,
initEmpty: vervaldatum==null,
label: L("lcl_ins_vervaldatum"),
readonly: (!this_ins.canChangeAlg && !this_ins.canChangeOwn),
readonly: (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn)),
volgnr: 2
});
RWCHECKBOXTR("ins_actief", "fldcheck", L("lcl_ins_active"), actief, {readonly: (!this_ins.canChangeAlg && !this_ins.canChangeOwn)});
RWCHECKBOXTR("ins_actief", "fldcheck", L("lcl_ins_active"), actief, {readonly: (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn))});
FCLTpersoonselector("ins_manager", // beheerder
"sgins_manager",
{ perslidKey: perslid_key_beh,
@@ -794,7 +794,7 @@ var ins_deel_aantal = 1;
label: L("lcl_prs_organisatie"),
autlevel: authparams.PRSwritelevel,
onChange: "onChangeDept",
readonly: (parent_key > 0 || isLendOut) || (!this_ins.canChangeAlg && !this_ins.canChangeOwn)
readonly: (parent_key > 0 || isLendOut) || (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn))
});
}
@@ -806,7 +806,7 @@ var ins_deel_aantal = 1;
label: L("lcl_name"),
autlevel: authparams.PRSwritelevel,
onChange: "onChangePerson",
readonly: (parent_key > 0 || isLendOut) || (!this_ins.canChangeAlg && !this_ins.canChangeOwn)
readonly: (parent_key > 0 || isLendOut) || (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn))
});
}
@@ -864,7 +864,7 @@ var ins_deel_aantal = 1;
cadSelect: true,
cadShowdiscfn: "cadShowdiscfn",
escalateOnChUp: true, // ook onLocChange als je gebouw wijzigt
readonly: (parent_key > 0 || isLendOut) || (!this_ins.canChangeAlg && !this_ins.canChangeOwn)
readonly: (parent_key > 0 || isLendOut) || (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn))
});
}
BLOCK_END();
@@ -878,13 +878,13 @@ var ins_deel_aantal = 1;
sql: sql,
params: { id: "dayshours",
initKey: uitvoertijd_eenheid,
readonly: (!this_ins.canChangeAlg && !this_ins.canChangeOwn) && uitvoertijd < 0,
readonly: (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn)) && uitvoertijd < 0,
disable: !uitvoertijd
}
}
RWFIELDTR("uitvoertijd", "fldins_uitvtijd", L("lcl_ins_uitvoertijd"), uitvoertijd? Math.round(uitvoertijd * 100000) / 100000 : ""
, {maxlength: 8, datatype: "float", html: "onChange='onChangeUitvoertijd();'", selector: selectparams
, readonly: (!this_ins.canChangeAlg && !this_ins.canChangeOwn)});
, readonly: (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn))});
BLOCK_END();
if (urole != "fo" || uitleen_flex_present) // FO ziet ze alleen als er uitleen flex zijn?

2
APPL/INS/ins_flexkenmerk.inc
View File

@@ -112,7 +112,7 @@ function generateFlexKenmerkBlock(params)
function isReadonly (volgnummer, oRs)
{ // Zonder WEB_INSMAN of WEB_SLEBOF rechten zijn flexkenmerken met volgnummer <= 100 readonly.
if (volgnummer <= 100 && ins_key > 0 && ( (!writeman && !writeslebof) && (!this_ins.canChangeAlg && !this_ins.canChangeOwn)) )
if (volgnummer <= 100 && ins_key > 0 && ( (!writeman && !writeslebof) && (!this_ins.canChangeAlg && !(this_ins.canChange || this_ins.canChangeOwn))) )
return true;
if (volgnummer >= 900 && lendout && fronto) // Fronto mag uitleenkenmerken altijd bewerken

2
APPL/INS/ins_show_deel.asp
View File

@@ -281,7 +281,7 @@ oRs.Close();
}
var buttons = [ ];
if (this_ins.canChangeOwn)
if (this_ins.canChange || this_ins.canChangeOwn)
buttons.push({title: L("lcl_change"), action: "ins_change()", icon: "wijzigen.png" });
if (canMelding)