From e0c74247e6c0cbf946cfedacc204e3224c658721 Mon Sep 17 00:00:00 2001 From: fefa4ka Date: Wed, 2 Nov 2016 19:27:16 +0300 Subject: [PATCH] fix --- trademark/models.py | 2 +- trademark/templates/trademark/form.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/trademark/models.py b/trademark/models.py index 7e114b7..81ce70f 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.CharField(max_length=20) + ext_id = models.CharField(max_length=20, unique=True) application_id = models.IntegerField() cert_id = models.IntegerField() owner = models.ForeignKey(Owner) diff --git a/trademark/templates/trademark/form.html b/trademark/templates/trademark/form.html index ba2a360..33e69b6 100644 --- a/trademark/templates/trademark/form.html +++ b/trademark/templates/trademark/form.html @@ -99,7 +99,7 @@ if(identity['status'] == 'finished') { var count = identity['count']; if(count > 0) { - $identity.text(GetNoun(count, 'Найден', 'Найдены', 'Найдено') + ' '+ count + ' ' + GetAdj(count, 'такой', 'таких') + ' ' + GetNoun(count, 'знак', 'знака', 'знаков')+ ' в ' + identity['nices'] + ' ' + GetNoun(count, 'классе', 'классах', 'классах')); + $identity.text(GetNoun(count, 'Найден', 'Найдены', 'Найдено') + ' '+ count + ' ' + GetAdj(count, 'такой', 'таких') + ' ' + GetNoun(count, 'знак', 'знака', 'знаков')+ ' в ' + identity['nices'] + ' ' + GetNoun(identity['nices'], 'классе', 'классах', 'классах')); } else { $identity.text('Точно таких же знаков не найдено'); }