logos-co
/
open-law
mirror of https://github.com/logos-co/open-law.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into svyat/feat/hot_fix

This commit is contained in:
SvyatoslavArtymovych 2023-06-02 11:23:00 +03:00
parent c0664ca027 85de451f1a
commit b9a811b068
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/templates/book/modals/add_sub_collection_modal.html
View File

@ -23,14 +23,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="p-6 pt-0 space-y-6">
<div class="grid gap-6">
<div class="col-span-6 sm:col-span-3">
<label for="about-collection" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white" >About</label >
<textarea name="about" id="about-collection" rows="4" class="shadow-sm bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-600 focus:border-blue-600 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="About collection..."></textarea>
</div>
</div>
</div>
<!-- Modal footer --> <!-- Modal footer -->
<div class="flex items-center p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600"> <div class="flex items-center p-6 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
<button name="submit" type="submit" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Create</button> <button name="submit" type="submit" class="text-white bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800">Create</button>

10
app/views/book/book.py
View File

@ -1,9 +1,4 @@
from flask import ( from flask import render_template, flash, redirect, url_for, request
render_template,
flash,
redirect,
url_for,
)
from flask_login import login_required, current_user from flask_login import login_required, current_user
from sqlalchemy import and_, or_ from sqlalchemy import and_, or_
@ -180,11 +175,12 @@ def delete(book_id: int):
@bp.route("/<int:book_id>/statistics", methods=["GET"]) @bp.route("/<int:book_id>/statistics", methods=["GET"])
def statistic_view(book_id: int): def statistic_view(book_id: int):
book = db.session.get(m.Book, book_id) book = db.session.get(m.Book, book_id)
active_tab = request.args.get("active_tab")
if not book or book.is_deleted: if not book or book.is_deleted:
log(log.WARNING, "Book with id [%s] not found", book_id) log(log.WARNING, "Book with id [%s] not found", book_id)
flash("Book not found", "danger") flash("Book not found", "danger")
return redirect(url_for("book.my_library")) return redirect(url_for("book.my_library"))
return render_template("book/stat.html", book=book) return render_template("book/stat.html", book=book, active_tab=active_tab)
@bp.route("/favorite_books", methods=["GET"]) @bp.route("/favorite_books", methods=["GET"])