From c7bb1bdf561bc206d75622bc711947751df04831 Mon Sep 17 00:00:00 2001
From: mathieu <mathieu.boye28@gmail.com>
Date: Tue, 3 May 2016 00:42:50 +0200
Subject: [PATCH] Ajout deja ds liste

Marche que quand pas de nouvelle cote
---
 env/debug.env                                     |  2 +-
 telemeta/templates/search/advanceSearch.html      |  2 --
 telemeta/templates/telemeta/mediaitem_detail.html |  6 +++++-
 telemeta/util/backend.py                          | 13 ++++++++-----
 telemeta/views/item.py                            |  9 +++++++++
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/env/debug.env b/env/debug.env
index a19e3477..7a9fbbcc 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=False
+REINDEX=True
diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index ec91ef54..14e33079 100644
--- a/telemeta/templates/search/advanceSearch.html
+++ b/telemeta/templates/search/advanceSearch.html
@@ -279,8 +279,6 @@
 
         <p id="res"></p>
 
-        <p>Pour chaque champ : Mot-clé contenu dans l'instrument (ex "uita" pour "guitare") ou nom entier</p>
-
         </div>
 
 {% endblock %}
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index a1180cb1..686931e0 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -61,7 +61,11 @@
     //playlists:
     {% if user.is_authenticated %}
         {% for playlist in playlists %}
-            playlistUtils.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}');
+        	{% if forloop.counter0 in rang_item_playliste %}
+                	    playlistUtils.addPlaylist('{{ playlist.playlist.title }} (déjà listé)','{{playlist.playlist.public_id}}');
+        	{% else %}
+        	            playlistUtils.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}');
+        	{% endif %}
         {% endfor %}
             jQuery(window).ready(function(){
                 var anchor = jQuery('#_add_to_playlist');
diff --git a/telemeta/util/backend.py b/telemeta/util/backend.py
index e8cbffa3..b7874740 100644
--- a/telemeta/util/backend.py
+++ b/telemeta/util/backend.py
@@ -26,12 +26,15 @@ import sys
 class CustomElasticSearchQuery(ElasticsearchSearchQuery):
 
     def build_query_fragment(self, field, filter_type, value):
-        value = re.sub(regexSpacePunc, " ", str(value))
-        print("Query fragment :"+ field+ ' '+ filter_type+ ' '+ value)
-        sys.stdout.flush()
+        if isinstance(value, bool):
+        	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()
+        #print("Query fragment result "+ valeur)
+        #sys.stdout.flush()
         return valeur
 
     def build_query(self):
diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 17e05a5c..0c9be5a0 100644
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -26,6 +26,7 @@ from telemeta.views.core import *
 from telemeta.views.marker import *
 import timeside.core
 import timeside.server as ts
+import sys
 
 
 class ItemBaseMixin(TelemetaBaseMixin):
@@ -789,6 +790,13 @@ class ItemDetailView(ItemViewMixin, DetailView):
             self.mime_type = 'video/mp4'
 
         playlists = get_playlists_names(self.request)
+        
+        rang = []
+        for i in range(len(playlists)):
+             for resource in playlists[i]['playlist'].resources.all():
+                  if resource.resource_id == item.public_id:
+                      rang.append(i)
+                      break
         related_media = MediaItemRelated.objects.filter(item=item)
         check_related_media(related_media)
         revisions = Revision.objects.filter(element_type='item', element_id=item.id).order_by('-time')
@@ -819,6 +827,7 @@ class ItemDetailView(ItemViewMixin, DetailView):
         context['format'] = item_format
         context['private_extra_types'] = private_extra_types.values()
         context['site'] = 'http://' + Site.objects.all()[0].name
+        context['rang_item_playliste']=rang
         # if ts_item:
         #     context['ts_item_id'] = ts_item.pk
         # else:
-- 
2.39.5