diff --git a/controllers/service.py b/controllers/service.py index 24cc002caeb911eadac076fe57a1b920f705e52f..1594cac0b0009d2e65939c39811ee4a58658868d 100644 --- a/controllers/service.py +++ b/controllers/service.py @@ -52,7 +52,7 @@ class storage_service(object): @classmethod def getItem(self, key, value=''): res = Storage.getItem(key,value) - if not str(res) or str(res) == '0' or str(res) == 'false' or str(res) == 'False': + if str(res) == '0' or str(res) == 'false' or str(res) == 'False': return 0 return res diff --git a/js/version.txt b/js/version.txt index e845c6312125bd19e8c2d2404d7509d9b62e30b4..8531bec5d152e4fe573fe6ef3bf18f60539a6718 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.6.10 \ No newline at end of file +3.6.11 \ No newline at end of file diff --git a/utils/files.py b/utils/files.py index 26e8ae0552b36bae3474f0e39b5382e166b261f8..fbabaeabf80bebca6e79e5671afb8ea94894ddab 100644 --- a/utils/files.py +++ b/utils/files.py @@ -107,9 +107,9 @@ def getCustonDict(host): def get_multi_rules(rules): lsg = storage_service() - multi_mode = lsg.getItem('MULTI_MODE') + multi_mode = lsg.getItem('MULTI_MODE',0) fix_multi = ['drpy'] - if not multi_mode: + if not multi_mode or str(multi_mode)=='0': rules['list'] = list(filter(lambda x: x['name'] in fix_multi or x.get('multi'), rules['list'])) rules['count'] = len(rules['list']) # print(rules)