Ajout deja ds liste

Marche que quand pas de nouvelle cote

diff --git a/env/debug.env b/env/debug.env
index a19e34770877c2c4104fc1cee497ee521afd6e88..7a9fbbcc2efd668f22107e8e9316a87bd0755b0f 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=False
+REINDEX=True

diff --git a/telemeta/templates/search/advanceSearch.html b/telemeta/templates/search/advanceSearch.html
index ec91ef54d9f74819de425e231c35806424c472f2..14e33079d984f2d9da6e16e5267afa212d126b5c 100644 (file)
--- 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 a1180cb1a815ba1a4c35847ecf01162a6eb17d0a..686931e00b94310ee15358bb6758181ecba86fdb 100644 (file)
--- 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 e8cbffa3c9180b71b755b004e9ec4494461c9d79..b78747408e77532ba0af9839e2230df8e6b2797e 100644 (file)
--- 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 17e05a5c3166257322e9e4764793df7e5b99dc19..0c9be5a037fd509f59cce1a9d6b95c30a5534096 100644 (file)
--- 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: