mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upload modified items after tag rename

Browse source 
The web library will probably still display the old tag in addition to
the new one, at least until browser restart. We'll have to deal with
that separately.

Closes #1205
This commit is contained in:
Dan Stillman 2017-04-01 02:54:24 -04:00
parent 9637770c16
commit bb489a45c3
3 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/xpcom/data/tags.js
View file

@ -235,6 +235,9 @@ Zotero.Tags = new function() {
}
var oldTagID = this.getID(oldName);
if (!oldTagID) {
throw new Error(`Tag '${oldName}' not found`);
}
// We need to know if the old tag has a color assigned so that
// we can assign it to the new name
@ -255,10 +258,12 @@ Zotero.Tags = new function() {
+ 'WHERE tagID=? AND itemID IN (' + placeholders + ')';
yield Zotero.DB.queryAsync(sql, [newTagID, oldTagID].concat(chunk));
sql = 'UPDATE items SET clientDateModified=? '
sql = 'UPDATE items SET clientDateModified=?, synced=0 '
+ 'WHERE itemID IN (' + placeholders + ')'
yield Zotero.DB.queryAsync(sql, [Zotero.DB.transactionDateTime].concat(chunk));
chunk.forEach(id => Zotero.Items.get(id).updateSynced(false, true));
yield Zotero.Items.reload(oldItemIDs, ['tags'], true);
})
);

3
test/content/support.js
View file

@ -414,6 +414,9 @@ function createUnsavedDataObject(objectType, params = {}) {
if (params.collections !== undefined) {
obj.setCollections(params.collections);
}
if (params.tags !== undefined) {
obj.setTags(params.tags);
}
break;
case 'collection':

13
test/tests/tagsTest.js
View file

@ -25,6 +25,19 @@ describe("Zotero.Tags", function () {
})
})
describe("#rename()", function () {
it("should mark items as changed", function* () {
var item1 = yield createDataObject('item', { tags: [{ tag: "A" }], synced: true });
var item2 = yield createDataObject('item', { tags: [{ tag: "A" }, { tag: "B" }], synced: true });
var item3 = yield createDataObject('item', { tags: [{ tag: "B" }, { tag: "C" }], synced: true });
yield Zotero.Tags.rename(item1.libraryID, "A", "D");
assert.isFalse(item1.synced);
assert.isFalse(item2.synced);
assert.isTrue(item3.synced);
});
});
describe("#removeFromLibrary()", function () {
it("should reload tags of associated items", function* () {
var libraryID = Zotero.Libraries.userLibraryID;