Added search form to specialist catalog

company/views.py

@@ -21,7 +21,7 @@ from meta.views import MetadataMixin
 
 class CompanySearchView(ListView):
     paginate_by = 10
-    template_name = 'company/search.html'
+    template_name = 'client/company/search.html'
     search_form = CompanySearchForm
     model = Company
 

specialist_catalog/forms.py

@@ -62,3 +62,4 @@ class FeedbackForm(forms.ModelForm):
         widgets = {
             'text':CKEditorWidget
         }
+

specialist_catalog/models.py

@@ -20,6 +20,7 @@ class Specialist(models.Model):
     country = models.ForeignKey(Country, on_delete=models.PROTECT, verbose_name=u"Страна")
     photo = models.ImageField(verbose_name=u"Фото", upload_to="specialist_catalog/specialist_photo/", blank=True)
 
+
     def __unicode__(self):
         return u"%s" % self.name
 

specialist_catalog/views.py

@@ -21,11 +21,24 @@ class SpecialistCreateView(CreateView):
     success_url = reverse_lazy("specialist_all")
 
 
+from hvad.utils import get_translation_aware_manager
+
+
 class SpecialistListView(ListView):
     model = Specialist
     template_name = 'admin/specialist/specialist_all.html'
     paginate_by = settings.ADMIN_PAGINATION
 
+    def get_queryset(self):
+        name = self.request.GET.get('name', None)
+        city = self.request.GET.get('city', None)
+        qs = get_translation_aware_manager(Specialist).all()
+        if name:
+            qs = qs.filter(name__icontains=name)
+        if city:
+            qs = qs.filter(city__name__icontains=city)
+        return qs
+
 
 class SpecialistUpdateView(UpdateView):
     form_class = SpecialistForm
@@ -67,8 +80,11 @@ class CatalogCityView(ListView):
     paginate_by = settings.ADMIN_PAGINATION
 
     def get_queryset(self):
-        qs = super(CatalogCityView, self).get_queryset()
+        query = self.request.GET.get('query', None)
-        return qs.filter(type=2)
+        qs = self.model.objects.language().filter(type=2)
+        if query:
+            qs = qs.filter(title__icontains=query)
+        return qs
 
 
 class CatalogCountryView(ListView):
@@ -77,8 +93,11 @@ class CatalogCountryView(ListView):
     paginate_by = settings.ADMIN_PAGINATION
 
     def get_queryset(self):
-        qs = super(CatalogCountryView, self).get_queryset()
+        query = self.request.GET.get('query', None)
-        return qs.filter(type=1)
+        qs = self.model.objects.language().filter(type=1)
+        if query:
+            qs = qs.filter(title__icontains=query)
+        return qs
 
 
 class CatalogUpdateView(UpdateView):

static/client

@@ -1 +0,0 @@
-/home/www/proj/templates/client/static_client

static/client

@@ -0,0 +1 @@
+/home/www/proj/templates/client/static_client

templates/admin/specialist/catalog_all.html

@@ -1,6 +1,19 @@
 {% extends 'base.html' %}
 {% load thumbnail %}
 {% block body %}
+<div class="box span8">
+    <div class="box-header well">
+        <h2><i class="icon-arrow-down"></i>Поиск</h2>
+    </div>
+    <div class="box-content">
+        <form method="get">
+            <input id="find" type ='text' name = 'query' placeholder="Введите запрос">
+            <button type="submit" class="btn">Найти</button>
+        </form>
+    </div>
+
+</div>
+
 <div class="box span8">
     <div class="box-header well">
         <h2><i class="icon-arrow-down"></i>Все каталоги специалистов</h2>

templates/admin/specialist/specialist_all.html

@@ -1,6 +1,20 @@
 {% extends 'base.html' %}
 {% load thumbnail %}
 {% block body %}
+<div class="box span8">
+    <div class="box-header well">
+        <h2><i class="icon-arrow-down"></i>Поиск</h2>
+    </div>
+    <div class="box-content">
+        <form method="get">
+            <input id="find" type ='text' name = 'name' placeholder="Введите имя">
+            <input id="find1" type ='text' name = 'city' placeholder="Город">
+            <button type="submit" class="btn">Найти</button>
+        </form>
+    </div>
+
+</div>
+
 <div class="box span8">
     <div class="box-header well">
         <h2><i class="icon-arrow-down"></i>Список специалистов(переводчиков)</h2>