diff --git a/trademark/models.py b/trademark/models.py
index ffe5c0f..3090784 100644
--- a/trademark/models.py
+++ b/trademark/models.py
@@ -49,7 +49,7 @@ class Nice(models.Model):
class Trademark(models.Model):
title = models.CharField(max_length=255)
- ext_id = models.IntegerField()
+ ext_id = models.CharField()
application_id = models.IntegerField()
cert_id = models.IntegerField()
owner = models.ForeignKey(Owner)
@@ -156,6 +156,7 @@ class Search(models.Model):
def get_results(self):
results, status = TrademarkAPI.get_results(self.search_id)
+ # print status['search_status']
if status['search_status'] == 'failed':
self.send_request
return
@@ -194,7 +195,7 @@ class Search(models.Model):
application_at=trademark['dateapp'],
registration_at=trademark['datereg'],
- ext_id=int(trademark['id']),
+ ext_id=trademark['id'],
access_key=trademark['access_key']
)
@@ -208,7 +209,7 @@ class Search(models.Model):
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)]
if len(trademark_ids) == 0:
diff --git a/trademark/templates/trademark/form.html b/trademark/templates/trademark/form.html
index 1b6c8e6..769daef 100644
--- a/trademark/templates/trademark/form.html
+++ b/trademark/templates/trademark/form.html
@@ -114,7 +114,7 @@
if(show_link && iteration > 10) {
var href = ''
- $wait.text('Остановить поиск и перейти к результатам');
+ $wait.html('Остановить поиск и перейти к результатам');
} else {
console.log(iteration);
}