From c55571fd87ecacf5633ccce55e268ad98baafb96 Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Wed, 24 May 2017 23:02:19 +0200
Subject: [PATCH] `-` fix #633: template ids issues

---
 app/scripts/models/entry-model.js | 5 ++++-
 release-notes.md                  | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/scripts/models/entry-model.js b/app/scripts/models/entry-model.js
index add9f5da..84438a55 100644
--- a/app/scripts/models/entry-model.js
+++ b/app/scripts/models/entry-model.js
@@ -615,8 +615,9 @@ const EntryModel = Backbone.Model.extend({
 
     cloneEntry: function(nameSuffix) {
         const newEntry = EntryModel.newEntry(this.group, this.file);
+        const uuid = newEntry.uuid;
         newEntry.entry.copyFrom(this.entry);
-        newEntry.entry.uuid = kdbxweb.KdbxUuid.random();
+        newEntry.entry.uuid = uuid;
         newEntry.entry.times.update();
         newEntry.entry.fields.Title = this.title + nameSuffix;
         newEntry._fillByEntry();
@@ -625,7 +626,9 @@ const EntryModel = Backbone.Model.extend({
     },
 
     copyFromTemplate: function(templateEntry) {
+        const uuid = this.entry.uuid;
         this.entry.copyFrom(templateEntry.entry);
+        this.entry.uuid = uuid;
         this.entry.fields.Title = '';
         this._fillByEntry();
     }
diff --git a/release-notes.md b/release-notes.md
index ce6ed94d..767c33a5 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,5 +1,8 @@
 Release notes
 -------------
+##### v1.5.2 (TBD)
+`-` fix #633: template ids issues  
+
 ##### v1.5.1 (2017-05-23)
 `-` fix #631: unicode characters in Dropbox files  
 `-` fix backups in desktop