owl-cli 7.30.0 → 7.32.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.
|
@@ -608,8 +608,10 @@ function merge(oldObj,newObj,permissions,orgId){
|
|
|
608
608
|
var fk = k + "." + sk;
|
|
609
609
|
if(ef_field_permissions[fk] && ef_field_permissions[fk].update==='denied' || ef_field_permissions[fk] && ef_field_permissions[fk].read==='denied'){
|
|
610
610
|
// vn[fk] = vo[fk];
|
|
611
|
-
vo[sk] = vn[sk]
|
|
611
|
+
// vo[sk] = vn[sk]
|
|
612
|
+
continue;
|
|
612
613
|
}
|
|
614
|
+
vo[sk] = vn[sk];
|
|
613
615
|
}
|
|
614
616
|
}
|
|
615
617
|
}
|
|
@@ -60,10 +60,11 @@
|
|
|
60
60
|
var newdata = @projectCodeService.add( modelObject,env );
|
|
61
61
|
}
|
|
62
62
|
else {
|
|
63
|
+
modelObject._orgId = oldObj._orgId;
|
|
63
64
|
modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
|
|
64
|
-
|
|
65
|
+
|
|
65
66
|
//修复_orgIds
|
|
66
|
-
var _orgIds = [
|
|
67
|
+
var _orgIds = [modelObject._orgId];
|
|
67
68
|
if(modelObject._orgIds){
|
|
68
69
|
modelObject._orgIds.forEach(function(orgId){
|
|
69
70
|
if(typeof orgId === 'string'){
|