mirror of
				https://github.com/janeczku/calibre-web
				synced 2025-10-31 07:13:02 +00:00 
			
		
		
		
	Merge branch 'master' into Develop
This commit is contained in:
		| @@ -30,7 +30,7 @@ from sqlalchemy.sql.expression import func | ||||
| from sqlalchemy.exc import OperationalError, InvalidRequestError | ||||
|  | ||||
| from . import logger, ub, searched_ids, calibre_db | ||||
| from .web import render_title_template | ||||
| from .web import login_required_if_no_ano, render_title_template | ||||
|  | ||||
|  | ||||
| shelf = Blueprint('shelf', __name__) | ||||
| @@ -341,7 +341,7 @@ def delete_shelf(shelf_id): | ||||
|  | ||||
| @shelf.route("/shelf/<int:shelf_id>", defaults={'shelf_type': 1}) | ||||
| @shelf.route("/shelf/<int:shelf_id>/<int:shelf_type>") | ||||
| @login_required | ||||
| @login_required_if_no_ano | ||||
| def show_shelf(shelf_type, shelf_id): | ||||
|     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first() | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 OzzieIsaacs
					OzzieIsaacs