diff --git a/oml/item/models.py b/oml/item/models.py index 74931e7..fbcf914 100644 --- a/oml/item/models.py +++ b/oml/item/models.py @@ -379,7 +379,8 @@ class Item(db.Model): remove_empty_folders(os.path.dirname(path)) db.session.delete(f) user = state.user() - self.users.remove(user) + if user in self.users: + self.users.remove(user) db.session.commit() if not self.users: db.session.delete(self) diff --git a/oml/meta/openlibrary.py b/oml/meta/openlibrary.py index 902b4fc..38b65fd 100644 --- a/oml/meta/openlibrary.py +++ b/oml/meta/openlibrary.py @@ -69,7 +69,7 @@ def get_ids(key, value): if (id, v) not in ids: ids.append((id, v)) elif key in ('isbn10', 'isbn13', 'oclc', 'lccn'): - logger.debug('openlibraryid.get_ids %s %s', key, value) + logger.debug('get_ids %s %s', key, value) r = api.things({'type': '/type/edition', key.replace('isbn', 'isbn_'): value}) for b in r.get('result', []): if b.startswith('/books'): diff --git a/oml/nodes.py b/oml/nodes.py index 2739a5b..cf1b086 100644 --- a/oml/nodes.py +++ b/oml/nodes.py @@ -170,7 +170,7 @@ class Node(object): if u.peered or u.queued: try: self.online = False - logger.debug('type to connect to %s', self.user_id) + logger.debug('type to connect to %s at [%s]:%s', self.user_id, self.host, self.port) if self.can_connect(): self.online = True if u.queued: diff --git a/oml/oxflask/query.py b/oml/oxflask/query.py index ee14103..bf17a84 100644 --- a/oml/oxflask/query.py +++ b/oml/oxflask/query.py @@ -60,7 +60,7 @@ class Parser(object): } ... ''' - logger.debug('parse_condition %s', condition) + #logger.debug('parse_condition %s', condition) if not 'value' in condition: return None k = condition.get('key', '*') diff --git a/oml/user/models.py b/oml/user/models.py index 4e0a9d4..032e1a8 100644 --- a/oml/user/models.py +++ b/oml/user/models.py @@ -204,7 +204,8 @@ class List(db.Model): from item.models import Item for item_id in items: i = Item.get(item_id) - self.items.remove(i) + if i in self.items: + self.items.remove(i) i.update() db.session.add(self) db.session.commit() diff --git a/static/js/deleteItemsDialog.js b/static/js/deleteItemsDialog.js index 010e269..6093311 100644 --- a/static/js/deleteItemsDialog.js +++ b/static/js/deleteItemsDialog.js @@ -26,11 +26,11 @@ oml.ui.deleteItemsDialog = function() { ids: items }, function() { oml.UI.set({listSelection: []}); - Ox.Request.clearCache('find'); + Ox.Request.clearCache(); // to much? oml.$ui.list.updateElement(); }); }); return that; -}; \ No newline at end of file +};