general layout improvements

cookbook/serializer.py

@@ -401,6 +401,7 @@ class MealTypeSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
 
 
 class UserPreferenceSerializer(WritableNestedModelSerializer):
+    user = UserSerializer(read_only=True)
     food_inherit_default = serializers.SerializerMethodField('get_food_inherit_defaults')
     plan_share = UserSerializer(many=True, allow_null=True, required=False)
     shopping_share = UserSerializer(many=True, allow_null=True, required=False)
@@ -436,6 +437,7 @@ class UserPreferenceSerializer(WritableNestedModelSerializer):
             'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'show_step_ingredients',
             'food_children_exist'
         )
+        read_only_fields = ('user',)
 
 
 class StorageSerializer(SpacedModelSerializer):
@@ -1438,6 +1440,7 @@ class ServerSettingsSerializer(serializers.Serializer):
     imprint_url = serializers.CharField()
     hosted = serializers.BooleanField()
     debug = serializers.BooleanField()
+    version = serializers.CharField()
 
     class Meta:
         fields = '__ALL__'

cookbook/views/api.py

@@ -107,6 +107,7 @@ from cookbook.serializer import (AccessTokenSerializer, AutomationSerializer, Au
                                  UserSerializer, UserSpaceSerializer, ViewLogSerializer, ImportImageSerializer,
                                  LocalizationSerializer, ServerSettingsSerializer
                                  )
+from cookbook.version_info import TANDOOR_VERSION
 from cookbook.views.import_export import get_integration
 from recipes import settings
 from recipes.settings import DRF_THROTTLE_RECIPE_URL_IMPORT, FDC_API_KEY, GOOGLE_AI_API_KEY
@@ -1964,6 +1965,7 @@ class ServerSettingsViewSet(viewsets.GenericViewSet):
         s['imprint_url'] = settings.IMPRINT_URL
         s['hosted'] = settings.HOSTED
         s['debug'] = settings.DEBUG
+        s['version'] = TANDOOR_VERSION
 
         return Response(ServerSettingsSerializer(s, many=False).data)