owl-cli 6.21.0 → 6.22.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,6 +86,7 @@ function getPermissions(roleId, tableId) {
|
|
|
86
86
|
}
|
|
87
87
|
|
|
88
88
|
function expandTablePermission(permissions) {
|
|
89
|
+
$.log("expandTablePermission,permissions=" + JSON.stringify(permissions))
|
|
89
90
|
var same_org = {
|
|
90
91
|
};
|
|
91
92
|
|
|
@@ -95,31 +96,31 @@ function expandTablePermission(permissions) {
|
|
|
95
96
|
|
|
96
97
|
for (var i = 0; i < permissions.length; i++) {
|
|
97
98
|
var p = permissions[i];
|
|
98
|
-
if(same_org.read!='denied' && p.
|
|
99
|
-
same_org.read = p.
|
|
99
|
+
if(same_org.read!='denied' && p.permission_same_org && p.permission_same_org.read){
|
|
100
|
+
same_org.read = p.permission_same_org.read;
|
|
100
101
|
}
|
|
101
|
-
if(same_org.update!='denied' && p.
|
|
102
|
-
same_org.update = p.
|
|
102
|
+
if(same_org.update!='denied' && p.permission_same_org && p.permission_same_org.update){
|
|
103
|
+
same_org.update = p.permission_same_org.update;
|
|
103
104
|
}
|
|
104
|
-
if(same_org.del!='denied' && p.
|
|
105
|
-
same_org.del = p.
|
|
105
|
+
if(same_org.del!='denied' && p.permission_same_org && p.permission_same_org.del){
|
|
106
|
+
same_org.del = p.permission_same_org.del;
|
|
106
107
|
}
|
|
107
|
-
if(same_org.add!='denied' && p.
|
|
108
|
-
same_org.add = p.
|
|
108
|
+
if(same_org.add!='denied' && p.permission_same_org && p.permission_same_org.add){
|
|
109
|
+
same_org.add = p.permission_same_org.add;
|
|
109
110
|
}
|
|
110
111
|
|
|
111
112
|
|
|
112
|
-
if(sub_org.read!='denied' && p.
|
|
113
|
-
sub_org.read = p.
|
|
113
|
+
if(sub_org.read!='denied' && p.permission_sub_org && p.permission_sub_org.read){
|
|
114
|
+
sub_org.read = p.permission_sub_org.read;
|
|
114
115
|
}
|
|
115
|
-
if(sub_org.update!='denied' && p.
|
|
116
|
-
sub_org.update = p.
|
|
116
|
+
if(sub_org.update!='denied' && p.permission_sub_org && p.permission_sub_org.update){
|
|
117
|
+
sub_org.update = p.permission_sub_org.update;
|
|
117
118
|
}
|
|
118
|
-
if(sub_org.del!='denied' && p.
|
|
119
|
-
same_org.del = p.
|
|
119
|
+
if(sub_org.del!='denied' && p.permission_sub_org && p.permission_sub_org.del){
|
|
120
|
+
same_org.del = p.permission_sub_org.del;
|
|
120
121
|
}
|
|
121
|
-
if(sub_org.add!='denied' && p.
|
|
122
|
-
sub_org.add = p
|
|
122
|
+
if(sub_org.add!='denied' && p.permission_sub_org && p.permission_sub_org.add){
|
|
123
|
+
sub_org.add = <p className="permission_sub_org"></p>.add;
|
|
123
124
|
}
|
|
124
125
|
}
|
|
125
126
|
|
|
@@ -281,8 +282,10 @@ function checkUpdatePermission(data,diffresult,permissions,orgId){
|
|
|
281
282
|
} else {
|
|
282
283
|
ef_section_permissions = section_permissions.sub_org;
|
|
283
284
|
ef_field_permissions = field_permissions.sub_org;
|
|
284
|
-
ef_table_permissions =
|
|
285
|
+
ef_table_permissions = table_permissions.sub_org;
|
|
285
286
|
}
|
|
287
|
+
|
|
288
|
+
$.log("ef_table_permissions=" + JSON.stringify(ef_table_permissions))
|
|
286
289
|
if(ef_table_permissions.update === 'denied'){
|
|
287
290
|
throw "没有修改的权限。"
|
|
288
291
|
}
|