mirror of https://github.com/keeweb/keeweb.git
`-` fix #633: template ids issues
This commit is contained in:
parent
c07484fb3d
commit
c55571fd87
|
@ -615,8 +615,9 @@ const EntryModel = Backbone.Model.extend({
|
||||||
|
|
||||||
cloneEntry: function(nameSuffix) {
|
cloneEntry: function(nameSuffix) {
|
||||||
const newEntry = EntryModel.newEntry(this.group, this.file);
|
const newEntry = EntryModel.newEntry(this.group, this.file);
|
||||||
|
const uuid = newEntry.uuid;
|
||||||
newEntry.entry.copyFrom(this.entry);
|
newEntry.entry.copyFrom(this.entry);
|
||||||
newEntry.entry.uuid = kdbxweb.KdbxUuid.random();
|
newEntry.entry.uuid = uuid;
|
||||||
newEntry.entry.times.update();
|
newEntry.entry.times.update();
|
||||||
newEntry.entry.fields.Title = this.title + nameSuffix;
|
newEntry.entry.fields.Title = this.title + nameSuffix;
|
||||||
newEntry._fillByEntry();
|
newEntry._fillByEntry();
|
||||||
|
@ -625,7 +626,9 @@ const EntryModel = Backbone.Model.extend({
|
||||||
},
|
},
|
||||||
|
|
||||||
copyFromTemplate: function(templateEntry) {
|
copyFromTemplate: function(templateEntry) {
|
||||||
|
const uuid = this.entry.uuid;
|
||||||
this.entry.copyFrom(templateEntry.entry);
|
this.entry.copyFrom(templateEntry.entry);
|
||||||
|
this.entry.uuid = uuid;
|
||||||
this.entry.fields.Title = '';
|
this.entry.fields.Title = '';
|
||||||
this._fillByEntry();
|
this._fillByEntry();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
Release notes
|
Release notes
|
||||||
-------------
|
-------------
|
||||||
|
##### v1.5.2 (TBD)
|
||||||
|
`-` fix #633: template ids issues
|
||||||
|
|
||||||
##### v1.5.1 (2017-05-23)
|
##### v1.5.1 (2017-05-23)
|
||||||
`-` fix #631: unicode characters in Dropbox files
|
`-` fix #631: unicode characters in Dropbox files
|
||||||
`-` fix backups in desktop
|
`-` fix backups in desktop
|
||||||
|
|
Loading…
Reference in New Issue