Browse Source

Pridana funkce na aktivni organizatory.

Priprava na autocomplete organizatoru, ale potreba prejit na
novou verzi django-autocomplete-light.
remotes/origin/prednasky
parent
commit
4ea24e673a
  1. 5
      seminar/urls.py
  2. 32
      seminar/views.py

5
seminar/urls.py

@ -68,4 +68,9 @@ urlpatterns = [
url(r'^tex-upload/login/$', views.LoginView, name='seminar_login'), url(r'^tex-upload/login/$', views.LoginView, name='seminar_login'),
url(r'^tex-upload/$', staff_member_required(views.texUploadView), name='seminar_tex_upload'), url(r'^tex-upload/$', staff_member_required(views.texUploadView), name='seminar_tex_upload'),
# Ceka na autocomplete v3
#url(r'^autocomplete/organizatori/$', staff_member_required(views.OrganizatorAutocomplete.as_view()), name='seminar_autocomplete_organizator')
] ]

32
seminar/views.py

@ -123,11 +123,16 @@ class StareNovinkyView(generic.ListView):
### Co je M&M ### Co je M&M
## Organizatori ## Organizatori
def aktivniOrganizatori(rok=date.today().year):
return Organizator.objects.exclude(
organizuje_do_roku__isnull=False,
organizuje_do_roku__lt=rok
).order_by('user__first_name')
class CojemamOrganizatoriView(generic.ListView): class CojemamOrganizatoriView(generic.ListView):
model = Organizator model = Organizator
template_name='seminar/cojemam/organizatori.html' template_name='seminar/cojemam/organizatori.html'
queryset = Organizator.objects.exclude(organizuje_do_roku__isnull=False, organizuje_do_roku__lt=date.today().year).order_by('user__first_name') queryset = aktivniOrganizatori()
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs) context = super(CojemamOrganizatoriView, self).get_context_data(**kwargs)
context['aktivni'] = True context['aktivni'] = True
@ -136,7 +141,7 @@ class CojemamOrganizatoriView(generic.ListView):
class CojemamOrganizatoriStariView(generic.ListView): class CojemamOrganizatoriStariView(generic.ListView):
model = Organizator model = Organizator
template_name='seminar/cojemam/organizatori.html' template_name='seminar/cojemam/organizatori.html'
queryset = Organizator.objects.filter(organizuje_do_roku__isnull=False, organizuje_do_roku__lt=date.today().year).order_by('-organizuje_do_roku') queryset = aktivniOrganizatori().order_by('-organizuje_do_roku')
### Archiv ### Archiv
@ -782,3 +787,26 @@ def texDownloadView(request, rocnik, cislo):
], ],
} }
return JsonResponse(response) return JsonResponse(response)
# Ceka na autocomplete v3
#class OrganizatorAutocomplete(autocomplete.Select2QuerySetView):
# def get_queryset(self):
# if not self.request.user.is_authenticated():
# return Organizator.objects.none()
#
# qs = aktivniOrganizatori()
#
# if self.q:
# if self.q[0] == "!":
# qs = Organizator.objects.all()
# query = self.q[1:]
# else:
# query = self.q
# qs = qs.filter(
# Q(prezdivka__isstartswith=query)|
# Q(user__first_name__isstartswith=query)|
# Q(user__last_name__isstartswith=query))
#
# return qs

Loading…
Cancel
Save