diff --git a/mo/web/org_users.py b/mo/web/org_users.py index 985f7f8dc2d33191ce726271511d40ca30891aa9..f52b6eb1d5911312869f3dc4ff2439937f1127bf 100644 --- a/mo/web/org_users.py +++ b/mo/web/org_users.py @@ -149,14 +149,15 @@ def org_users(): can_add=rr.have_right(Right.add_users), ) + class OrgsFilterForm(PagerForm): # user search_name = wtforms.TextField("Jméno/příjmení", render_kw={'autofocus': True}) search_email = wtforms.TextField("E-mail") - search_role = wtforms.SelectMultipleField('Role', choices=db.RoleType.choices(), coerce=db.RoleType.coerce, validators=[validators.Optional()]) - search_right_for_place_code = wtforms.StringField('Právo pro oblast', validators=[validators.Optional()]) - search_in_place_code = wtforms.StringField('V oblasti', validators=[validators.Optional()]) + search_role = wtforms.SelectMultipleField('Role', choices=db.RoleType.choices(), coerce=db.RoleType.coerce, validators=[validators.Optional()]) + search_right_for_place = mo_fields.Place('Právo pro oblast', validators=[validators.Optional()]) + search_in_place = mo_fields.Place('V oblasti', validators=[validators.Optional()]) search_place_level = wtforms.SelectMultipleField("Úroveň oblasti", choices=[(i.level, i.name) for i in db.place_levels], validators=[validators.Optional()], coerce=int) search_year = wtforms.StringField('Ročník', validators=[validators.Optional()]) search_category = wtforms.StringField("Kategorie", validators=[validators.Optional()]) @@ -188,15 +189,11 @@ class OrgsFilterForm(PagerForm): def validate_search_role(self, field): self.f_search_role = field.data - def validate_search_right_for_place_code(self, field): - self.f_search_right_for_place = db.get_place_by_code(field.data) - if self.f_search_right_for_place is None: - raise wtforms.ValidationError("Chybné označení oblasti") + def validate_search_right_for_place(self, field): + self.f_search_right_for_place = field.place - def validate_search_in_place_code(self, field): - self.f_search_in_place = db.get_place_by_code(field.data) - if self.f_search_in_place is None: - raise wtforms.ValidationError("Chybné označení oblasti") + def validate_search_in_place(self, field): + self.f_search_in_place = field.place def validate_search_year(self, field): try: @@ -226,8 +223,8 @@ class OrgsFilterForm(PagerForm): else: del self.hide_role_filter del self.search_role - del self.search_right_for_place_code - del self.search_in_place_code + del self.search_right_for_place + del self.search_in_place del self.search_place_level del self.search_year del self.search_category diff --git a/mo/web/templates/org_orgs.html b/mo/web/templates/org_orgs.html index 3d093c5389df2b03400c6a251f419fedc9beaa07..a3de5daf13ba6b8b7d6ed1f8369e9b1a6903771d 100644 --- a/mo/web/templates/org_orgs.html +++ b/mo/web/templates/org_orgs.html @@ -33,8 +33,8 @@ {{ wtf.form_field(filter.search_seq, placeholder='Např. 1,3-4') }} </div> <div class="col-sm-2"> - <span title="Omezí role na ty, které jsou přiděleny k dané oblasti a nebo její podoblasti.">{{ wtf.form_field(filter.search_in_place_code, placeholder='Kód oblasti') }}</span> - <span title="Omezí role na ty, které mají právo k dané oblasti. Tedy mohou být přiděleny i k nadřazené oblasti.">{{ wtf.form_field(filter.search_right_for_place_code, placeholder='Kód oblasti') }}</span> + <span title="Omezí role na ty, které jsou přiděleny k dané oblasti a nebo její podoblasti.">{{ wtf.form_field(filter.search_in_place) }}</span> + <span title="Omezí role na ty, které mají právo k dané oblasti. Tedy mohou být přiděleny i k nadřazené oblasti.">{{ wtf.form_field(filter.search_right_for_place) }}</span> </div> <div class="col-sm-2"> {{ wtf.form_field(filter.search_place_level, size=filter.search_place_level.choices|length, class="form-control no-scroll" ) }}