From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 20 Nov 2014 13:56:53 +0000 (+0100)
Subject: fix success url for new resources
X-Git-Tag: 1.5.0rc1~27^2~4^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d5b39314870512b7510b0ea87f90177742333848;p=telemeta.git

fix success url for new resources
---

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 36bdfe28..f35adcaf 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -11,6 +11,7 @@
 {% endblock %}
 
 {% block extra_javascript %}
+
 {% if item %}
 
 <script src="{{ STATIC_URL }}telemeta/js/popupdiv-min.js" type="text/javascript"></script>
@@ -27,7 +28,7 @@
 
 <script type="text/javascript">
     {% if item.file or item.url %}
-    {% if access == 'full' or perms.telemeta.can_play_all_items %}
+     {% if access == 'full' or perms.telemeta.can_play_all_items %}
         //initializing soundManager default properties
         soundManager.flashVersion = 9;
         soundManager.url = "{{ STATIC_URL }}timeside/swf/";
@@ -55,7 +56,7 @@
              CURRENT_USER_NAME,  //undefined if !user.is_authenticated
              false); //false because not superuser
         {% endif %}
-    {% endif %}
+     {% endif %}
     {% endif %}
     //playlists:
     {% if user.is_authenticated %}
@@ -136,6 +137,7 @@
     {% block player %}
 
     {% if access == 'full' or perms.telemeta.can_play_all_items %}
+
     <div id="player_maximized" class="ts-skin-lab">
        <div id="player_header">
         <a href="#" class="toggle">Minimize</a>
diff --git a/telemeta/views/collection.py b/telemeta/views/collection.py
index a3cf0567..337e7fab 100644
--- a/telemeta/views/collection.py
+++ b/telemeta/views/collection.py
@@ -319,7 +319,7 @@ class CollectionAddView(CollectionViewMixin, CreateWithInlinesView):
     inlines = [CollectionRelatedInline, CollectionIdentifierInline]
 
     def get_success_url(self):
-        return reverse_lazy('telemeta-collections')
+        return reverse_lazy('telemeta-collection-detail', kwargs={'public_id':self.object.code})
 
 
 class CollectionCopyView(CollectionAddView):
@@ -330,4 +330,4 @@ class CollectionCopyView(CollectionAddView):
         return model_to_dict(self.get_object())
 
     def get_success_url(self):
-        return reverse_lazy('telemeta-collections')
+        return reverse_lazy('telemeta-collection-detail', kwargs={'public_id':self.object.code})
diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 438edf74..e2fa3e73 100644
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -730,7 +730,7 @@ class ItemEditView(ItemViewMixin, UpdateWithInlinesView):
         return super(ItemEditView, self).form_valid(form)
 
     def get_success_url(self):
-        return reverse_lazy('telemeta-item-detail', kwargs={'public_id':self.get_object().code})
+        return reverse_lazy('telemeta-item-detail', kwargs={'public_id':self.object.code})
 
     def get_context_data(self, **kwargs):
         context = super(ItemEditView, self).get_context_data(**kwargs)
@@ -766,7 +766,7 @@ class ItemAddView(ItemViewMixin, CreateWithInlinesView):
         return model_to_dict(item)
 
     def get_success_url(self):
-        return reverse_lazy('telemeta-items')
+        return reverse_lazy('telemeta-item-detail', kwargs={'public_id':self.object.code})
 
 
 class ItemCopyView(ItemAddView):
@@ -778,7 +778,7 @@ class ItemCopyView(ItemAddView):
         return model_to_dict(self.get_object())
 
     def get_success_url(self):
-        return reverse_lazy('telemeta-items')
+        return reverse_lazy('telemeta-item-detail', kwargs={'public_id':self.object.code})
 
 
 class ItemDetailView(ItemViewMixin, DetailView):