www

commit 95bf52baf5d8afd6c44b0dd96033edd42b9f4195
parent 89833d94b3806048d4ca9779f5113a86630c3af3
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 23 May 2014 14:51:21 -0400

Check for NS_ERROR_STORAGE_CONSTRAINT in tag constraint error

Diffstat:
M
chrome/content/zotero/xpcom/data/tag.js
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/data/tag.js b/chrome/content/zotero/xpcom/data/tag.js
@@ -359,7 +359,9 @@ Zotero.Tag.prototype.save = function (full) {
 		catch (e) {
 			// If an incoming tag is the same as an existing tag, but with a different key,
 			// then delete the old tag and add its linked items to the new tag
-			if (typeof e == 'string' && e.indexOf('columns libraryID, name, type are not unique') != -1) {
+			if (typeof e == 'string' &&
+					(e.indexOf('columns libraryID, name, type are not unique') != -1
+						|| e.indexOf('NS_ERROR_STORAGE_CONSTRAINT') != -1)) {
 				Zotero.debug("Tag matches existing tag with different key -- delete old tag and merging items");
 				
 				// GET existing tag