ext_id as string

master
fefa4ka 9 years ago
parent 7ed7ad9010
commit 7dd62ffd06
  1. 7
      trademark/models.py
  2. 2
      trademark/templates/trademark/form.html

@ -49,7 +49,7 @@ class Nice(models.Model):
class Trademark(models.Model): class Trademark(models.Model):
title = models.CharField(max_length=255) title = models.CharField(max_length=255)
ext_id = models.IntegerField() ext_id = models.CharField()
application_id = models.IntegerField() application_id = models.IntegerField()
cert_id = models.IntegerField() cert_id = models.IntegerField()
owner = models.ForeignKey(Owner) owner = models.ForeignKey(Owner)
@ -156,6 +156,7 @@ class Search(models.Model):
def get_results(self): def get_results(self):
results, status = TrademarkAPI.get_results(self.search_id) results, status = TrademarkAPI.get_results(self.search_id)
# print status['search_status']
if status['search_status'] == 'failed': if status['search_status'] == 'failed':
self.send_request self.send_request
return return
@ -194,7 +195,7 @@ class Search(models.Model):
application_at=trademark['dateapp'], application_at=trademark['dateapp'],
registration_at=trademark['datereg'], registration_at=trademark['datereg'],
ext_id=int(trademark['id']), ext_id=trademark['id'],
access_key=trademark['access_key'] access_key=trademark['access_key']
) )
@ -208,7 +209,7 @@ class Search(models.Model):
result.save() result.save()
trademark_ids = [int(ext_id) for ext_id in self.results.values_list('ext_id', flat=True)] trademark_ids = [ext_id for ext_id in self.results.values_list('ext_id', flat=True)]
trademark_keys = [str(key) for key in self.results.values_list('access_key', flat=True)] trademark_keys = [str(key) for key in self.results.values_list('access_key', flat=True)]
if len(trademark_ids) == 0: if len(trademark_ids) == 0:

@ -114,7 +114,7 @@
if(show_link && iteration > 10) { if(show_link && iteration > 10) {
var href = '' var href = ''
$wait.text('<a href="' + tm_url + '">Остановить поиск и перейти к результатам</a>'); $wait.html('<a href="' + tm_url + '">Остановить поиск и перейти к результатам</a>');
} else { } else {
console.log(iteration); console.log(iteration);
} }

Loading…
Cancel
Save