From e9a821ef77c0990f5c78d4b580434f87a39b01b4 Mon Sep 17 00:00:00 2001 From: fefa4ka Date: Tue, 8 Nov 2016 04:47:10 +0300 Subject: [PATCH] api fix --- trademark/lib/poiskznakov.py | 6 ++++-- trademark/models.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/trademark/lib/poiskznakov.py b/trademark/lib/poiskznakov.py index 4e97167..bf317ce 100644 --- a/trademark/lib/poiskznakov.py +++ b/trademark/lib/poiskznakov.py @@ -83,10 +83,12 @@ class TrademarkSearchAPI(): request = { 'module': 'detail', 'procedure': 'get_detail_info', - 'marks': ids, - 'access_keys': keys + 'marks': list(ids), + 'access_keys': list(keys) } + data = self.send_request(request) + return data['records_list']['21']['records'] diff --git a/trademark/models.py b/trademark/models.py index b739afd..527b87e 100644 --- a/trademark/models.py +++ b/trademark/models.py @@ -246,8 +246,8 @@ class Search(models.Model): instance.nices.add(nice) - trademark_ids = [ext_id for ext_id in self.results.values_list('ext_id', flat=True)] - trademark_keys = [key for key in self.results.values_list('access_key', flat=True)] + trademark_ids = self.results.values_list('ext_id', flat=True).order_by('ext_id') + trademark_keys = self.results.values_list('access_key', flat=True).order_by('ext_id') if len(trademark_ids) == 0: return