owl-cli 6.35.0 → 6.37.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.
|
@@ -108,7 +108,9 @@ function expandTablePermission(permissions) {
|
|
|
108
108
|
if(same_org.add!='denied' && p.permission_same_org && p.permission_same_org.add){
|
|
109
109
|
same_org.add = p.permission_same_org.add;
|
|
110
110
|
}
|
|
111
|
-
|
|
111
|
+
if(same_org.list!='denied' && p.permission_same_org && p.permission_same_org.list){
|
|
112
|
+
same_org.list = p.permission_same_org.add;
|
|
113
|
+
}
|
|
112
114
|
|
|
113
115
|
if(sub_org.read!='denied' && p.permission_sub_org && p.permission_sub_org.read){
|
|
114
116
|
sub_org.read = p.permission_sub_org.read;
|
|
@@ -122,6 +124,9 @@ function expandTablePermission(permissions) {
|
|
|
122
124
|
if(sub_org.add!='denied' && p.permission_sub_org && p.permission_sub_org.add){
|
|
123
125
|
sub_org.add = p.permission_sub_org.add;
|
|
124
126
|
}
|
|
127
|
+
if(sub_org.list!='denied' && p.permission_sub_org && p.permission_sub_org.list){
|
|
128
|
+
sub_org.list = p.permission_sub_org.list;
|
|
129
|
+
}
|
|
125
130
|
}
|
|
126
131
|
|
|
127
132
|
return {
|
|
@@ -516,6 +521,7 @@ function merge(oldObj,newObj,permissions,orgId){
|
|
|
516
521
|
function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
517
522
|
//获得有权限的对象的filter
|
|
518
523
|
var tp = expandTablePermission(permissions);
|
|
524
|
+
// $.log("tp=" + JSON.stringify(tp));
|
|
519
525
|
var filters = [];
|
|
520
526
|
var excludeFilters = [];
|
|
521
527
|
|
|
@@ -549,21 +555,6 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
|
549
555
|
"permissions.roleId.keyword":"*",
|
|
550
556
|
"permissions.list.keyword":"allowed",
|
|
551
557
|
},
|
|
552
|
-
{
|
|
553
|
-
"permissions.orgId.keyword":orgId,
|
|
554
|
-
"permissions.roleId.keyword":roleId,
|
|
555
|
-
"permissions.list.keyword":"allowed",
|
|
556
|
-
},
|
|
557
|
-
{
|
|
558
|
-
"permissions.orgId.keyword":orgId,
|
|
559
|
-
"permissions.roleId.keyword":"*",
|
|
560
|
-
"permissions.list.keyword":"allowed",
|
|
561
|
-
},
|
|
562
|
-
{
|
|
563
|
-
"permissions.orgId.keyword":"*",
|
|
564
|
-
"permissions.roleId.keyword":roleId,
|
|
565
|
-
"permissions.list.keyword":"allowed",
|
|
566
|
-
},
|
|
567
558
|
{
|
|
568
559
|
"permissions.userId.keyword":userId,
|
|
569
560
|
"permissions.list.keyword":"allowed",
|
|
@@ -591,16 +582,6 @@ function getListPermissionFilter(tableId, roleId,orgId,userId, permissions){
|
|
|
591
582
|
"permissions.roleId.keyword":roleId,
|
|
592
583
|
"permissions.list.keyword":"denied",
|
|
593
584
|
},
|
|
594
|
-
{
|
|
595
|
-
"permissions.orgId.keyword":orgId,
|
|
596
|
-
"permissions.roleId.keyword":roleId,
|
|
597
|
-
"permissions.list.keyword":"denied",
|
|
598
|
-
},
|
|
599
|
-
{
|
|
600
|
-
"permissions.orgId.keyword":"*",
|
|
601
|
-
"permissions.roleId.keyword":roleId,
|
|
602
|
-
"permissions.list.keyword":"denied",
|
|
603
|
-
},
|
|
604
585
|
{
|
|
605
586
|
"permissions.userId.keyword":userId,
|
|
606
587
|
"permissions.list.keyword":"denied",
|
|
@@ -113,7 +113,7 @@ function buildSort(sort){
|
|
|
113
113
|
var meta = spec['#meta'];
|
|
114
114
|
var isPublic = meta && meta.isPublic;
|
|
115
115
|
|
|
116
|
-
|
|
116
|
+
/*
|
|
117
117
|
if(!isPublic && orgId && orgId!=='0'){
|
|
118
118
|
filters.push({
|
|
119
119
|
"term":{
|
|
@@ -121,7 +121,7 @@ function buildSort(sort){
|
|
|
121
121
|
}
|
|
122
122
|
})
|
|
123
123
|
}
|
|
124
|
-
|
|
124
|
+
*/
|
|
125
125
|
if(meta && meta.isTree && env.orgId!=='0'){
|
|
126
126
|
if(meta.root){
|
|
127
127
|
if(meta.root.startsWith("$")){
|