owl-cli 6.38.0 → 6.39.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.
|
@@ -93,12 +93,9 @@ function getPermissions(roleId, tableId) {
|
|
|
93
93
|
|
|
94
94
|
function expandTablePermission(permissions) {
|
|
95
95
|
// $.log("expandTablePermission,permissions=" + JSON.stringify(per？missions))
|
|
96
|
-
var same_org = {
|
|
97
|
-
};
|
|
96
|
+
var same_org = {};
|
|
98
97
|
|
|
99
|
-
var sub_org = {
|
|
100
|
-
|
|
101
|
-
};
|
|
98
|
+
var sub_org = { };
|
|
102
99
|
|
|
103
100
|
for (var i = 0; i < permissions.length; i++) {
|
|
104
101
|
var p = permissions[i];
|
|
@@ -117,6 +114,9 @@ function expandTablePermission(permissions) {
|
|
|
117
114
|
if(same_org.list!='denied' && p.permission_same_org && p.permission_same_org.list){
|
|
118
115
|
same_org.list = p.permission_same_org.add;
|
|
119
116
|
}
|
|
117
|
+
if(same_org.listall!='denied' && p.permission_same_org && p.permission_same_org.listall){
|
|
118
|
+
same_org.listall = p.permission_same_org.add;
|
|
119
|
+
}
|
|
120
120
|
|
|
121
121
|
if(sub_org.read!='denied' && p.permission_sub_org && p.permission_sub_org.read){
|
|
122
122
|
sub_org.read = p.permission_sub_org.read;
|
|
@@ -133,6 +133,9 @@ function expandTablePermission(permissions) {
|
|
|
133
133
|
if(sub_org.list!='denied' && p.permission_sub_org && p.permission_sub_org.list){
|
|
134
134
|
sub_org.list = p.permission_sub_org.list;
|
|
135
135
|
}
|
|
136
|
+
if(sub_org.listall!='denied' && p.permission_sub_org && p.permission_sub_org.listall){
|
|
137
|
+
sub_org.listall = p.permission_sub_org.listall;
|
|
138
|
+
}
|
|
136
139
|
}
|
|
137
140
|
|
|
138
141
|
return {
|