Fix bad merge allowed by github!!!! (baserow#4304)

jrmi · web-flow · commit 0f522a25bb11 · 2025-11-20T09:33:01.000+01:00
diff --git a/backend/src/baserow/contrib/integrations/local_baserow/service_types.py b/backend/src/baserow/contrib/integrations/local_baserow/service_types.py
@@ -2327,12 +2327,12 @@ def get_data():
                 local_model, RowSerializer, is_response=True, user_field_names=True
             )
 
-            return {
+            data_to_process = {
                 "results": serializer(rows, many=True).data,
                 "has_next_page": False,
             }
 
-        data_to_process = self._prepare_result(table.get_model(), data_to_process)
+            return self._prepare_result(local_model, data_to_process)
 
         self._process_event(
             self.model_class.objects.filter(table=table),

Original file line number	Diff line number	Diff line change
`@@ -2327,12 +2327,12 @@ def get_data():`
`2327`	`2327`	`local_model, RowSerializer, is_response=True, user_field_names=True`
`2328`	`2328`	`)`
`2329`	`2329`
`2330`		`- return {`
	`2330`	`+ data_to_process = {`
`2331`	`2331`	`"results": serializer(rows, many=True).data,`
`2332`	`2332`	`"has_next_page": False,`
`2333`	`2333`	`}`
`2334`	`2334`
`2335`		`- data_to_process = self._prepare_result(table.get_model(), data_to_process)`
	`2335`	`+ return self._prepare_result(local_model, data_to_process)`
`2336`	`2336`
`2337`	`2337`	`self._process_event(`
`2338`	`2338`	`self.model_class.objects.filter(table=table),`