www

commit f633db1f01271b59fe501380ec092ef2b8bbf064
parent b66a6b9518a4e49a2f2780a5b7aeeb673dc49df4
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sat, 23 Apr 2016 00:59:20 -0400

Miscellaneous tweaks

Diffstat:
M
chrome/content/zotero/xpcom/db.js
 | 
2
+-
M
chrome/content/zotero/xpcom/itemTreeView.js
 | 
3
++-
M
chrome/content/zotero/xpcom/sync/syncLocal.js
 | 
2
+-
M
test/tests/syncEngineTest.js
 | 
1
+

4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
@@ -531,7 +531,7 @@ Zotero.DBConnection.prototype.executeTransaction = Zotero.Promise.coroutine(func
 		}
 		else {
 			Zotero.debug(`Rolled back DB transaction ${id}`, 1);
-			Zotero.debug(e, 1);
+			Zotero.debug(e.message, 1);
 		}
 		if (startedTransaction) {
 			this._transactionID = null;
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -1382,7 +1382,8 @@ Zotero.ItemTreeView.prototype.sort = function (itemID) {
 	var collation = Zotero.getLocaleCollation();
 	var sortCreatorAsString = Zotero.Prefs.get('sortCreatorAsString');
 	
-	Zotero.debug("Sorting items list by " + sortFields.join(", ") + " " + dir);
+	Zotero.debug("Sorting items list by " + sortFields.join(", ") + " " + dir
+		+ (itemID ? " for 1 item" : ""));
 	
 	// Set whether rows with empty values should be displayed last,
 	// which may be different for primary and secondary sorting.
diff --git a/chrome/content/zotero/xpcom/sync/syncLocal.js b/chrome/content/zotero/xpcom/sync/syncLocal.js
@@ -419,7 +419,7 @@ Zotero.Sync.Data.Local = {
 		json = json.map(o => this._checkCacheJSON(o));
 		
 		if (options.setStatus) {
-			options.setStatus("Processing " + objectTypePlural); // TODO: localize
+			options.setStatus("Downloading " + objectTypePlural + " in " + libraryName); // TODO: localize
 		}
 		
 		// Sort parent objects first, to avoid retries due to unmet dependencies
diff --git a/test/tests/syncEngineTest.js b/test/tests/syncEngineTest.js
@@ -896,6 +896,7 @@ describe("Zotero.Sync.Data.Engine", function () {
 			yield assert.eventually.ok(Zotero.Searches.getByLibraryAndKeyAsync(userLibraryID, "DDDDDDDD"));
 			yield assert.eventually.ok(Zotero.Items.getByLibraryAndKeyAsync(userLibraryID, "GGGGGGGG"));
 			
+			// Check for queued objects
 			var keys = yield Zotero.Sync.Data.Local.getObjectsFromSyncQueue('collection', userLibraryID);
 			assert.sameMembers(keys, ['BBBBBBBB']);