Fix item deja ds playlist (convert resource_id to int)

Remove print queries backend

diff --git a/env/debug.env b/env/debug.env
index 7a9fbbcc2efd668f22107e8e9316a87bd0755b0f..a19e34770877c2c4104fc1cee497ee521afd6e88 100644 (file)
--- a/env/debug.env
+++ b/env/debug.env
@@ -18,4 +18,4 @@ BROKER_URL=redis://broker:6379/0
 # If this is True, all tasks will be executed locally by blocking until the task returns.
 CELERY_ALWAYS_EAGER=False
 
-REINDEX=True
+REINDEX=False

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 686931e00b94310ee15358bb6758181ecba86fdb..de2ed03265fc46a5ec684f1e81164a5210839ca7 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -98,6 +98,7 @@
 {% endblock %}
 
 {% block title_buttons %}
+
 <div>
     <a href="{% url "telemeta-item-detail" previous %}">
       <button type="button" class="btn btn-default">

diff --git a/telemeta/util/backend.py b/telemeta/util/backend.py
index b78747408e77532ba0af9839e2230df8e6b2797e..04b299505611e24cfc75e0d3908fdb21dfb4801b 100644 (file)
--- a/telemeta/util/backend.py
+++ b/telemeta/util/backend.py
@@ -20,9 +20,6 @@ class CustomElasticBackend(ElasticsearchSearchBackend):
             {"type": "custom", "tokenizer": "keyword", "filter": ["lowercase"]}
         eb.setup()
 
-
-import unicodedata
-import sys
 class CustomElasticSearchQuery(ElasticsearchSearchQuery):
 
     def build_query_fragment(self, field, filter_type, value):
@@ -30,16 +27,7 @@ class CustomElasticSearchQuery(ElasticsearchSearchQuery):
                value = str(value)
        if field !='code':
                value = re.sub(regexSpacePunc, " ", value)
-        #print("Query fragment :"+ field+ ' '+ filter_type+ ' '+ value)
-        #sys.stdout.flush()
         valeur = super(CustomElasticSearchQuery, self).build_query_fragment(field, filter_type, value)
-        #print("Query fragment result "+ valeur)
-        #sys.stdout.flush()
-        return valeur
-
-    def build_query(self):
-        valeur = super(CustomElasticSearchQuery, self).build_query()
-        print (unicodedata.normalize('NFD', valeur).encode('ascii', 'ignore'))
         return valeur
 
 class CustomElasticEngine(ElasticsearchSearchEngine):

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 0c9be5a037fd509f59cce1a9d6b95c30a5534096..85c8734464daae04d18d0df622988921c7327b02 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -794,7 +794,7 @@ class ItemDetailView(ItemViewMixin, DetailView):
         rang = []
         for i in range(len(playlists)):
              for resource in playlists[i]['playlist'].resources.all():
-                  if resource.resource_id == item.public_id:
+                  if int(resource.resource_id) == item.id:
                       rang.append(i)
                       break
         related_media = MediaItemRelated.objects.filter(item=item)