Merge branch 'master' into develop

2017-03-13 14:56:51 +00:00
parent 29462e2278 8f666d925f
commit ff89d9c20d
14 changed files with 150 additions and 170 deletions
@@ -136,7 +136,7 @@
              </button>
              <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
                {% for format in entry.data %}
-                <li><a href="{{ url_for('get_download_link', book_id=entry.id, format=format.format|lower) }}">{{format.format}}</a></li>
+                <li><a href="{{ url_for('get_download_link_ext', book_id=entry.id, format=format.format|lower, anyname=entry.id|string+'.'+format.format) }}">{{format.format}}</a></li>
                {%endfor%}
              </ul>
            </div>