Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jnm committed Nov 7, 2024
1 parent 189e514 commit 72e535f
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions kobo/apps/openrosa/apps/viewer/models/data_dictionary.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# coding: utf-8
import io
import os
import re
from xml.dom import Node
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit 72e535f

Please sign in to comment.