From 2cc9a7bd3169ede08b0bdf732eaff840e3ad9524 Mon Sep 17 00:00:00 2001 From: Damillora Date: Thu, 17 Dec 2020 20:23:55 +0700 Subject: [PATCH] Do not add blank string artists and categories if comma-separated string is empty --- artists/models.py | 12 +++++++----- categories/models.py | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/artists/models.py b/artists/models.py index d89c15a..316f70c 100644 --- a/artists/models.py +++ b/artists/models.py @@ -6,11 +6,13 @@ from django.utils.text import slugify class ArtistManager(models.Manager): def comma_to_qs(self, artists_str): final_ids = [] - for artist in artists_str.split(','): - obj, created = self.get_or_create(romanized_name=artist.strip()) - final_ids.append(obj.id) - qs = self.get_queryset().filter(id__in=final_ids).distinct() - return qs + if artists_str: + for artist in artists_str.split(','): + obj, created = self.get_or_create(romanized_name=artist.strip()) + final_ids.append(obj.id) + qs = self.get_queryset().filter(id__in=final_ids).distinct() + return qs + return self.none() class Artist(models.Model): name = models.CharField(max_length=255,blank=True) diff --git a/categories/models.py b/categories/models.py index 3c71ad4..beb8f21 100644 --- a/categories/models.py +++ b/categories/models.py @@ -14,11 +14,13 @@ class Branch(models.Model): class CategoryManager(models.Manager): def comma_to_qs(self, categories_str): final_ids = [] - for category in categories_str.split(','): - obj, created = self.get_or_create(name=category.strip()) - final_ids.append(obj.id) - qs = self.get_queryset().filter(id__in=final_ids).distinct() - return qs + if categories_str: + for category in categories_str.split(','): + obj, created = self.get_or_create(name=category.strip()) + final_ids.append(obj.id) + qs = self.get_queryset().filter(id__in=final_ids).distinct() + return qs + return self.none() class Category(models.Model): name = models.CharField(max_length=255)