NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor edit_books.js for unused code; re-add glyphicon to convert button; Add form validation for convert button

Browse Source
This commit is contained in:
bodybybuddha 2018-08-29 00:49:50 -04:00
parent 4b006fba99
commit 22ecdfd2bc
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cps/static/js/edit_books.js
View File

@ -255,6 +255,3 @@ $("#btn-upload-cover").on("change", function () {
$("#upload-cover").html(filename); $("#upload-cover").html(filename);
}); });
$("#btn-book-convert").on("change", function () {
alert("woot");
});

2
cps/templates/book_edit.html
View File

@ -48,7 +48,7 @@
</div> </div>
</div> </div>
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" class="btn btn-primary" id="btn-book-covert" name="btn-book-covert">{{_('Convert book')}}</button> <button type="submit" class="btn btn-primary" id="btn-book-convert" name="btn-book-convert"><span class="glyphicon glyphicon-duplicate"></span> {{_('Convert book')}}</button>
</span> </span>
</form> </form>
</div> </div>

8
cps/web.py
View File

@ -3191,6 +3191,7 @@ def edit_book(book_id):
except Exception: except Exception:
app.logger.warning(file.format.lower() + ' already removed from list.') app.logger.warning(file.format.lower() + ' already removed from list.')
app.logger.debug('Allowed conversion formats:')
app.logger.debug(allowed_conversion_formats) app.logger.debug(allowed_conversion_formats)
# Show form # Show form
@ -3629,6 +3630,13 @@ def upload():
@login_required_if_no_ano @login_required_if_no_ano
@edit_required @edit_required
def convert_bookformat(book_id): def convert_bookformat(book_id):
# check to see if we have form fields to work with - if not send user back
book_format_from = request.form.get('book_format_from', None)
book_format_to = request.form.get('book_format_to', None)
if (book_format_from is None) or (book_format_to is None):
return redirect(request.environ["HTTP_REFERER"])
app.logger.debug('converting: book id: ' + str(book_id) + app.logger.debug('converting: book id: ' + str(book_id) +
' from: ' + request.form['book_format_from'] + ' from: ' + request.form['book_format_from'] +
' to: ' + request.form['book_format_to']) ' to: ' + request.form['book_format_to'])