2019-02-08 20:11:44 +01:00
|
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
|
|
# This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
|
|
|
|
# Copyright (C) 2018-2019 OzzieIsaacs, cervinko, jkrehm, bodybybuddha, ok11,
|
|
|
|
# andy29485, idalin, Kyosfonica, wuqi, Kennyl, lemmsh,
|
|
|
|
# falgh1, grunjol, csitko, ytils, xybydy, trasba, vrabe,
|
|
|
|
# ruben-herold, marblepebble, JackED42, SiphonSquirrel,
|
|
|
|
# apetresc, nanu-c, mutschler
|
|
|
|
#
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License as published by
|
|
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
2019-06-06 17:10:22 +02:00
|
|
|
from __future__ import division, print_function, unicode_literals
|
|
|
|
|
2019-02-08 20:11:44 +01:00
|
|
|
from flask import Blueprint, request, flash, redirect, url_for
|
|
|
|
from flask_babel import gettext as _
|
|
|
|
from flask_login import login_required, current_user
|
2019-06-06 17:10:22 +02:00
|
|
|
from sqlalchemy.sql.expression import func, or_, and_
|
|
|
|
|
|
|
|
from . import logger, ub, searched_ids, db
|
2019-06-02 09:33:19 +02:00
|
|
|
from .web import render_title_template
|
2020-01-02 17:11:30 +01:00
|
|
|
from .helper import common_filters
|
2019-02-08 20:11:44 +01:00
|
|
|
|
2019-06-06 17:10:22 +02:00
|
|
|
|
2019-02-08 20:11:44 +01:00
|
|
|
shelf = Blueprint('shelf', __name__)
|
2019-06-11 18:35:20 +02:00
|
|
|
log = logger.create()
|
2019-06-06 17:10:22 +02:00
|
|
|
|
2019-02-08 20:11:44 +01:00
|
|
|
|
|
|
|
@shelf.route("/shelf/add/<int:shelf_id>/<int:book_id>")
|
|
|
|
@login_required
|
|
|
|
def add_to_shelf(shelf_id, book_id):
|
2020-02-08 14:39:46 +01:00
|
|
|
xhr = request.headers.get('X-Requested-With') == 'XMLHttpRequest'
|
2019-02-08 20:11:44 +01:00
|
|
|
shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
|
|
|
|
if shelf is None:
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("Invalid shelf specified: %s", shelf_id)
|
2020-02-08 14:39:46 +01:00
|
|
|
if not xhr:
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"Invalid shelf specified"), category="error")
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
return "Invalid shelf specified", 400
|
|
|
|
|
|
|
|
if not shelf.is_public and not shelf.user_id == int(current_user.id):
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("User %s not allowed to add a book to %s", current_user, shelf)
|
2020-02-08 14:39:46 +01:00
|
|
|
if not xhr:
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"Sorry you are not allowed to add a book to the the shelf: %(shelfname)s", shelfname=shelf.name),
|
|
|
|
category="error")
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
return "Sorry you are not allowed to add a book to the the shelf: %s" % shelf.name, 403
|
|
|
|
|
|
|
|
if shelf.is_public and not current_user.role_edit_shelfs():
|
2019-06-11 18:35:20 +02:00
|
|
|
log.info("User %s not allowed to edit public shelves", current_user)
|
2020-02-08 14:39:46 +01:00
|
|
|
if not xhr:
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"You are not allowed to edit public shelves"), category="error")
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
return "User is not allowed to edit public shelves", 403
|
|
|
|
|
|
|
|
book_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id,
|
|
|
|
ub.BookShelf.book_id == book_id).first()
|
|
|
|
if book_in_shelf:
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("Book %s is already part of %s", book_id, shelf)
|
2020-02-08 14:39:46 +01:00
|
|
|
if not xhr:
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"Book is already part of the shelf: %(shelfname)s", shelfname=shelf.name), category="error")
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
return "Book is already part of the shelf: %s" % shelf.name, 400
|
|
|
|
|
|
|
|
maxOrder = ub.session.query(func.max(ub.BookShelf.order)).filter(ub.BookShelf.shelf == shelf_id).first()
|
|
|
|
if maxOrder[0] is None:
|
|
|
|
maxOrder = 0
|
|
|
|
else:
|
|
|
|
maxOrder = maxOrder[0]
|
|
|
|
|
|
|
|
ins = ub.BookShelf(shelf=shelf.id, book_id=book_id, order=maxOrder + 1)
|
|
|
|
ub.session.add(ins)
|
|
|
|
ub.session.commit()
|
2020-02-08 14:39:46 +01:00
|
|
|
if not xhr:
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"Book has been added to shelf: %(sname)s", sname=shelf.name), category="success")
|
|
|
|
if "HTTP_REFERER" in request.environ:
|
|
|
|
return redirect(request.environ["HTTP_REFERER"])
|
|
|
|
else:
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
return "", 204
|
|
|
|
|
|
|
|
|
|
|
|
@shelf.route("/shelf/massadd/<int:shelf_id>")
|
|
|
|
@login_required
|
|
|
|
def search_to_shelf(shelf_id):
|
|
|
|
shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
|
|
|
|
if shelf is None:
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("Invalid shelf specified: %s", shelf_id)
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"Invalid shelf specified"), category="error")
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
|
|
|
|
if not shelf.is_public and not shelf.user_id == int(current_user.id):
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("User %s not allowed to add a book to %s", current_user, shelf)
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"You are not allowed to add a book to the the shelf: %(name)s", name=shelf.name), category="error")
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
|
|
|
|
if shelf.is_public and not current_user.role_edit_shelfs():
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("User %s not allowed to edit public shelves", current_user)
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"User is not allowed to edit public shelves"), category="error")
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
|
2019-02-09 19:01:57 +01:00
|
|
|
if current_user.id in searched_ids and searched_ids[current_user.id]:
|
2019-02-08 20:11:44 +01:00
|
|
|
books_for_shelf = list()
|
|
|
|
books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).all()
|
|
|
|
if books_in_shelf:
|
|
|
|
book_ids = list()
|
|
|
|
for book_id in books_in_shelf:
|
|
|
|
book_ids.append(book_id.book_id)
|
2019-03-16 16:53:22 +01:00
|
|
|
for searchid in searched_ids[current_user.id]:
|
|
|
|
if searchid not in book_ids:
|
|
|
|
books_for_shelf.append(searchid)
|
2019-02-08 20:11:44 +01:00
|
|
|
else:
|
2019-02-09 19:01:57 +01:00
|
|
|
books_for_shelf = searched_ids[current_user.id]
|
2019-02-08 20:11:44 +01:00
|
|
|
|
|
|
|
if not books_for_shelf:
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("Books are already part of %s", shelf)
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"Books are already part of the shelf: %(name)s", name=shelf.name), category="error")
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
|
|
|
|
maxOrder = ub.session.query(func.max(ub.BookShelf.order)).filter(ub.BookShelf.shelf == shelf_id).first()
|
|
|
|
if maxOrder[0] is None:
|
|
|
|
maxOrder = 0
|
|
|
|
else:
|
|
|
|
maxOrder = maxOrder[0]
|
|
|
|
|
|
|
|
for book in books_for_shelf:
|
|
|
|
maxOrder = maxOrder + 1
|
|
|
|
ins = ub.BookShelf(shelf=shelf.id, book_id=book, order=maxOrder)
|
|
|
|
ub.session.add(ins)
|
|
|
|
ub.session.commit()
|
|
|
|
flash(_(u"Books have been added to shelf: %(sname)s", sname=shelf.name), category="success")
|
|
|
|
else:
|
|
|
|
flash(_(u"Could not add books to shelf: %(sname)s", sname=shelf.name), category="error")
|
2019-02-09 19:01:57 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
|
|
|
|
|
|
|
|
@shelf.route("/shelf/remove/<int:shelf_id>/<int:book_id>")
|
|
|
|
@login_required
|
|
|
|
def remove_from_shelf(shelf_id, book_id):
|
2020-02-08 14:39:46 +01:00
|
|
|
xhr = request.headers.get('X-Requested-With') == 'XMLHttpRequest'
|
2019-02-08 20:11:44 +01:00
|
|
|
shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
|
|
|
|
if shelf is None:
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("Invalid shelf specified: %s", shelf_id)
|
2020-02-08 14:39:46 +01:00
|
|
|
if not xhr:
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
return "Invalid shelf specified", 400
|
|
|
|
|
|
|
|
# if shelf is public and use is allowed to edit shelfs, or if shelf is private and user is owner
|
|
|
|
# allow editing shelfs
|
|
|
|
# result shelf public user allowed user owner
|
|
|
|
# false 1 0 x
|
|
|
|
# true 1 1 x
|
|
|
|
# true 0 x 1
|
|
|
|
# false 0 x 0
|
|
|
|
|
|
|
|
if (not shelf.is_public and shelf.user_id == int(current_user.id)) \
|
|
|
|
or (shelf.is_public and current_user.role_edit_shelfs()):
|
|
|
|
book_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id,
|
|
|
|
ub.BookShelf.book_id == book_id).first()
|
|
|
|
|
|
|
|
if book_shelf is None:
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("Book %s already removed from %s", book_id, shelf)
|
2020-02-08 14:39:46 +01:00
|
|
|
if not xhr:
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
return "Book already removed from shelf", 410
|
|
|
|
|
|
|
|
ub.session.delete(book_shelf)
|
|
|
|
ub.session.commit()
|
|
|
|
|
2020-02-08 14:39:46 +01:00
|
|
|
if not xhr:
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"Book has been removed from shelf: %(sname)s", sname=shelf.name), category="success")
|
2020-02-16 19:39:32 +01:00
|
|
|
if "HTTP_REFERER" in request.environ:
|
|
|
|
return redirect(request.environ["HTTP_REFERER"])
|
|
|
|
else:
|
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
return "", 204
|
|
|
|
else:
|
2019-06-11 18:35:20 +02:00
|
|
|
log.error("User %s not allowed to remove a book from %s", current_user, shelf)
|
2020-02-08 14:39:46 +01:00
|
|
|
if not xhr:
|
2019-02-08 20:11:44 +01:00
|
|
|
flash(_(u"Sorry you are not allowed to remove a book from this shelf: %(sname)s", sname=shelf.name),
|
|
|
|
category="error")
|
2019-02-16 07:23:08 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
return "Sorry you are not allowed to remove a book from this shelf: %s" % shelf.name, 403
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@shelf.route("/shelf/create", methods=["GET", "POST"])
|
|
|
|
@login_required
|
|
|
|
def create_shelf():
|
|
|
|
shelf = ub.Shelf()
|
|
|
|
if request.method == "POST":
|
|
|
|
to_save = request.form.to_dict()
|
|
|
|
if "is_public" in to_save:
|
|
|
|
shelf.is_public = 1
|
|
|
|
shelf.name = to_save["title"]
|
|
|
|
shelf.user_id = int(current_user.id)
|
|
|
|
existing_shelf = ub.session.query(ub.Shelf).filter(
|
|
|
|
or_((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1),
|
|
|
|
(ub.Shelf.name == to_save["title"]) & (ub.Shelf.user_id == int(current_user.id)))).first()
|
|
|
|
if existing_shelf:
|
|
|
|
flash(_(u"A shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error")
|
|
|
|
else:
|
|
|
|
try:
|
|
|
|
ub.session.add(shelf)
|
|
|
|
ub.session.commit()
|
|
|
|
flash(_(u"Shelf %(title)s created", title=to_save["title"]), category="success")
|
|
|
|
except Exception:
|
|
|
|
flash(_(u"There was an error"), category="error")
|
|
|
|
return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"create a shelf"), page="shelfcreate")
|
|
|
|
else:
|
|
|
|
return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"create a shelf"), page="shelfcreate")
|
|
|
|
|
|
|
|
|
|
|
|
@shelf.route("/shelf/edit/<int:shelf_id>", methods=["GET", "POST"])
|
|
|
|
@login_required
|
|
|
|
def edit_shelf(shelf_id):
|
|
|
|
shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
|
|
|
|
if request.method == "POST":
|
|
|
|
to_save = request.form.to_dict()
|
|
|
|
existing_shelf = ub.session.query(ub.Shelf).filter(
|
|
|
|
or_((ub.Shelf.name == to_save["title"]) & (ub.Shelf.is_public == 1),
|
|
|
|
(ub.Shelf.name == to_save["title"]) & (ub.Shelf.user_id == int(current_user.id)))).filter(
|
|
|
|
ub.Shelf.id != shelf_id).first()
|
|
|
|
if existing_shelf:
|
|
|
|
flash(_(u"A shelf with the name '%(title)s' already exists.", title=to_save["title"]), category="error")
|
|
|
|
else:
|
|
|
|
shelf.name = to_save["title"]
|
|
|
|
if "is_public" in to_save:
|
|
|
|
shelf.is_public = 1
|
|
|
|
else:
|
|
|
|
shelf.is_public = 0
|
|
|
|
try:
|
|
|
|
ub.session.commit()
|
|
|
|
flash(_(u"Shelf %(title)s changed", title=to_save["title"]), category="success")
|
|
|
|
except Exception:
|
|
|
|
flash(_(u"There was an error"), category="error")
|
|
|
|
return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Edit a shelf"), page="shelfedit")
|
|
|
|
else:
|
|
|
|
return render_title_template('shelf_edit.html', shelf=shelf, title=_(u"Edit a shelf"), page="shelfedit")
|
|
|
|
|
|
|
|
|
|
|
|
@shelf.route("/shelf/delete/<int:shelf_id>")
|
|
|
|
@login_required
|
|
|
|
def delete_shelf(shelf_id):
|
|
|
|
cur_shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
|
|
|
|
deleted = None
|
|
|
|
if current_user.role_admin():
|
|
|
|
deleted = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).delete()
|
|
|
|
else:
|
|
|
|
if (not cur_shelf.is_public and cur_shelf.user_id == int(current_user.id)) \
|
|
|
|
or (cur_shelf.is_public and current_user.role_edit_shelfs()):
|
2019-06-06 17:10:22 +02:00
|
|
|
deleted = ub.session.query(ub.Shelf).filter(or_(and_(ub.Shelf.user_id == int(current_user.id),
|
|
|
|
ub.Shelf.id == shelf_id),
|
|
|
|
and_(ub.Shelf.is_public == 1,
|
|
|
|
ub.Shelf.id == shelf_id))).delete()
|
2019-02-08 20:11:44 +01:00
|
|
|
|
|
|
|
if deleted:
|
|
|
|
ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).delete()
|
|
|
|
ub.session.commit()
|
2019-06-11 18:35:20 +02:00
|
|
|
log.info("successfully deleted %s", cur_shelf)
|
2019-02-09 19:01:57 +01:00
|
|
|
return redirect(url_for('web.index'))
|
2019-02-08 20:11:44 +01:00
|
|
|
|
2019-03-16 16:53:22 +01:00
|
|
|
# @shelf.route("/shelfdown/<int:shelf_id>")
|
2019-06-08 08:26:51 +02:00
|
|
|
@shelf.route("/shelf/<int:shelf_id>", defaults={'shelf_type': 1})
|
|
|
|
@shelf.route("/shelf/<int:shelf_id>/<int:shelf_type>")
|
|
|
|
def show_shelf(shelf_type, shelf_id):
|
2019-02-08 20:11:44 +01:00
|
|
|
if current_user.is_anonymous:
|
|
|
|
shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1, ub.Shelf.id == shelf_id).first()
|
|
|
|
else:
|
2019-06-06 17:10:22 +02:00
|
|
|
shelf = ub.session.query(ub.Shelf).filter(or_(and_(ub.Shelf.user_id == int(current_user.id),
|
|
|
|
ub.Shelf.id == shelf_id),
|
|
|
|
and_(ub.Shelf.is_public == 1,
|
|
|
|
ub.Shelf.id == shelf_id))).first()
|
2019-02-08 20:11:44 +01:00
|
|
|
result = list()
|
|
|
|
# user is allowed to access shelf
|
|
|
|
if shelf:
|
2019-06-08 08:26:51 +02:00
|
|
|
page = "shelf.html" if shelf_type == 1 else 'shelfdown.html'
|
2019-03-16 16:53:22 +01:00
|
|
|
|
2020-01-02 17:11:30 +01:00
|
|
|
books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id)\
|
|
|
|
.order_by(ub.BookShelf.order.asc()).all()
|
2020-02-02 07:47:27 +01:00
|
|
|
for book in books_in_shelf:
|
|
|
|
cur_book = db.session.query(db.Books).filter(db.Books.id == book.book_id).filter(common_filters()).first()
|
|
|
|
if cur_book:
|
|
|
|
result.append(cur_book)
|
|
|
|
else:
|
2020-02-09 14:31:42 +01:00
|
|
|
cur_book = db.session.query(db.Books).filter(db.Books.id == book.book_id).first()
|
|
|
|
if not cur_book:
|
|
|
|
log.info('Not existing book %s in %s deleted', book.book_id, shelf)
|
|
|
|
ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book.book_id).delete()
|
|
|
|
ub.session.commit()
|
2019-03-16 16:53:22 +01:00
|
|
|
return render_title_template(page, entries=result, title=_(u"Shelf: '%(name)s'", name=shelf.name),
|
2019-02-08 20:11:44 +01:00
|
|
|
shelf=shelf, page="shelf")
|
|
|
|
else:
|
|
|
|
flash(_(u"Error opening shelf. Shelf does not exist or is not accessible"), category="error")
|
|
|
|
return redirect(url_for("web.index"))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@shelf.route("/shelf/order/<int:shelf_id>", methods=["GET", "POST"])
|
|
|
|
@login_required
|
|
|
|
def order_shelf(shelf_id):
|
|
|
|
if request.method == "POST":
|
|
|
|
to_save = request.form.to_dict()
|
|
|
|
books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).order_by(
|
|
|
|
ub.BookShelf.order.asc()).all()
|
|
|
|
counter = 0
|
|
|
|
for book in books_in_shelf:
|
|
|
|
setattr(book, 'order', to_save[str(book.book_id)])
|
|
|
|
counter += 1
|
|
|
|
ub.session.commit()
|
|
|
|
if current_user.is_anonymous:
|
|
|
|
shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.is_public == 1, ub.Shelf.id == shelf_id).first()
|
|
|
|
else:
|
2019-06-06 17:10:22 +02:00
|
|
|
shelf = ub.session.query(ub.Shelf).filter(or_(and_(ub.Shelf.user_id == int(current_user.id),
|
|
|
|
ub.Shelf.id == shelf_id),
|
|
|
|
and_(ub.Shelf.is_public == 1,
|
|
|
|
ub.Shelf.id == shelf_id))).first()
|
2019-02-08 20:11:44 +01:00
|
|
|
result = list()
|
|
|
|
if shelf:
|
|
|
|
books_in_shelf2 = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id) \
|
|
|
|
.order_by(ub.BookShelf.order.asc()).all()
|
2020-02-02 07:47:27 +01:00
|
|
|
for book in books_in_shelf2:
|
|
|
|
cur_book = db.session.query(db.Books).filter(db.Books.id == book.book_id).filter(common_filters()).first()
|
2020-02-09 14:31:42 +01:00
|
|
|
if cur_book:
|
|
|
|
result.append({'title':cur_book.title,
|
|
|
|
'id':cur_book.id,
|
|
|
|
'author':cur_book.authors,
|
|
|
|
'series':cur_book.series,
|
|
|
|
'series_index':cur_book.series_index})
|
|
|
|
else:
|
|
|
|
cur_book = db.session.query(db.Books).filter(db.Books.id == book.book_id).first()
|
|
|
|
result.append({'title':_('Hidden Book'),
|
|
|
|
'id':cur_book.id,
|
|
|
|
'author':[],
|
|
|
|
'series':[]})
|
2019-02-08 20:11:44 +01:00
|
|
|
return render_title_template('shelf_order.html', entries=result,
|
|
|
|
title=_(u"Change order of Shelf: '%(name)s'", name=shelf.name),
|
|
|
|
shelf=shelf, page="shelforder")
|