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

Don't show deleted items outside of trash

Browse Source
This commit is contained in:
Dan Stillman 2015-11-01 03:36:23 -05:00
parent 3692536770
commit 6b8e5bafc6
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chrome/content/zotero/xpcom/itemTreeView.js
View File

@ -3083,6 +3083,7 @@ Zotero.ItemTreeView.prototype.drop = Zotero.Promise.coroutine(function* (row, or
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Zotero.ItemTreeView.prototype.isSeparator = function(row) { return false; } Zotero.ItemTreeView.prototype.isSeparator = function(row) { return false; }
Zotero.ItemTreeView.prototype.isSelectable = function (row, col) { return true; }
Zotero.ItemTreeView.prototype.getRowProperties = function(row, prop) {} Zotero.ItemTreeView.prototype.getRowProperties = function(row, prop) {}
Zotero.ItemTreeView.prototype.getColumnProperties = function(col, prop) {} Zotero.ItemTreeView.prototype.getColumnProperties = function(col, prop) {}
Zotero.ItemTreeView.prototype.getCellProperties = function(row, col, prop) { Zotero.ItemTreeView.prototype.getCellProperties = function(row, col, prop) {

8
chrome/content/zotero/xpcom/libraryTreeView.js
View File

@ -82,9 +82,11 @@ Zotero.LibraryTreeView.prototype = {
* @return {Integer} * @return {Integer}
*/ */
getRowIndexByID: function (id) { getRowIndexByID: function (id) {
// FIXME: Should work for itemIDs too var type = "";
var type = id[0]; if (this.type != 'item') {
id = ('' + id).substr(1); var type = id[0];
id = ('' + id).substr(1);
}
return this._rowMap[type + id]; return this._rowMap[type + id];
}, },

8
chrome/content/zotero/xpcom/search.js
View File

@ -1051,12 +1051,14 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
} }
// Exclude deleted items (and their child items) by default // Exclude deleted items (and their child items) by default
let not = deleted ? "" : "NOT ";
let op = deleted ? "OR" : "AND";
sql += " WHERE (" sql += " WHERE ("
+ "itemID " + (deleted ? "" : "NOT ") + "IN (SELECT itemID FROM deletedItems) " + `itemID ${not} IN (SELECT itemID FROM deletedItems) `
+ "OR itemID " + (deleted ? "" : "NOT ") + "IN (SELECT itemID FROM itemNotes " + `${op} itemID ${not}IN (SELECT itemID FROM itemNotes `
+ "WHERE parentItemID IS NOT NULL AND " + "WHERE parentItemID IS NOT NULL AND "
+ "parentItemID IN (SELECT itemID FROM deletedItems)) " + "parentItemID IN (SELECT itemID FROM deletedItems)) "
+ "OR itemID " + (deleted ? "" : "NOT ") + "IN (SELECT itemID FROM itemAttachments " + `${op} itemID ${not}IN (SELECT itemID FROM itemAttachments `
+ "WHERE parentItemID IS NOT NULL AND " + "WHERE parentItemID IS NOT NULL AND "
+ "parentItemID IN (SELECT itemID FROM deletedItems))" + "parentItemID IN (SELECT itemID FROM deletedItems))"
+ ")"; + ")";

8
test/tests/itemTreeViewTest.js
View File

@ -20,6 +20,14 @@ describe("Zotero.ItemTreeView", function() {
win.close(); win.close();
}); });
it("shouldn't show items in trash", function* () {
var item = yield createDataObject('item', { title: "foo" });
var itemID = item.id;
item.deleted = true;
yield item.saveTx();
assert.notOk(itemsView.getRowIndexByID(itemID));
})
describe("#selectItem()", function () { describe("#selectItem()", function () {
/** /**
* Make sure that selectItem() doesn't hang if the pane's item-select handler is never * Make sure that selectItem() doesn't hang if the pane's item-select handler is never