diff --git a/alyx/experiments/admin.py b/alyx/experiments/admin.py index 621cc05b..e4075df2 100644 --- a/alyx/experiments/admin.py +++ b/alyx/experiments/admin.py @@ -163,16 +163,16 @@ def _x(obj): @staticmethod def _y(obj): - return ', '.join(map('{:.1f}'.format, obj.x)) + return ', '.join(map('{:.1f}'.format, obj.y)) @staticmethod def _z(obj): - return ', '.join(map('{:.1f}'.format, obj.x)) + return ', '.join(map('{:.1f}'.format, obj.z)) class FOVInline(BaseAdmin): ordering = ('-session__start_time',) - exclude = ('session', 'datasets', 'json') + exclude = ('session', 'datasets') readonly_fields = ('id', '_session', '_datasets') list_display = ('name', '_subject', '_session', 'imaging_type') list_display_links = ('name', '_subject', '_session',) diff --git a/alyx/experiments/serializers.py b/alyx/experiments/serializers.py index 1697086e..cfc21b6f 100644 --- a/alyx/experiments/serializers.py +++ b/alyx/experiments/serializers.py @@ -315,7 +315,7 @@ def setup_eager_loading(queryset): class Meta: model = FOV - exclude = ('json',) + fields = '__all__' class ImagingStackDetailSerializer(serializers.ModelSerializer):