remotes/origin/1203
Kotiuk Nazarii 11 years ago
parent 65ef94d701
commit f38d0a599a
  1. 5
      country/models.py
  2. 5
      settings/templatetags/template_filters.py
  3. 6
      templates/client/simple_pages/expo_seminar.html

@ -145,8 +145,9 @@ class Country(TranslatableModel):
return Webinar.objects.filter(country=self.id).count()
def active_cities(self):
return City.used.active_qs().filter(country=self)
result = list(set(City.used.active_qs().filter(country=self)))
result.sort(key=lambda x:x.name)
return result
lang = translation.get_language()
#return City.objects.select_related('exposition_city')\
# .filter(exposition_city__city__isnull=False, translations__language_code=lang, country=self).distinct().order_by('translations__name')

@ -228,7 +228,10 @@ def without_page(value):
@register.filter
def note_by_user(obj, user):
return obj.get_note_by_user(user.id)
if obj:
return obj.get_note_by_user(user.id)
return ''
@register.filter
def isdigit(value):

@ -248,6 +248,9 @@
<div class="form-group required">
<input type="text" class="form-control" id="surname" name="surname" placeholder="Фамилия:">
</div>
<div class="form-group required">
<input type="text" class="form-control" id="phone" name="phone" placeholder="Номер телефона:">
</div>
<div class="form-group required">
<input type="text" class="form-control" id="email" name="email" placeholder="Email:">
</div>
@ -286,6 +289,9 @@
<div class="form-group required">
<input type="text" class="form-control" id="surname" name="surname" placeholder="Фамилия:">
</div>
<div class="form-group required">
<input type="text" class="form-control" id="phone" name="phone" placeholder="Номер телефона:">
</div>
<div class="form-group required">
<input type="text" class="form-control" id="email" name="email" placeholder="Email:">
</div>

Loading…
Cancel
Save