fixed meal type constraint
This commit is contained in:
@ -315,8 +315,8 @@ admin.site.register(MealPlan, MealPlanAdmin)
|
|||||||
|
|
||||||
|
|
||||||
class MealTypeAdmin(admin.ModelAdmin):
|
class MealTypeAdmin(admin.ModelAdmin):
|
||||||
list_display = ('name', 'created_by', 'order')
|
list_display = ('name', 'space', 'created_by', 'order')
|
||||||
search_fields = ('name', 'created_by__username')
|
search_fields = ('name', 'space', 'created_by__username')
|
||||||
|
|
||||||
|
|
||||||
admin.site.register(MealType, MealTypeAdmin)
|
admin.site.register(MealType, MealTypeAdmin)
|
||||||
|
@ -348,7 +348,7 @@ class MealTypeSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
|
|||||||
validated_data['name'] = validated_data['name'].strip()
|
validated_data['name'] = validated_data['name'].strip()
|
||||||
space = validated_data.pop('space', self.context['request'].space)
|
space = validated_data.pop('space', self.context['request'].space)
|
||||||
validated_data['created_by'] = self.context['request'].user
|
validated_data['created_by'] = self.context['request'].user
|
||||||
obj, created = MealType.objects.get_or_create(name__iexact=validated_data['name'], space=space, defaults=validated_data)
|
obj, created = MealType.objects.get_or_create(name__iexact=validated_data['name'], space=space, created_by=self.context['request'].user, defaults=validated_data)
|
||||||
return obj
|
return obj
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
Reference in New Issue
Block a user