suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix sync error when a file of an attachment with tags was in conflict

Browse Source 
- Missed file from previous commit
This commit is contained in:
Dan Stillman 2009-07-06 11:27:44 +00:00
parent 7008fa41cf
commit 9e9f8db1df
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/content/zotero/overlay.xul
View File

@ -354,7 +354,7 @@
</tooltip> </tooltip>
</hbox> </hbox>
<toolbarbutton id="zotero-tb-sync" class="zotero-small-progress-indicator" tooltip="_child" <toolbarbutton id="zotero-tb-sync" class="zotero-small-progress-indicator" tooltip="_child"
oncommand="Zotero.Sync.Runner.sync()"> oncommand="Zotero.Sync.Server.canAutoResetClient = true; Zotero.Sync.Runner.sync()">
<tooltip <tooltip
onpopupshowing="ZoteroPane.setLastSyncStatus(this)" onpopupshowing="ZoteroPane.setLastSyncStatus(this)"
noautohide="true"> noautohide="true">

9
chrome/content/zotero/xpcom/data/item.js
View File

@ -3379,8 +3379,13 @@ Zotero.Item.prototype.diff = function (item, includeMatches, ignoreFields) {
/** /**
* Returns an unsaved copy of the item * Returns an unsaved copy of the item
*
* @param {Boolean} [includePrimary=false]
* @param {Zotero.Item} [newItem=null] Target item for clone (used to pass a saved
* item for duplicating items with tags)
* @param {Boolean} [unsaved=false] Skip properties that require a saved object (e.g., tags)
*/ */
Zotero.Item.prototype.clone = function(includePrimary, newItem) { Zotero.Item.prototype.clone = function(includePrimary, newItem, unsaved) {
Zotero.debug('Cloning item ' + this.id); Zotero.debug('Cloning item ' + this.id);
if (includePrimary && newItem) { if (includePrimary && newItem) {
@ -3521,7 +3526,7 @@ Zotero.Item.prototype.clone = function(includePrimary, newItem) {
} }
} }
if (obj.tags) { if (!unsaved && obj.tags) {
for each(var tag in obj.tags) { for each(var tag in obj.tags) {
if (sameLibrary) { if (sameLibrary) {
newItem.addTagByID(tag.primary.tagID); newItem.addTagByID(tag.primary.tagID);

5
chrome/content/zotero/xpcom/storage.js
View File

@ -2375,10 +2375,10 @@ Zotero.Sync.Storage.QueueManager = new function () {
var objectPairs = []; var objectPairs = [];
for each(var conflict in _conflicts) { for each(var conflict in _conflicts) {
var item = Zotero.Items.getByLibraryAndKey(null, conflict.name); var item = Zotero.Items.getByLibraryAndKey(null, conflict.name);
var item1 = item.clone(); var item1 = item.clone(false, false, true);
item1.setField('dateModified', item1.setField('dateModified',
Zotero.Date.dateToSQL(new Date(conflict.localData.modTime * 1000), true)); Zotero.Date.dateToSQL(new Date(conflict.localData.modTime * 1000), true));
var item2 = item.clone(); var item2 = item.clone(false, false, true);
item2.setField('dateModified', item2.setField('dateModified',
Zotero.Date.dateToSQL(new Date(conflict.remoteData.modTime * 1000), true)); Zotero.Date.dateToSQL(new Date(conflict.remoteData.modTime * 1000), true));
objectPairs.push([item1, item2]); objectPairs.push([item1, item2]);
@ -2480,6 +2480,7 @@ Zotero.Sync.Storage.Queue = function (name) {
Zotero.debug(this.Name + " queue is done"); Zotero.debug(this.Name + " queue is done");
// DEBUG info // DEBUG info
Zotero.debug("Active requests: " + this.activeRequests); Zotero.debug("Active requests: " + this.activeRequests);
Zotero.debug("Errors:");
Zotero.debug(this._errors); Zotero.debug(this._errors);
if (this.activeRequests) { if (this.activeRequests) {