Skip to content
Snippets Groups Projects
Commit b6792ca2 authored by Martin Mareš's avatar Martin Mareš
Browse files

Import: Už si nepleteme Round.code a Round.seq

parent f69d4b61
No related branches found
No related tags found
1 merge request!97Import orgů
...@@ -180,9 +180,9 @@ class Import: ...@@ -180,9 +180,9 @@ class Import:
return self.error(f"Zadána chybná kategorie {kategorie}") return self.error(f"Zadána chybná kategorie {kategorie}")
return kategorie return kategorie
def parse_round(self, year: Optional[int], category: Optional[str], seq: str) -> Optional[db.Round]: def parse_master_round(self, year: Optional[int], category: Optional[str], code: str) -> Optional[db.Round]:
try: try:
return mo.db.find_round(year, category, seq) return mo.db.find_master_round(year, category, code)
except mo.CheckError as e: except mo.CheckError as e:
return self.error(str(e)) return self.error(str(e))
...@@ -545,7 +545,7 @@ class OrgsImport(Import): ...@@ -545,7 +545,7 @@ class OrgsImport(Import):
template_basename = 'sablona-organizatori' template_basename = 'sablona-organizatori'
default_cat: Optional[str] default_cat: Optional[str]
default_seq: Optional[str] default_code: Optional[str]
def __init__( def __init__(
self, self,
...@@ -556,7 +556,7 @@ class OrgsImport(Import): ...@@ -556,7 +556,7 @@ class OrgsImport(Import):
allow_change_user_to_org: bool = False, allow_change_user_to_org: bool = False,
default_place: Optional[db.Place] = None, default_place: Optional[db.Place] = None,
default_cat: Optional[str] = None, default_cat: Optional[str] = None,
default_seq: Optional[str] = None, default_code: Optional[str] = None,
year: Optional[int] = None year: Optional[int] = None
): ):
super().__init__(user) super().__init__(user)
...@@ -565,7 +565,7 @@ class OrgsImport(Import): ...@@ -565,7 +565,7 @@ class OrgsImport(Import):
self.only_region = only_region self.only_region = only_region
self.default_place = default_place self.default_place = default_place
self.default_cat = self.parse_category(default_cat) self.default_cat = self.parse_category(default_cat)
self.default_seq = default_seq self.default_code = default_code
self.default_place = default_place self.default_place = default_place
self.allow_change_user_to_org = allow_change_user_to_org self.allow_change_user_to_org = allow_change_user_to_org
self.root_place = db.get_root_place() self.root_place = db.get_root_place()
...@@ -584,9 +584,9 @@ class OrgsImport(Import): ...@@ -584,9 +584,9 @@ class OrgsImport(Import):
kategorie = self.parse_category(kat) kategorie = self.parse_category(kat)
else: else:
kategorie = self.default_cat kategorie = self.default_cat
seq = getattr(r, "kolo", "") or self.default_seq code = getattr(r, "kolo", "") or self.default_code
if seq: if code:
kolo = self.parse_round(self.year, kategorie, seq) kolo = self.parse_master_round(self.year, kategorie, code)
if not kolo: if not kolo:
return return
else: else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment