From 6b301d804071742e0996b878ccb8531b65b15669 Mon Sep 17 00:00:00 2001 From: Antelle Date: Fri, 22 Jan 2016 20:23:53 +0300 Subject: [PATCH] fix #80: prevent data loss on group move --- app/scripts/models/group-model.js | 5 +++++ release-notes.md | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/app/scripts/models/group-model.js b/app/scripts/models/group-model.js index 437e124e..d2e7e6b5 100644 --- a/app/scripts/models/group-model.js +++ b/app/scripts/models/group-model.js @@ -183,6 +183,11 @@ var GroupModel = MenuItemModel.extend({ } this.file.setModified(); if (object instanceof GroupModel) { + for (var parent = this; parent; parent = parent.parentGroup) { + if (object === parent) { + return; + } + } if (this.group.groups.indexOf(object.group) >= 0) { return; } diff --git a/release-notes.md b/release-notes.md index 1deb4d4d..d85d25ad 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,9 @@ Release notes ------------- +##### v0.6.0 (not released yet) +Performance, stability and quality improvements +`-` #80: prevent data loss on group move + ##### v0.6.0 (2016-01-19) Improvements `+` advanced search