NOISSUE do not override already loaded metadata entities with partial data

2017-12-14 02:22:20 +01:00
parent f18afd3d1e
commit daf9d0eaa7
8 changed files with 55 additions and 37 deletions
--- a/api/logic/meta/VersionList.h
+++ b/api/logic/meta/VersionList.h
@ -80,7 +80,8 @@ public: // for usage only by parsers
 	void setName(const QString &name);
 	void setParentUid(const QString &parentUid);
 	void setVersions(const QVector<VersionPtr> &versions);
-	void merge(const BaseEntity::Ptr &other) override;
+	void merge(const VersionListPtr &other);
+	void mergeFromIndex(const VersionListPtr &other);
 	void parse(const QJsonObject &obj) override;

 signals: