back to original haystack.signals.RealtimeSignalProcessor, fix auto_code for item...

diff --git a/app/settings.py b/app/settings.py
index 4a96abfeef5ff30d5f41b8008a54e7c12b95f0ec..696d182b8b157b3cc80cea37877a8efb279a677d 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -326,8 +326,8 @@ HAYSTACK_CONNECTIONS = {
     },
 }
 
-#HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
-HAYSTACK_SIGNAL_PROCESSOR = 'telemeta.util.search_signals.RealTimeCustomSignal'
+HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
+# HAYSTACK_SIGNAL_PROCESSOR = 'telemeta.util.search_signals.RealTimeCustomSignal'
 HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50
 
 BOWER_COMPONENTS_ROOT = '/srv/bower/'

diff --git a/lib/TimeSide b/lib/TimeSide
index bf40dca4ffb8ad7fa8daca6a82311992f7d353da..3f56ebfe3a5fe3ba1a802e50a746f8ce0a6fca42 160000 (submodule)
--- a/lib/TimeSide
+++ b/lib/TimeSide
@@ -1 +1 @@
-Subproject commit bf40dca4ffb8ad7fa8daca6a82311992f7d353da
+Subproject commit 3f56ebfe3a5fe3ba1a802e50a746f8ce0a6fca42

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index ba0d1821bbbc855fe9663866f27106d7b26d6198..903a3f3e4535bba50b7589d39d339ac1964f1e49 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -454,61 +454,61 @@ class ItemSoundListView(ItemListView):
 class ItemInstrumentListView(ItemListView):
 
     template_name = "telemeta/media_item_instrument_list.html"
-    
+
     def get_queryset(self):
         return MediaItem.objects.filter(performances__instrument__id=self.kwargs['value_id'])
-        
+
     def get_context_data(self, **kwargs):
         context = super(ItemInstrumentListView, self).get_context_data(**kwargs)
-        
+
         context['nom']=Instrument.objects.get(id=self.kwargs['value_id']).name
         context['id']=self.kwargs['value_id']
-        
+
         return context
-        
+
 class ItemInstrumentPublishedListView(ItemInstrumentListView):
-    
+
     def get_queryset(self):
         return super(ItemInstrumentPublishedListView, self).get_queryset().filter(collection__code__contains='_E_').order_by('code', 'old_code')
-        
+
 class ItemInstrumentUnpublishedListView(ItemInstrumentListView):
-    
+
     def get_queryset(self):
         return super(ItemInstrumentUnpublishedListView, self).get_queryset().filter(collection__code__contains='_I_').order_by('code', 'old_code')
 
 class ItemInstrumentSoundListView(ItemInstrumentListView):
      def get_queryset(self):
         return super(ItemInstrumentSoundListView, self).get_queryset().sound().order_by('code', 'old_code')
-        
+
 class ItemAliasListView(ItemListView):
 
     template_name = "telemeta/media_item_alias_list.html"
-    
+
     def get_queryset(self):
         return MediaItem.objects.filter(performances__alias__id=self.kwargs['value_id'])
-        
+
     def get_context_data(self, **kwargs):
         context = super(ItemAliasListView, self).get_context_data(**kwargs)
-        
+
         context['nom']=InstrumentAlias.objects.get(id=self.kwargs['value_id']).name
         context['id']=self.kwargs['value_id']
-        
+
         return context
-        
+
 class ItemAliasPublishedListView(ItemAliasListView):
-    
+
     def get_queryset(self):
         return super(ItemAliasPublishedListView, self).get_queryset().filter(collection__code__contains='_E_').order_by('code', 'old_code')
-        
+
 class ItemAliasUnpublishedListView(ItemAliasListView):
-    
+
     def get_queryset(self):
         return super(ItemAliasUnpublishedListView, self).get_queryset().filter(collection__code__contains='_I_').order_by('code', 'old_code')
 
 class ItemAliasSoundListView(ItemAliasListView):
      def get_queryset(self):
         return super(ItemAliasSoundListView, self).get_queryset().sound().order_by('code', 'old_code')
-        
+
 class ItemViewMixin(ItemBaseMixin):
 
     model = MediaItem
@@ -618,7 +618,9 @@ class ItemCopyView(ItemAddView):
     template_name = 'telemeta/mediaitem_edit.html'
 
     def get_initial(self):
-         return model_to_dict(self.get_object())
+        item = self.get_object()
+        item.code = auto_code(item.collection)
+        return model_to_dict(item)
 
     def forms_valid(self, form, inlines):
         messages.info(self.request, ugettext_lazy("You have successfully updated your item."))
@@ -790,7 +792,7 @@ 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():