EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

catch more errors

pull/94/head
eric 2020-08-06 17:15:51 -04:00
parent 94924500c6
commit 0cb15ca999
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/bookloader.py
View File

@ -551,14 +551,20 @@ def merge_works(w1, w2, user=None):
if w2.works_related_from.filter(relation='part'): if w2.works_related_from.filter(relation='part'):
models.WorkRelation.objects.get_or_create(to_work=w1, from_work=w2, relation='part') models.WorkRelation.objects.get_or_create(to_work=w1, from_work=w2, relation='part')
return w1 return w1
if w1.editions.count() > 3 and w2.editions.count() > 3 and not user:
# avoid big merges
return w1
if w2.selected_edition is not None and w1.selected_edition is None: if w2.selected_edition is not None and w1.selected_edition is None:
#the merge should be reversed #the merge should be reversed
temp = w1 temp = w1
w1 = w2 w1 = w2
w2 = temp w2 = temp
try:
models.WasWork(was=w2.pk, work=w1, user=user).save() models.WasWork(was=w2.pk, work=w1, user=user).save()
except IntegrityError:
# already a 'was' entry for w2; somehow it was never deleted
pass
for ww in models.WasWork.objects.filter(work=w2): for ww in models.WasWork.objects.filter(work=w2):
ww.work = w1 ww.work = w1
ww.save() ww.save()