Merge branch 'release'
This commit is contained in:
commit
8a449f02cf
|
|
@ -304,6 +304,9 @@ function createRelationHierarchyCheckers(schema) {
|
||||||
entity: userEntityName_1,
|
entity: userEntityName_1,
|
||||||
action: 'remove',
|
action: 'remove',
|
||||||
type: 'expressionRelation',
|
type: 'expressionRelation',
|
||||||
|
conditionalFilter: {
|
||||||
|
relation: r,
|
||||||
|
},
|
||||||
expression: function (operation, context) {
|
expression: function (operation, context) {
|
||||||
var _a, _b;
|
var _a, _b;
|
||||||
var userId = context.getCurrentUserId();
|
var userId = context.getCurrentUserId();
|
||||||
|
|
|
||||||
|
|
@ -871,8 +871,8 @@ function checkFilterRepel(entity, context, filter1, filter2) {
|
||||||
blockTrigger: true,
|
blockTrigger: true,
|
||||||
});
|
});
|
||||||
if (count instanceof Promise) {
|
if (count instanceof Promise) {
|
||||||
return count.then(function (count2) { return count2 !== 0; });
|
return count.then(function (count2) { return count2 === 0; });
|
||||||
}
|
}
|
||||||
return count !== 0;
|
return count === 0;
|
||||||
}
|
}
|
||||||
exports.checkFilterRepel = checkFilterRepel;
|
exports.checkFilterRepel = checkFilterRepel;
|
||||||
|
|
|
||||||
|
|
@ -270,6 +270,9 @@ export function createRelationHierarchyCheckers<ED extends EntityDict & BaseEnti
|
||||||
entity: userEntityName as keyof ED,
|
entity: userEntityName as keyof ED,
|
||||||
action: 'remove',
|
action: 'remove',
|
||||||
type: 'expressionRelation',
|
type: 'expressionRelation',
|
||||||
|
conditionalFilter: {
|
||||||
|
relation: r,
|
||||||
|
} as ED[keyof ED]['Update']['filter'],
|
||||||
expression: <T2 extends keyof ED>(operation: any, context: Cxt) => {
|
expression: <T2 extends keyof ED>(operation: any, context: Cxt) => {
|
||||||
const userId = context.getCurrentUserId();
|
const userId = context.getCurrentUserId();
|
||||||
const { filter } = operation as ED[keyof ED]['Remove'];
|
const { filter } = operation as ED[keyof ED]['Remove'];
|
||||||
|
|
|
||||||
|
|
@ -933,8 +933,8 @@ export function checkFilterRepel<ED extends EntityDict, T extends keyof ED, Cxt
|
||||||
});
|
});
|
||||||
if (count instanceof Promise) {
|
if (count instanceof Promise) {
|
||||||
return count.then(
|
return count.then(
|
||||||
(count2) => count2 !== 0
|
(count2) => count2 === 0
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return count !== 0;
|
return count === 0;
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue