Merge branch 'fix-vm-list-search' into 'master'

Issue #400 ✅

closes #400

See merge request !335

circle/dashboard/templates/dashboard/vm-list.html

@@ -148,7 +148,11 @@
 </div>
 
 <div class="alert alert-info">
-  You can filter the list by certain attributes (owner, name, status, tags) in the following way: "owner:John Doe name:my little server". If you don't specify any attribute names the filtering will be done by name.
+  {% blocktrans %}
+  You can filter the list by certain attributes (owner, name, status, tags)
+  in the following way: "owner:John Doe name:my little server !name:test".
+  If you don't specify any attribute names the filtering will be done by name.
+  {% endblocktrans %}
 </div>
 
 <div class="alert alert-info">

circle/dashboard/views/template.py

@@ -237,7 +237,8 @@ class TemplateList(LoginRequiredMixin, FilterMixin, SingleTableView):
         self.create_fake_get()
 
         try:
-            qs = qs.filter(**self.get_queryset_filters()).distinct()
+            filters, excludes = self.get_queryset_filters()
+            qs = qs.filter(**filters).exclude(**excludes).distinct()
         except ValueError:
             messages.error(self.request, _("Error during filtering."))
 

circle/dashboard/views/util.py

@@ -79,14 +79,26 @@ class FilterMixin(object):
 
     def get_queryset_filters(self):
         filters = {}
-        for item in self.allowed_filters:
-            if item in self.request.GET:
-                filters[self.allowed_filters[item]] = (
-                    self.request.GET[item].split(",")
-                    if self.allowed_filters[item].endswith("__in") else
-                    self.request.GET[item])
+        excludes = {}
+
+        for key, value in self.request.GET.items():
+            if not key:
+                continue
+            exclude = key.startswith('!')
+            key = key.lstrip('!')
+            if key not in self.allowed_filters:
+                continue
+
+            filter_field = self.allowed_filters[key]
+            value = (value.split(",")
+                     if filter_field.endswith("__in") else
+                     value)
+            if exclude:
+                excludes[filter_field] = value
+            else:
+                filters[filter_field] = value
 
-        return filters
+        return filters, excludes
 
     def get_queryset(self):
         return super(FilterMixin,
@@ -118,6 +130,9 @@ class FilterMixin(object):
         >>> o = f._parse_get({'s': "name:hello ws node:node 3 oh"}).items()
         >>> sorted(o) # doctest: +ELLIPSIS
         [(u'name', u'hello ws'), (u'node', u'node 3 oh'), (...)]
+        >>> o = f._parse_get({'s': "!hello:szia"}).items()
+        >>> sorted(o) # doctest: +ELLIPSIS
+        [(u'!hello', u'szia'), (...)]
         """
         s = GET_dict.get("s")
         fake = GET_dict.copy()

circle/dashboard/views/vm.py

@@ -1002,7 +1002,8 @@ class VmList(LoginRequiredMixin, FilterMixin, ListView):
                 in [i.name for i in Instance._meta.fields] + ["pk"]):
             queryset = queryset.order_by(sort)
 
-        return queryset.filter(**self.get_queryset_filters()).prefetch_related(
+        filters, excludes = self.get_queryset_filters()
+        return queryset.filter(**filters).exclude(**excludes).prefetch_related(
             "owner", "node", "owner__profile", "interface_set", "lease",
             "interface_set__host").distinct()
 

circle/locale/hu/LC_MESSAGES/django.po

@@ -2650,6 +2650,26 @@ msgstr "IP cím"
 msgid "No result."
 msgstr "Nincs eredmény."
 
+#: dashboard/templates/dashboard/vm-list.html:151
+msgid ""
+"\n"
+"  You can filter the list by certain attributes (owner, name, status, tags)\n"
+"  in the following way: \"owner:John Doe name:my little server !name:test"
+"\".\n"
+"  If you don't specify any attribute names the filtering will be done by "
+"name.\n"
+"  "
+msgstr ""
+"\n"
+"  A listát szűrheti is bizonyos attribútumok (owner (tulajdonos), name (név), "
+"status (állapot), tags (címkék)) szerint\n"
+"  a következő módon: \"owner:Gipsz Jakab name:én kicsi szerverem !name:teszt"
+"\".\n"
+"  Ha nem ad meg egyetlen attribútumot sem, akkor a szűrés a név szerint fog "
+"történni.\n"
+"name.\n"
+"  "
+
 #: dashboard/templates/dashboard/vm-list.html:155
 msgid ""
 "You can select multiple vm instances while holding down the "