mirror of
https://github.com/hcengineering/platform.git
synced 2025-05-12 02:11:57 +00:00
Fix removed cards (#8693)
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
parent
5e1013eab7
commit
13c104ea8a
@ -461,6 +461,17 @@ function getLastTxTime (txes: Tx[]): number {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function compareTxes (a: Tx, b: Tx): number {
|
function compareTxes (a: Tx, b: Tx): number {
|
||||||
const result = a._id.localeCompare(b._id)
|
const result = a.modifiedOn - b.modifiedOn
|
||||||
return result !== 0 ? result : a.modifiedOn - b.modifiedOn
|
if (result !== 0) {
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
if (a._class !== b._class) {
|
||||||
|
if (a._class === core.class.TxCreateDoc) {
|
||||||
|
return -1
|
||||||
|
}
|
||||||
|
if (b._class === core.class.TxCreateDoc) {
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return a._id.localeCompare(b._id)
|
||||||
}
|
}
|
||||||
|
@ -35,8 +35,8 @@
|
|||||||
const result: MasterTag[] = []
|
const result: MasterTag[] = []
|
||||||
const desc = hierarchy.getDescendants(_class)
|
const desc = hierarchy.getDescendants(_class)
|
||||||
for (const clazz of desc) {
|
for (const clazz of desc) {
|
||||||
const cls = hierarchy.getClass(clazz)
|
const cls = hierarchy.getClass(clazz) as MasterTag
|
||||||
if (cls.extends === _class && cls._class === card.class.MasterTag) {
|
if (cls.extends === _class && cls._class === card.class.MasterTag && cls.removed !== true) {
|
||||||
result.push(cls)
|
result.push(cls)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user