From 72e535f5b01af93ecbf3246be31ab282af99b3aa Mon Sep 17 00:00:00 2001 From: "John N. Milner" Date: Thu, 7 Nov 2024 00:00:30 -0500 Subject: [PATCH] Fix merge --- .../apps/viewer/models/data_dictionary.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/kobo/apps/openrosa/apps/viewer/models/data_dictionary.py b/kobo/apps/openrosa/apps/viewer/models/data_dictionary.py index 0c76e771c9..6a9922315a 100644 --- a/kobo/apps/openrosa/apps/viewer/models/data_dictionary.py +++ b/kobo/apps/openrosa/apps/viewer/models/data_dictionary.py @@ -1,5 +1,4 @@ # coding: utf-8 -import io import os import re from xml.dom import Node @@ -165,15 +164,11 @@ def save(self, *args, **kwargs): ) if survey.name == DEFAULT_SURVEY_NAME: survey.name = survey.id_string - survey = create_survey_from_xls(xls_bytes_io) - survey.update( - { - ) - self.json = survey.to_json() - self.xml = survey.to_xml() - self._mark_start_time_boolean() - set_uuid(self) - self.set_uuid_in_xml(id_string=survey.id_string) + self.json = survey.to_json() + self.xml = survey.to_xml() + self._mark_start_time_boolean() + set_uuid(self) + self.set_uuid_in_xml(id_string=survey.id_string) super().save(*args, **kwargs) def file_name(self):