owl-cli 6.52.0 → 6.54.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.
|
@@ -59,6 +59,10 @@ function diffArray(a1, a2,parentKeys){
|
|
|
59
59
|
|
|
60
60
|
for(var i=0; i<a2.length; i++){
|
|
61
61
|
var r2 = a2[i];
|
|
62
|
+
if(!r2){
|
|
63
|
+
a2[i] = {};
|
|
64
|
+
r2 = a2[i];
|
|
65
|
+
}
|
|
62
66
|
delete r2._matched;
|
|
63
67
|
}
|
|
64
68
|
|
|
@@ -248,14 +252,16 @@ function diff(obj1, obj2,parentKeys){
|
|
|
248
252
|
diff : v2
|
|
249
253
|
});
|
|
250
254
|
}
|
|
251
|
-
else{
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
255
|
+
else {
|
|
256
|
+
if (v2 != null && v2 != '') {
|
|
257
|
+
result.push({
|
|
258
|
+
type: 'added',
|
|
259
|
+
fieldKey: k2,
|
|
260
|
+
parentKeys: JSON.stringify(parentKeys),
|
|
261
|
+
oldv: null,
|
|
262
|
+
newv: v2
|
|
263
|
+
});
|
|
264
|
+
}
|
|
259
265
|
}
|
|
260
266
|
}
|
|
261
267
|
}
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
-
var diffResult =
|
|
45
|
+
var diffResult =[];
|
|
46
46
|
var tableId = 'owl_' + spec._t;
|
|
47
47
|
var permissions = getPermissions(roleId,tableId);
|
|
48
48
|
if (!id || action==='add') {
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
else {
|
|
61
61
|
modelObject._orgIds = [modelObject._orgId].concat(getParentOrgIds(modelObject._orgId));
|
|
62
62
|
diffResult = diff(oldObj,modelObject,"");
|
|
63
|
-
|
|
63
|
+
checkUpdatePermission(modelObject,diffResult,permissions,orgId);
|
|
64
64
|
var merged = merge(oldObj,modelObject,permissions,orgId);
|
|
65
65
|
var newdata = @projectCodeService.update( merged,env);
|
|
66
66
|
}
|