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

bugfixes

Browse Source
This commit is contained in:
jonaswinkler 2021-02-25 22:16:31 +01:00
parent b45630080b
commit 7b1145c75e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/documents/migrations/1013_migrate_tag_colour.py
View File

@ -60,7 +60,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='tag', model_name='tag',
name='color', name='color',
field=models.CharField(blank=True, max_length=7, verbose_name='color'), field=models.CharField(default='#a6cee3', max_length=7, verbose_name='color'),
), ),
migrations.RunPython(forward, reverse), migrations.RunPython(forward, reverse),
migrations.RemoveField( migrations.RemoveField(

4
src/documents/models.py
View File

@ -79,7 +79,9 @@ class Tag(MatchingModel):
color = models.CharField( color = models.CharField(
_("color"), _("color"),
blank=True, max_length=7) max_length=7,
default="#a6cee3"
)
is_inbox_tag = models.BooleanField( is_inbox_tag = models.BooleanField(
_("is inbox tag"), _("is inbox tag"),

8
src/documents/serialisers.py
View File

@ -111,7 +111,7 @@ class ColorField(serializers.Field):
for id, color in self.COLOURS: for id, color in self.COLOURS:
if id == data: if id == data:
return color return color
return "#a6cee3" raise serializers.ValidationError()
def to_representation(self, value): def to_representation(self, value):
for id, color in self.COLOURS: for id, color in self.COLOURS:
@ -122,7 +122,7 @@ class ColorField(serializers.Field):
class TagSerializerVersion1(MatchingModelSerializer): class TagSerializerVersion1(MatchingModelSerializer):
colour = ColorField(source='color') colour = ColorField(source='color', default="#a6cee3")
class Meta: class Meta:
model = Tag model = Tag
@ -142,7 +142,7 @@ class TagSerializerVersion1(MatchingModelSerializer):
class TagSerializer(MatchingModelSerializer): class TagSerializer(MatchingModelSerializer):
def get_text_color(self, obj): def get_text_color(self, obj):
if obj.color: try:
h = obj.color.lstrip('#') h = obj.color.lstrip('#')
rgb = tuple(int(h[i:i + 2], 16)/256 for i in (0, 2, 4)) rgb = tuple(int(h[i:i + 2], 16)/256 for i in (0, 2, 4))
luminance = math.sqrt( luminance = math.sqrt(
@ -151,7 +151,7 @@ class TagSerializer(MatchingModelSerializer):
0.114 * math.pow(rgb[2], 2) 0.114 * math.pow(rgb[2], 2)
) )
return "#ffffff" if luminance < 0.5 else "#000000" return "#ffffff" if luminance < 0.5 else "#000000"
else: except ValueError:
return "#000000" return "#000000"
text_color = serializers.SerializerMethodField() text_color = serializers.SerializerMethodField()