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

Fixes and remove shelf kobo sync flag when kobo sync disabled

Browse Source
This commit is contained in:
alfred82santa 2021-02-07 00:19:24 +01:00
parent 8fe762709b
commit 69b7d94774
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cps/shelf.py
View File

@ -30,7 +30,7 @@ from flask_login import login_required, current_user
from sqlalchemy.sql.expression import func, true from sqlalchemy.sql.expression import func, true
from sqlalchemy.exc import OperationalError, InvalidRequestError from sqlalchemy.exc import OperationalError, InvalidRequestError
from . import logger, ub, calibre_db, db from . import logger, ub, calibre_db, db, config
from .render_template import render_title_template from .render_template import render_title_template
from .usermanagement import login_required_if_no_ano from .usermanagement import login_required_if_no_ano
@ -240,10 +240,8 @@ def create_edit_shelf(shelf, title, page, shelf_id=False):
else: else:
shelf.is_public = 0 shelf.is_public = 0
if "kobo_sync" in to_save: if config.config_kobo_sync and "kobo_sync" in to_save:
shelf.kobo_sync = True shelf.kobo_sync = True
else:
shelf.kobo_sync = False
if check_shelf_is_unique(shelf, to_save, shelf_id): if check_shelf_is_unique(shelf, to_save, shelf_id):
shelf.name = to_save["title"] shelf.name = to_save["title"]
@ -269,7 +267,11 @@ def create_edit_shelf(shelf, title, page, shelf_id=False):
ub.session.rollback() ub.session.rollback()
log.debug_or_exception(e) log.debug_or_exception(e)
flash(_(u"There was an error"), category="error") flash(_(u"There was an error"), category="error")
return render_title_template('shelf_edit.html', shelf=shelf, title=title, page=page) return render_title_template('shelf_edit.html',
shelf=shelf,
title=title,
page=page,
kobo_sync_enabled=config.config_kobo_sync)
def check_shelf_is_unique(shelf, to_save, shelf_id=False): def check_shelf_is_unique(shelf, to_save, shelf_id=False):

5
cps/templates/shelf_edit.html
View File

@ -13,9 +13,12 @@
<input type="checkbox" name="is_public" {% if shelf.is_public == 1 %}checked{% endif %}> {{_('Share with Everyone')}} <input type="checkbox" name="is_public" {% if shelf.is_public == 1 %}checked{% endif %}> {{_('Share with Everyone')}}
</label> </label>
</div> </div>
{% endif %}
{% if kobo_sync_enabled %}
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="kobo_sync" {% if shelf.kobo_sync == 1 %}checked{% endif %}> {{_('Synchronize with Kobo device')}} <input type="checkbox" name="kobo_sync"
{% if shelf.kobo_sync == 1 %}checked{% endif %}> {{ _('Synchronize with Kobo device') }}
</label> </label>
</div> </div>
{% endif %} {% endif %}

1
cps/ub.py
View File

@ -498,6 +498,7 @@ def migrate_Database(session):
conn.execute("ALTER TABLE shelf ADD column 'created' DATETIME") conn.execute("ALTER TABLE shelf ADD column 'created' DATETIME")
conn.execute("ALTER TABLE shelf ADD column 'last_modified' DATETIME") conn.execute("ALTER TABLE shelf ADD column 'last_modified' DATETIME")
conn.execute("ALTER TABLE book_shelf_link ADD column 'date_added' DATETIME") conn.execute("ALTER TABLE book_shelf_link ADD column 'date_added' DATETIME")
conn.execute("ALTER TABLE shelf ADD column 'kobo_sync' BOOLEAN DEFAULT false")
for shelf in session.query(Shelf).all(): for shelf in session.query(Shelf).all():
shelf.uuid = str(uuid.uuid4()) shelf.uuid = str(uuid.uuid4())
shelf.created = datetime.datetime.now() shelf.created = datetime.datetime.now()