owl-cli 6.198.0 → 6.200.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -271,16 +271,23 @@ function checkPermission(data, permissions, orgId, action) {
|
|
|
271
271
|
var ef_section_permissions = null;
|
|
272
272
|
var ef_field_permissions = null;
|
|
273
273
|
var ef_table_permissions = null;
|
|
274
|
-
if
|
|
274
|
+
if(data){
|
|
275
|
+
if (data._orgId === orgId) {
|
|
276
|
+
ef_section_permissions = section_permissions.same_org;
|
|
277
|
+
ef_field_permissions = field_permissions.same_org;
|
|
278
|
+
ef_table_permissions = table_permissions.same_org;
|
|
279
|
+
} else {
|
|
280
|
+
if(isSubOrg(data,orgId)) {
|
|
281
|
+
ef_section_permissions = section_permissions.sub_org;
|
|
282
|
+
ef_field_permissions = field_permissions.sub_org;
|
|
283
|
+
ef_table_permissions = table_permissions.sub_org;
|
|
284
|
+
}
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
else{
|
|
275
288
|
ef_section_permissions = section_permissions.same_org;
|
|
276
289
|
ef_field_permissions = field_permissions.same_org;
|
|
277
290
|
ef_table_permissions = table_permissions.same_org;
|
|
278
|
-
} else {
|
|
279
|
-
if(isSubOrg(data,orgId)) {
|
|
280
|
-
ef_section_permissions = section_permissions.sub_org;
|
|
281
|
-
ef_field_permissions = field_permissions.sub_org;
|
|
282
|
-
ef_table_permissions = table_permissions.sub_org;
|
|
283
|
-
}
|
|
284
291
|
}
|
|
285
292
|
|
|
286
293
|
if(!ef_table_permissions){
|
|
@@ -344,6 +351,7 @@ function checkUpdatePermission(data,diffresult,permissions,orgId){
|
|
|
344
351
|
var ef_section_permissions = null;
|
|
345
352
|
var ef_field_permissions = null;
|
|
346
353
|
var ef_table_permissions = null;
|
|
354
|
+
|
|
347
355
|
if (data._orgId === orgId) {
|
|
348
356
|
ef_section_permissions = section_permissions.same_org;
|
|
349
357
|
ef_field_permissions = field_permissions.same_org;
|
|
@@ -115,7 +115,18 @@ function buildSort(sort){
|
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
if(roleId!=='internal' && roleId!='0'){
|
|
118
|
-
|
|
118
|
+
try{
|
|
119
|
+
checkPermission(null,permissions,orgId,"listall");
|
|
120
|
+
}
|
|
121
|
+
catch(e){
|
|
122
|
+
var ret = {
|
|
123
|
+
state:'err',
|
|
124
|
+
msg:"permission denied"
|
|
125
|
+
}
|
|
126
|
+
out.print(JSON.stringify(ret));
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
|
|
119
130
|
}
|
|
120
131
|
|
|
121
132
|
var sr = @projectCodeService.search(mfilters, searchArgs, keyword,from, pageSize, effectiveSort, dataSource ,isRecycleBin );
|