Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit bd9ebf77 authored by Volker Krause's avatar Volker Krause

Merge with existing reservation data, don't just overwrite

This is almost the same, but the merge method does handle a few special
cases where we know which side is "better".
parent fe813868
......@@ -74,7 +74,7 @@ QVector<SemanticMemento::TripData> SemanticMemento::data()
const auto existingRes = CalendarHandler::reservationsForEvent(e.second);
for (const auto &ev : existingRes) {
if (MergeUtil::isSame(ev, e.first)) {
e.first = JsonLdDocument::apply(ev, e.first);
e.first = MergeUtil::merge(ev, e.first);
break;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment