update links

diff --git a/telemeta/templates/telemeta/inc/epub_list.html b/telemeta/templates/telemeta/inc/epub_list.html
index 7beddece34c7c41d8b4b48086d5e942182621bc9..c454bbdffdd8d6e283086db442e16d6207ba7a1e 100644 (file)
--- a/telemeta/templates/telemeta/inc/epub_list.html
+++ b/telemeta/templates/telemeta/inc/epub_list.html
@@ -15,10 +15,10 @@
 {% if child.code %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
     <td class="highlight">
-        <a href="{% url "telemeta-resource-detail" resource.children_type child.public_id %}">{{ child.title }}</a>
+        <a href="{% url "telemeta-collection-epub-download" child.public_id %}">{{ child.title }}</a>
     </td>
     <td>
-       <center><a href="{% url "telemeta-collection-epub" child.public_id %}">
+       <center><a href="{% url "telemeta-collection-epub-download" child.public_id %}">
         <button type="button" class="btn btn-default">
             <span class="glyphicon glyphicon-book"></span> {% trans "Download" %}
         </button>

diff --git a/telemeta/templates/telemeta/resource_epub_list.html b/telemeta/templates/telemeta/resource_epub_list.html
index 13bc7ef0ea1bc6212b0769d532ad7073f6f1d26c..0c1dd16e20e89ba16327117e18cd0936bd9a19af 100644 (file)
--- a/telemeta/templates/telemeta/resource_epub_list.html
+++ b/telemeta/templates/telemeta/resource_epub_list.html
@@ -13,7 +13,7 @@
 {% block infos %}
         <div class="extraInfos">
         <h4><img src="{{ STATIC_URL }}telemeta/images/item_title.png" style="vertical-align:middle" />{% trans "Livre complet" %}</h4>
-        <a href="{% url "telemeta-resource-epub" type resource.public_id %}">
+        <a href="{% url "telemeta-resource-epub-download" type resource.public_id %}">
         <button type="button" class="btn btn-default">
             <span class="glyphicon glyphicon-book"></span> {% trans "Download" %}
         </button>

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 583aa9a49e50bf3f66d4c12cd3cc8b506f8186cd..37ab5c8ad902b738e8451d11379e893e82959945 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -134,7 +134,7 @@ urlpatterns = patterns('',
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', ResourceDeleteView.as_view(), name="telemeta-resource-delete"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/view/$', resource_view.related_stream, name="telemeta-resource-related"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/download/$', resource_view.related_download, name="telemeta-resource-related-download"),
-    url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/epub/download/$', ResourceEpubView.as_view(), name="telemeta-resource-epub"),
+    url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/epub/download/$', ResourceEpubView.as_view(), name="telemeta-resource-epub-download"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/epub/list/$', ResourceEpubListView.as_view(), name="telemeta-resource-epub-list"),
     url(r'^archives/(?P<type>[A-Za-z0-9._-]+)/(?P<public_id>[A-Za-z0-9._-]+)/epub/$', ResourceEpubPasswordView.as_view(), name="telemeta-resource-password-epub"),
 

diff --git a/telemeta/views/resource.py b/telemeta/views/resource.py
index b308962e883764631b86da2be7609fdea8fa70e8..6a7cabeddefa0e8c5b9f50c19e635d51183fc67e 100644 (file)
--- a/telemeta/views/resource.py
+++ b/telemeta/views/resource.py
@@ -351,9 +351,6 @@ class ResourceEpubView(ResourceSingleMixin, BaseEpubMixin, View):
         response['Content-Disposition'] = "attachment; filename=%s" % self.filename + '.epub'
         return response
 
-    def dispatch(self, *args, **kwargs):
-        return super(ResourceEpubView, self).dispatch(*args, **kwargs)
-
 
 class ResourceEpubPasswordView(ResourceSingleMixin, FormView):