fixed icon issues
This commit is contained in:
parent
4ffc9cc72f
commit
4a1ec5adf7
@ -34,7 +34,7 @@ class FoodPropertyHelper:
|
|||||||
caches['default'].set(CacheHelper(self.space).PROPERTY_TYPE_CACHE_KEY, property_types, 60 * 60) # cache is cleared on property type save signal so long duration is fine
|
caches['default'].set(CacheHelper(self.space).PROPERTY_TYPE_CACHE_KEY, property_types, 60 * 60) # cache is cleared on property type save signal so long duration is fine
|
||||||
|
|
||||||
for fpt in property_types:
|
for fpt in property_types:
|
||||||
computed_properties[fpt.id] = {'id': fpt.id, 'name': fpt.name, 'icon': fpt.icon, 'description': fpt.description, 'unit': fpt.unit, 'order': fpt.order, 'food_values': {}, 'total_value': 0, 'missing_value': False}
|
computed_properties[fpt.id] = {'id': fpt.id, 'name': fpt.name, 'description': fpt.description, 'unit': fpt.unit, 'order': fpt.order, 'food_values': {}, 'total_value': 0, 'missing_value': False}
|
||||||
|
|
||||||
uch = UnitConversionHelper(self.space)
|
uch = UnitConversionHelper(self.space)
|
||||||
|
|
||||||
|
@ -766,7 +766,7 @@ class PropertyType(models.Model, PermissionModelMixin):
|
|||||||
order = models.IntegerField(default=0)
|
order = models.IntegerField(default=0)
|
||||||
description = models.CharField(max_length=512, blank=True, null=True)
|
description = models.CharField(max_length=512, blank=True, null=True)
|
||||||
category = models.CharField(max_length=64, choices=((NUTRITION, _('Nutrition')), (ALLERGEN, _('Allergen')),
|
category = models.CharField(max_length=64, choices=((NUTRITION, _('Nutrition')), (ALLERGEN, _('Allergen')),
|
||||||
(PRICE, _('Price')), (GOAL, _('Goal')), (OTHER, _('Other'))), null=True, blank=True)
|
(PRICE, _('Price')), (GOAL, _('Goal')), (OTHER, _('Other'))), null=True, blank=True)
|
||||||
open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
|
open_data_slug = models.CharField(max_length=128, null=True, blank=True, default=None)
|
||||||
|
|
||||||
# TODO show if empty property?
|
# TODO show if empty property?
|
||||||
|
@ -143,7 +143,6 @@ class RecipeBookFactory(factory.django.DjangoModelFactory):
|
|||||||
name = factory.LazyAttribute(lambda x: faker.sentence(
|
name = factory.LazyAttribute(lambda x: faker.sentence(
|
||||||
nb_words=3, variable_nb_words=False))
|
nb_words=3, variable_nb_words=False))
|
||||||
description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
|
description = factory.LazyAttribute(lambda x: faker.sentence(nb_words=10))
|
||||||
icon = None
|
|
||||||
# shared = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
|
# shared = factory.SubFactory(UserFactory, space=factory.SelfAttribute('..space'))
|
||||||
created_by = factory.SubFactory(
|
created_by = factory.SubFactory(
|
||||||
UserFactory, space=factory.SelfAttribute('..space'))
|
UserFactory, space=factory.SelfAttribute('..space'))
|
||||||
|
Loading…
Reference in New Issue
Block a user