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

PNBR#25019: rechten objectenbeheer gaat niet goed. Alleen schrijf disciplines in zoekscherm.

Browse Source 
FSN#25803: Objectenbeheer groep selector bugt bij klikken soort als er 1 disc/grp/srt is.

svn path=/Website/trunk/; revision=17192
This commit is contained in:
Maykel Geerdink
2013-03-14 10:57:36 +00:00
parent b9c9c7cb07
commit e8edae91f2
9 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/INS/ins_deelkoppeling.asp
View File

@@ -142,8 +142,9 @@ else
module: "INS",
perslidKey: user_key,
autfunctionKey: authparams.autfunctionkey,
autRW: "W",
onChange: "onChangeDiscipline", // disgroepChanged
readonly: (disc_key > 0 || obj_key > 0 || copy),
readonly: (disc_key > 0 || obj_key > 0 || copy), // disc_key heeft altijd een waarde dus discipline is altijd readonly
required: true
});

1
APPL/INS/ins_edit_deel.asp
View File

@@ -540,6 +540,7 @@ var tekenbaar = false;
module: module,
perslidKey: user_key,
autfunctionKey: authparams.autfunctionkey,
autRW: "W",
onChange: "onChangeDiscipline", // disgroepChanged
readonly: (disc_key > 0 || ins_key > 0 || copy),
required: true

1
APPL/INS/ins_edit_srtdeel.asp
View File

@@ -141,6 +141,7 @@ else
{ label: L("lcl_discipline"),
disc_key: srtdeel.disc_key,
autfunctionKey: authparams.autfunctionkey,
autRW: "W",
module: "INS",
perslidKey: user_key,
onChange: "onChangeDiscipline",

1
APPL/INS/ins_search.asp
View File

@@ -149,6 +149,7 @@ var authparams = user.checkAutorisation(autfunction);
filtercode: insInspect? "I" : null, // dan alleen disciplines met inspecties
perslidKey: user_key,
autfunctionKey: authparams.autfunctionkey,
autRW: "R",
onChange: "onChangeDiscipline", // disgroepChanged
readonly: dis_key > 0,
trclass: "primsearch"

1
APPL/INS/ins_srtdeel_search.asp
View File

@@ -50,6 +50,7 @@ var srtgroep_key = getQParamInt("srtgroep_key", -1);
{ label: L("lcl_discipline"),
disc_key: disc_key,
autfunctionKey: authparams.autfunctionkey,
autRW: "R",
module: "INS",
perslidKey: user_key,
onChange: "onChangeDiscipline",

1
APPL/MLD/mld_edit_meldracht.asp
View File

@@ -153,6 +153,7 @@ function meldracht_submit()
module: "MLD",
perslidKey: user_key,
autfunctionKey: authparams.autfunctionkey,
autRW: "W",
srtdisc_key: srtdisckey,
onChange: "onChangeVakgroep",
required: true

3
APPL/Shared/Suggest/SuggestDiscipline.asp
View File

@@ -9,6 +9,7 @@
filtcode beperk de lijst met getoonde locaties TO BE DEFINED
perslidKey : verplicht Voor wie is de discipline
autfunctionKey: verplicht fac_function_key of -1 als alles toegestaan
autRW: verplicht indien autfunctionKey > -1 is. Geeft aan of er read or write autorisatie geldt.
autfunction : verplicht:
Globals:
Context:
@@ -27,6 +28,7 @@ DOCTYPE_Disable = 1;
<%
var chars = getQParam("k", null);
var autfunctionKey = getQParamInt("autfunctionKey");
var autRW = getQParam("autRW", "W");
var bAll = getQParamInt("SuggestAll", 0) == 1;
var srtdisc_key = getQParamInt("srtdisc_key", -1);
var disc_key = getQParamInt("disc_key", -1);
@@ -39,6 +41,7 @@ var filtcode = getQParam("filtcode", "");
var chars = chars.replace(/\*/g,"%");
var params = { autfunctionKey: autfunctionKey,
autRW: autRW,
module: module,
srtdisc_key: srtdisc_key,
disc_key: disc_key,

4
APPL/Shared/Suggest/disciplineFilter.inc
View File

@@ -99,8 +99,8 @@ function getFiltClauseDiscipline(pfiltcode, params)
+ " (SELECT ins_discipline_key"
+ " FROM fac_v_webgebruiker fw"
+ " WHERE fac_functie_key = "+ params.autfunctionKey
+ " AND fac_gebruiker_prs_level_read <= " + same_level
+ " AND fac_gebruiker_alg_level_read < 9" // extra: Vooral voor MLDUSE gebruikers met alleen PRS-leesrechten
+ " AND fac_gebruiker_prs_level_" + (params.autRW == "R"? "read" : "write") + " <= " + same_level
+ " AND fac_gebruiker_alg_level_" + (params.autRW == "R"? "read" : "write") + " < 9" // extra: Vooral voor MLDUSE gebruikers met alleen PRS-leesrechten
+ " AND prs_perslid_key=" + user_key
+ " AND fw.ins_discipline_key= td.ins_discipline_key" + ")";
}

2
APPL/Shared/disciplineselector.inc
View File

@@ -22,6 +22,7 @@
en leeg weergegeven moet worden (true|false(default)).
readonly: geeft aan of het veld readonly weergegeven moet worden (true|false(default)).
dohide: verberg de discipline selector
autRW: Geeft aan of er read or write autorisatie geldt.
*/ %>
<!-- #include file="./Suggest/disciplineFilter.inc" -->
@@ -71,6 +72,7 @@ function FCLTdisciplineselector(fieldName, objectName, params)
+ "?module=" + params.module
+ "&perslidKey=" + params.perslidKey
+ "&autfunctionKey=" + params.autfunctionKey
+ "&autRW=" + params.autRW
+ (params.srtdisc_key? "&srtdisc_key=" + params.srtdisc_key : "")
+ (params.ins_key? "&ins_key=" + params.ins_key : "")
+ (params.extracode? "&extracode=" + params.extracode : "")