mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2025-11-07 18:54:03 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'kennyl/travis'

Browse Source 
# Conflicts:
#	cps/web.py
This commit is contained in:
OzzieIsaacs
2017-03-12 21:13:25 +01:00
parent b081bc8672 2ef4933f7a
commit 74a3e6842a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cps/web.py
View File

@@ -1308,7 +1308,6 @@ def read_book(book_id, format):
flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
return redirect(url_for("index"))
@app.route("/download/<int:book_id>/<format>")
@login_required_if_no_ano
@download_required
@@ -1335,6 +1334,11 @@ def get_download_link(book_id, format):
else:
abort(404)
@app.route("/download/<int:book_id>/<format>/<anyname>")
@login_required_if_no_ano
@download_required
def get_download_link_ext(book_id, format, anyname):
return get_download_link(book_id, format)
@app.route('/register', methods=['GET', 'POST'])
def register():