From b6792ca25f1ca155f74bb66f7d093c5d0acc14ef Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Wed, 6 Oct 2021 18:00:07 +0200
Subject: [PATCH] =?UTF-8?q?Import:=20U=C5=BE=20si=20nepleteme=20Round.code?=
=?UTF-8?q?=20a=20Round.seq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/imports.py | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/mo/imports.py b/mo/imports.py
index 7d6ba394..05f7508c 100644
--- a/mo/imports.py
+++ b/mo/imports.py
@@ -180,9 +180,9 @@ class Import:
return self.error(f"Zadána chybná kategorie {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:
- return mo.db.find_round(year, category, seq)
+ return mo.db.find_master_round(year, category, code)
except mo.CheckError as e:
return self.error(str(e))
@@ -545,7 +545,7 @@ class OrgsImport(Import):
template_basename = 'sablona-organizatori'
default_cat: Optional[str]
- default_seq: Optional[str]
+ default_code: Optional[str]
def __init__(
self,
@@ -556,7 +556,7 @@ class OrgsImport(Import):
allow_change_user_to_org: bool = False,
default_place: Optional[db.Place] = None,
default_cat: Optional[str] = None,
- default_seq: Optional[str] = None,
+ default_code: Optional[str] = None,
year: Optional[int] = None
):
super().__init__(user)
@@ -565,7 +565,7 @@ class OrgsImport(Import):
self.only_region = only_region
self.default_place = default_place
self.default_cat = self.parse_category(default_cat)
- self.default_seq = default_seq
+ self.default_code = default_code
self.default_place = default_place
self.allow_change_user_to_org = allow_change_user_to_org
self.root_place = db.get_root_place()
@@ -584,9 +584,9 @@ class OrgsImport(Import):
kategorie = self.parse_category(kat)
else:
kategorie = self.default_cat
- seq = getattr(r, "kolo", "") or self.default_seq
- if seq:
- kolo = self.parse_round(self.year, kategorie, seq)
+ code = getattr(r, "kolo", "") or self.default_code
+ if code:
+ kolo = self.parse_master_round(self.year, kategorie, code)
if not kolo:
return
else:
--
GitLab