From: mathieu <mathieu.boye28@gmail.com>
Date: Tue, 3 May 2016 05:45:49 +0000 (+0200)
Subject: Fix item deja ds playlist (convert resource_id to int)
X-Git-Tag: 1.6.2^2~15^2~5^2~2^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d7fc7189d6b8bf1ce398e0c7c12b4dd681f2a054;p=telemeta.git

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 7a9fbbcc..a19e3477 100644
--- 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 686931e0..de2ed032 100644
--- 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 b7874740..04b29950 100644
--- 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 0c9be5a0..85c87344 100644
--- 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)