mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-12 15:11:10 +08:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
ec46cbfce7
@ -1319,9 +1319,11 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
|
|||||||
|
|
||||||
for _, filter := range masterView.Table.Filters {
|
for _, filter := range masterView.Table.Filters {
|
||||||
view.Table.Filters = append(view.Table.Filters, &av.ViewFilter{
|
view.Table.Filters = append(view.Table.Filters, &av.ViewFilter{
|
||||||
Column: filter.Column,
|
Column: filter.Column,
|
||||||
Operator: filter.Operator,
|
Operator: filter.Operator,
|
||||||
Value: filter.Value,
|
Value: filter.Value,
|
||||||
|
RelativeDate: filter.RelativeDate,
|
||||||
|
RelativeDate2: filter.RelativeDate2,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1481,7 +1483,9 @@ func setAttributeViewFilters(operation *Operation) (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
filter.Value.Type = key.Type
|
if nil != filter.Value {
|
||||||
|
filter.Value.Type = key.Type
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err = av.SaveAttributeView(attrView)
|
err = av.SaveAttributeView(attrView)
|
||||||
|
Loading…
Reference in New Issue
Block a user