From 9fb74a32206dc83deb9b00ef37dd23ea1fdca1d1 Mon Sep 17 00:00:00 2001
From: ivanhan0511 <ivanhan0511@gmail.com>
Date: Thu, 6 Jan 2022 10:23:54 +0000
Subject: [PATCH 1/2] update static/admin/component/pear/font/iconfont.css.

---
 static/admin/component/pear/font/iconfont.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/admin/component/pear/font/iconfont.css b/static/admin/component/pear/font/iconfont.css
index 5f6eb5f..52d5988 100644
--- a/static/admin/component/pear/font/iconfont.css
+++ b/static/admin/component/pear/font/iconfont.css
@@ -441,7 +441,7 @@
   content: "\e66a";
 }
 
-.pear-icon-ashbin:before {
+.pear-icon-trashbin:before {
   content: "\e66b";
 }
 
-- 
Gitee


From 79762ee1b0a1d1ba61ca9506cb3509365750db1b Mon Sep 17 00:00:00 2001
From: ivanhan0511 <ivanhan0511@gmail.com>
Date: Thu, 10 Mar 2022 22:11:06 +0800
Subject: [PATCH 2/2] Improvement that makes value `0` valid in helper.py when
 filter 0

---
 applications/common/helper.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/applications/common/helper.py b/applications/common/helper.py
index ca2994c..f79784a 100644
--- a/applications/common/helper.py
+++ b/applications/common/helper.py
@@ -28,7 +28,7 @@ class ModelFilter:
         :param field_name: 模型字段名称
         :param value: 值
         """
-        if value and value != '':
+        if (value is not None) and (value != ''):
             self.filter_field[field_name] = {"data": value, "type": self.type_exact}
 
     def neq(self, field_name, value):
@@ -37,7 +37,7 @@ class ModelFilter:
         :param field_name: 模型字段名称
         :param value: 值
         """
-        if value and value != '':
+        if (value is not None) and (value != ''):
             self.filter_field[field_name] = {"data": value, "type": self.type_neq}
 
     def greater(self, field_name, value):
@@ -46,7 +46,7 @@ class ModelFilter:
         :param field_name: 模型字段名称
         :param value: 值
         """
-        if value and value != '':
+        if (value is not None) and (value != ''):
             self.filter_field[field_name] = {"data": value, "type": self.type_greater}
 
     def less(self, field_name, value):
@@ -55,7 +55,7 @@ class ModelFilter:
         :param field_name: 模型字段名称
         :param value: 值
         """
-        if value and value != '':
+        if (value is not None) and (value != ''):
             self.filter_field[field_name] = {"data": value, "type": self.type_less}
 
     def vague(self, field_name, value: str):
@@ -64,7 +64,7 @@ class ModelFilter:
         :param field_name: 模型字段名称
         :param value: 值
         """
-        if value and value != '':
+        if (value is not None) and (value != ''):
             self.filter_field[field_name] = {"data": ('%' + value + '%'), "type": self.type_vague}
 
     def left_vague(self, field_name, value: str):
@@ -73,7 +73,7 @@ class ModelFilter:
         :param field_name: 模型字段名称
         :param value: 值
         """
-        if value and value != '':
+        if (value is not None) and (value != ''):
             self.filter_field[field_name] = {"data": ('%' + value), "type": self.type_vague}
 
     def right_vague(self, field_name, value: str):
@@ -82,7 +82,7 @@ class ModelFilter:
         :param field_name: 模型字段名称
         :param value: 值
         """
-        if value and value != '':
+        if (value is not None) and (value != ''):
             self.filter_field[field_name] = {"data": (value + '%'), "type": self.type_vague}
 
     def contains(self, field_name, value: str):
@@ -91,16 +91,18 @@ class ModelFilter:
         :param field_name: 模型字段名称
         :param value: 值
         """
-        if value and value != '':
+        if (value is not None) and (value != ''):
             self.filter_field[field_name] = {"data": value, "type": self.type_contains}
 
     def between(self, field_name, value1, value2):
         """
         范围查询字段
         :param field_name: 模型字段名称
-        :param value: 值
+        :param value1: 值
+        :param value2: 值
         """
-        if value1 and value2 and value1 != '' and value2 != '':
+        if (value1 is not None) and (value1 != '') \
+                and (value2 is not None) and (value2 != ''):
             self.filter_field[field_name] = {"data": [value1, value2], "type": self.type_between}
 
     def get_filter(self, model: db.Model):
-- 
Gitee