Merge branch 'master' into devel

mo/db.py

@@ -45,6 +45,15 @@ class MOEnum(str, PythonEnum):
             out.append((item.name, item.friendly_name()))
         return out
 
+    @classmethod
+    def coerce(enum, name):
+        if isinstance(name, enum):
+            return name
+        try:
+            return enum[name]
+        except KeyError:
+            raise ValueError(name)
+
 
 class PlaceType(MOEnum):
     region = auto()
@@ -62,15 +71,6 @@ class PlaceType(MOEnum):
                 out.append((item.name, name))
         return out
 
-    @classmethod
-    def coerce(enum, name):
-        if isinstance(name, enum):
-            return name
-        try:
-            return enum[name]
-        except KeyError:
-            raise ValueError(name)
-
 
 # list of allowed levels
 place_type_names_and_levels = {
@@ -267,13 +267,6 @@ class PartState(MOEnum):
     present = auto()
     absent = auto()
 
-    @classmethod
-    def choices(enum):
-        out = []
-        for item in enum:
-            out.append((item.name, item.friendly_name()))
-        return out
-
     def friendly_name(self) -> str:
         return part_state_names[self]
 

mo/web/org_users.py

@@ -153,7 +153,7 @@ def org_orgs():
 
 
 class FormAddRole(FlaskForm):
-    role = wtforms.SelectField('Role', choices=[(name.name, role.name) for (name, role) in mo.rights.roles_by_type.items()])
+    role = wtforms.SelectField('Role',  choices=db.RoleType.choices(), coerce=db.RoleType.coerce)
     place_code = wtforms.StringField('Oblast')
     year = wtforms.IntegerField('Ročník', validators=[validators.Optional()])
     category = wtforms.StringField("Kategorie", validators=[validators.Length(max=2)], filters=[lambda x: x or None])