add jsonrpc get_item_export_url method, cleanup

diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html
index 77b9e45924f994cf47bba546ed750b87943953d0..7fd48e068ca1663c89628e1db14989a67a660296 100644 (file)
--- a/telemeta/templates/telemeta/lists.html
+++ b/telemeta/templates/telemeta/lists.html
@@ -21,14 +21,11 @@
 
 </script>
 
-{% comment "added by Killian Mary" %}{% endcomment %}
-
 <script>
     $(document).ready(function() {
         var nouvellesIcones = {
             header : 'ui-icon-carat-1-e',
             activeHeader : 'ui-icon-carat-1-s',
-
         };
 
         $("#accordeon").accordion({
@@ -40,7 +37,6 @@
         {% else %}
             active: {{ last_playlist }}
         {% endif %}
-
         });
 
         $.tablesorter.defaults.sortList = [[2,0]];
@@ -53,11 +49,6 @@
 </script>
 {% endblock %}
 
-{% comment "added by Killian Mary end" %}{% endcomment %}
-<!--
- Added by Thomas Balastegui :
- modal popup display and use of addNewPlaylist() and editPlaylist()
--->
 {% block content %}
     {% block modal %}
     <div id="add" class="modal fade" role="dialog">
@@ -166,7 +157,6 @@
              </tr>
             {% endif %}
         </table>
-        {% comment "added by Killian Mary, for sort table" %}{% endcomment %}
         <table id="{{playlist.playlist.public_id}}tb" class="listing" width="100%">
             <thead>
             <tr>

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 9d9c3bac7ca67f0589a13e495f63670b8ed2bd57..7260817430cab51ddd035f16e24e7aef01dc718f 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -76,10 +76,7 @@
                         return false;
                     });
                 }
-
                 playlistUtils.messageOk();
-
-
             });
     {% endif %}
 </script>

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 903a3f3e4535bba50b7589d39d339ac1964f1e49..f448d6ce177fae1ad1d250b08246c18624e11f42 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -109,6 +109,10 @@ class ItemBaseMixin(TelemetaBaseMixin):
              next = item.public_id
         return previous, next
 
+    @jsonrpc_method('telemeta.get_item_export_url')
+    def get_item_file_url(request, public_id, extension):
+        return reverse('telemeta-item-export', kwargs={'public_id': public_id, 'extension': extension})
+
 
 class ItemView(ItemBaseMixin):
     """Provide Item web UI methods"""