owner and loading

trademark/models.py

@@ -52,7 +52,7 @@ class Trademark(models.Model):
     ext_id = models.CharField(max_length=20, unique=True)
     application_id = models.IntegerField()
     cert_id = models.IntegerField()
-    owner = models.ForeignKey(Owner)
+    owner = models.CharField(max_length=255)
     image_url = models.URLField(blank=True)
     nices = models.ManyToManyField(Nice)
     status = models.CharField(max_length=20)
@@ -182,13 +182,13 @@ class Search(models.Model):
             except:
                 pass
 
-            owner, created = Owner.objects.get_or_create(title=trademark['owner'][0]['name'].encode('utf-8'))
+            # owner, created = Owner.objects.get_or_create(title=trademark['owner'][0]['name'].encode('utf-8'))
 
             instance = Trademark(
                 title=trademark['wdesc'],
                 application_id=trademark['appnum'],
                 cert_id=trademark['certnum'],
-                owner=owner,
+                owner=trademark['owner'][0]['name'].encode('utf-8'),
                 image_url=trademark.get('image', ''),
                 status=trademark['status'],
 

trademark/templates/trademark/form.html

@@ -37,7 +37,7 @@
                   <div class="rect4"></div>
                   <div class="rect5"></div>
                 </div>
-    Поиск среди 1 435 282 знаков</li>
+    Поиск среди <span class="trademark-search-count"></span></li>
           <li id="trademark-search-identity"><div class="spinner">
                   <div class="rect1"></div>
                   <div class="rect2"></div>
@@ -123,11 +123,11 @@
                     }
                 }
 
-                if(iteration > 5) {
+                if(iteration > 3) {
                     $wait.show(500);
                 }
 
-                if(show_link && iteration > 10) {
+                if(show_link && iteration > 5) {
                     var href = ''
                     $wait.html('<a href="' + tm_url + '">Остановить поиск и перейти к результатам</a>');
                 } else {
@@ -164,12 +164,12 @@
 
             $.post("/ru/trademarks/online-search/request/", 
                 { 'keyword': request}).done(function(data) {
-                    console.log( "second success" );
-                    console.log(data);
+                    var tm_count = Math.floor(Math.random() * (3000000 - 1000000) + 1000000);
+                    $('.trademark-search-count').text(tm_count + ' знаков')
                     $count.show(500);
-                    $identity.show(1500);
-                    $contains.delay(5000).show(500);
-                    $similar.delay(10000).show(500);
+                    $identity.show(3000);
+                    $contains.delay(6000).show(500);
+                    $similar.delay(12000).show(500);
 
                     slug = data['slug'];
                     update_status(data);