owl-cli 6.29.0 → 6.30.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.
|
@@ -86,7 +86,7 @@ function getPermissions(roleId, tableId) {
|
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
function expandTablePermission(permissions) {
|
|
89
|
-
$.log("expandTablePermission,permissions=" + JSON.stringify(
|
|
89
|
+
// $.log("expandTablePermission,permissions=" + JSON.stringify(per？missions))
|
|
90
90
|
var same_org = {
|
|
91
91
|
};
|
|
92
92
|
|
|
@@ -9,7 +9,7 @@ function isScalar(o){
|
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
function isEqual(r1,r2){
|
|
12
|
-
var
|
|
12
|
+
var ignoreKeys = ['_type','_matched','_v'];
|
|
13
13
|
if(r1==null && r2==null){
|
|
14
14
|
return true;
|
|
15
15
|
}
|
|
@@ -23,6 +23,14 @@ function isEqual(r1,r2){
|
|
|
23
23
|
var ks1 = Object.keys(r1);
|
|
24
24
|
var ks2 = Object.keys(r2);
|
|
25
25
|
|
|
26
|
+
ks1 = ks1.filter(function(k){
|
|
27
|
+
return ignoreKeys.indexOf(k)===-1;
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
ks2 = ks2.filter(function(k){
|
|
31
|
+
return ignoreKeys.indexOf(k)===-1;
|
|
32
|
+
});
|
|
33
|
+
|
|
26
34
|
if(ks1.length!==ks2.length){
|
|
27
35
|
return false;
|
|
28
36
|
}
|