owl-cli 6.6.0 → 6.8.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.
|
@@ -158,8 +158,6 @@ function expandFieldPermission(permissions){
|
|
|
158
158
|
same_org:same_org,
|
|
159
159
|
sub_org:sub_org
|
|
160
160
|
}
|
|
161
|
-
|
|
162
|
-
|
|
163
161
|
}
|
|
164
162
|
function filterFields(data,permissions,orgId){
|
|
165
163
|
//根据权限，将没有权限的字段删除掉
|
|
@@ -183,7 +181,7 @@ function filterFields(data,permissions,orgId){
|
|
|
183
181
|
ef_field_permissions = field_permissions.sub_org;
|
|
184
182
|
}
|
|
185
183
|
if(typeof data[k] === 'object'){
|
|
186
|
-
if(ef_section_permissions[k].read === 'denied' || (!ef_section_permissions[k].read && ef_section_permissions["*"].read === 'denied')){
|
|
184
|
+
if((ef_section_permissions[k] && ef_section_permissions[k].read === 'denied') || ((!ef_section_permissions[k] || !ef_section_permissions[k].read) && ef_section_permissions["*"].read === 'denied')){
|
|
187
185
|
delete data[k];
|
|
188
186
|
}
|
|
189
187
|
var section = data[k];
|
|
@@ -192,7 +190,7 @@ function filterFields(data,permissions,orgId){
|
|
|
192
190
|
var r = section[i];
|
|
193
191
|
for(var fk in r){
|
|
194
192
|
var rk = k+ "." + fk;
|
|
195
|
-
if(ef_field_permissions[rk].read === 'denied' || (!ef_field_permissions[rk].read && ef_field_permissions[k+".*"].read === 'denied')){
|
|
193
|
+
if((ef_field_permissions[rk] && ef_field_permissions[rk].read === 'denied') || ((!ef_field_permissions[rk] || !ef_field_permissions[rk].read) && ef_field_permissions[k+".*"].read === 'denied')){
|
|
196
194
|
delete r[rk];
|
|
197
195
|
}
|
|
198
196
|
}
|
|
@@ -201,13 +199,12 @@ function filterFields(data,permissions,orgId){
|
|
|
201
199
|
}
|
|
202
200
|
}
|
|
203
201
|
else {
|
|
204
|
-
if(ef_field_permissions[k].read === 'denied' || (!ef_field_permissions[k].read && ef_field_permissions["*"].read === 'denied')){
|
|
202
|
+
if((ef_field_permissions[k] && ef_field_permissions[k].read === 'denied') || ((!ef_field_permissions[k] || !ef_field_permissions[k].read) && ef_field_permissions["*"].read === 'denied')){
|
|
205
203
|
delete data[k];
|
|
206
204
|
}
|
|
207
205
|
}
|
|
208
206
|
}
|
|
209
207
|
}
|
|
210
|
-
|
|
211
208
|
}
|
|
212
209
|
|
|
213
210
|
|