Переглянути джерело

Fix filter functionality

This begins to annoy, why does filter has to be
so hard ?

Better SQL query maybe?
oz123 11 роки тому
батько
коміт
7587c07187
2 змінених файлів з 5 додано та 3 видалено
  1. 4 2
      pwman/data/drivers/sqlite.py
  2. 1 1
      pwman/ui/ocli.py

+ 4 - 2
pwman/data/drivers/sqlite.py

@@ -204,8 +204,10 @@ class SQLiteDatabaseNewForm(Database):
                 else:
                 else:
                     first = False
                     first = False
                 sql += ("SELECT NODE FROM LOOKUP LEFT JOIN TAGS ON TAG = "
                 sql += ("SELECT NODE FROM LOOKUP LEFT JOIN TAGS ON TAG = "
-                        " TAGS.ID WHERE TAGS.DATA = ? ")
-                params = [t.name.strip()]
+                        " TAGS.ID WHERE TAGS.DATA like ? ")
+                p = t._name.strip()
+                p += '%'
+                params = [p]
         try:
         try:
             self._cur.execute(sql, params)
             self._cur.execute(sql, params)
             rows = self._cur.fetchall()
             rows = self._cur.fetchall()

+ 1 - 1
pwman/ui/ocli.py

@@ -820,7 +820,7 @@ class BaseCommands(PwmanCliOld):
             if len(tags) == 0:
             if len(tags) == 0:
                 print ("None",)
                 print ("None",)
             for t in tags:
             for t in tags:
-                print ("%s " % (t.name),)
+                print ("%s " % t)
             print
             print
         except Exception, e:
         except Exception, e:
             self.error(e)
             self.error(e)