paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

made a serious mistake. fixed.

Browse Source
This commit is contained in:
jonaswinkler 2020-12-12 02:06:43 +01:00
parent ebb39b13f0
commit bf9051e44d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/documents/signals/handlers.py
View File

@ -124,9 +124,9 @@ def set_tags(sender,
**kwargs): **kwargs):
if replace: if replace:
document.tags.exclude( Document.tags.through.objects.filter(document=document).exclude(
Q(is_inbox_tag=True) | Q(tag__is_inbox_tag=True)).exclude(
(Q(match="") & ~Q(matching_algorithm=Tag.MATCH_AUTO)) Q(tag__match="") & ~Q(tag__matching_algorithm=Tag.MATCH_AUTO)
).delete() ).delete()
current_tags = set(document.tags.all()) current_tags = set(document.tags.all())

8
src/documents/tests/test_management_retagger.py
View File

@ -20,6 +20,7 @@ class TestRetagger(DirectoriesMixin, TestCase):
self.d3.tags.add(self.tag_inbox) self.d3.tags.add(self.tag_inbox)
self.d3.tags.add(self.tag_no_match) self.d3.tags.add(self.tag_no_match)
self.correspondent_first = Correspondent.objects.create( self.correspondent_first = Correspondent.objects.create(
name="c1", match="first", matching_algorithm=Correspondent.MATCH_ANY) name="c1", match="first", matching_algorithm=Correspondent.MATCH_ANY)
self.correspondent_second = Correspondent.objects.create( self.correspondent_second = Correspondent.objects.create(
@ -62,11 +63,16 @@ class TestRetagger(DirectoriesMixin, TestCase):
self.assertEqual(d_first.correspondent, self.correspondent_first) self.assertEqual(d_first.correspondent, self.correspondent_first)
self.assertEqual(d_second.correspondent, self.correspondent_second) self.assertEqual(d_second.correspondent, self.correspondent_second)
def test_force_preserve_inbox(self): def test_overwrite_preserve_inbox(self):
self.d1.tags.add(self.tag_second)
call_command('document_retagger', '--tags', '--overwrite') call_command('document_retagger', '--tags', '--overwrite')
d_first, d_second, d_unrelated = self.get_updated_docs() d_first, d_second, d_unrelated = self.get_updated_docs()
self.assertIsNotNone(Tag.objects.get(id=self.tag_second.id))
self.assertCountEqual([tag.id for tag in d_first.tags.all()], [self.tag_first.id]) self.assertCountEqual([tag.id for tag in d_first.tags.all()], [self.tag_first.id])
self.assertCountEqual([tag.id for tag in d_second.tags.all()], [self.tag_second.id]) self.assertCountEqual([tag.id for tag in d_second.tags.all()], [self.tag_second.id])
self.assertCountEqual([tag.id for tag in d_unrelated.tags.all()], [self.tag_inbox.id, self.tag_no_match.id]) self.assertCountEqual([tag.id for tag in d_unrelated.tags.all()], [self.tag_inbox.id, self.tag_no_match.id])