From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 23 Jul 2015 13:54:49 +0000 (+0200)
Subject: update  links
X-Git-Tag: 1.6a~4^2~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7910873456911ce436a67af46af5c3c4ff8ceb32;p=telemeta.git

update  links
---

diff --git a/telemeta/templates/telemeta/inc/epub_list.html b/telemeta/templates/telemeta/inc/epub_list.html
index 7beddece..c454bbdf 100644
--- 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 13bc7ef0..0c1dd16e 100644
--- 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 583aa9a4..37ab5c8a 100644
--- 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 b308962e..6a7cabed 100644
--- 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):