fall back to ipv4 for local nodes if no ipv6 connection is available

This commit is contained in:
j 2014-05-22 16:20:40 +02:00
commit dc2121293e
9 changed files with 151 additions and 72 deletions

View file

@ -228,6 +228,13 @@ class Item(db.Model):
db.session.add(self)
db.session.commit()
def delete(self, commit=True):
db.session.delete(self)
Sort.query.filter_by(item_id=self.id).delete()
Transfer.query.filter_by(item_id=self.id).delete()
if commit:
db.session.commit()
meta_keys = ('title', 'author', 'date', 'publisher', 'edition', 'language')
def update_meta(self, data):
@ -397,8 +404,7 @@ class Item(db.Model):
l.items.remove(self)
db.session.commit()
if not self.users:
db.session.delete(self)
Sort.query.filter_by(item_id=self.id).delete()
self.delete()
else:
self.update()
Changelog.record(user, 'removeitem', self.id)