diff --git a/trademark/lib/poiskznakov.py b/trademark/lib/poiskznakov.py
index 79d52e9..d65c514 100644
--- a/trademark/lib/poiskznakov.py
+++ b/trademark/lib/poiskznakov.py
@@ -34,7 +34,7 @@ class TrademarkSearchAPI():
'search_string': keyword,
'databases': [21],
'use_translit': 'true',
- 'skip_expired': 'false',
+ 'skip_expired': 'true',
}
if similarity < 100:
diff --git a/trademark/templates/trademark/search_detail.html b/trademark/templates/trademark/search_detail.html
index 264708a..af294ca 100644
--- a/trademark/templates/trademark/search_detail.html
+++ b/trademark/templates/trademark/search_detail.html
@@ -41,6 +41,14 @@
{% endfor %}
+ {% if identity_expired %}
+
Не действующие товарные знаки «{{ keyword.request|title }}»
+
+ {% for tm in identity_expired %}
+ {% include 'trademark/search_list_item.html' with tm=tm %}
+ {% endfor %}
+
+ {% endif %}
{% if nice_busy.count < 45 %}
{% include 'trademark/nice_block_busy.html' with keyword=keyword.request nice_busy=nice_busy products_busy=products_busy %}
diff --git a/trademark/templates/trademark/trademark_detail.html b/trademark/templates/trademark/trademark_detail.html
index 3abf951..b1993e7 100644
--- a/trademark/templates/trademark/trademark_detail.html
+++ b/trademark/templates/trademark/trademark_detail.html
@@ -15,6 +15,16 @@
Регистрация {{ tm.registration_at }}
Номер свидетельства № {{ tm.cert_id }}
+ {% if tm.status == 'Acting' %}
+ {% if tm.expiration_at %}
+ Действует до {{ tm.expiration_at }}
+ {% else %}
+ Действует
+ {% endif %}
+ {% else %}
+ Не действует
+ {% endif %}
+
diff --git a/trademark/views.py b/trademark/views.py
index 7b012b2..1badf97 100644
--- a/trademark/views.py
+++ b/trademark/views.py
@@ -25,8 +25,10 @@ class SearchDetailView(generic.DetailView):
self.get_object().save()
identity = self.get_object().searches.filter(similarity=146)[0]
- identity_results = identity.results.all()
+ identity_results = identity.results.filter(status='Acting')
+ identity_expired_results = identity.results.all().exclude(status='Acting')
context['identity'] = identity_results
+ context['identity_expired'] = identity_expired_results
identity_ids = identity_results.values_list('id', flat=True)
nice_busy_ids = identity_results.values_list('nices__nice_id', flat=True).distinct()