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/Version.h
+++ b/api/logic/meta/Version.h
@ -84,7 +84,8 @@ public: /* con/des */
 		return m_data != nullptr;
 	}

-	void merge(const std::shared_ptr<BaseEntity> &other) override;
+	void merge(const VersionPtr &other);
+	void mergeFromList(const VersionPtr &other);
 	void parse(const QJsonObject &obj) override;

 	QString localFilename() const override;