mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-24 18:47:23 +00:00
Code Issues Releases Wiki Activity

Bugfix from refactoring

Browse Source
This commit is contained in:
Ozzie Isaacs 2021-03-21 13:46:13 +01:00
parent 130a4ed2d3
commit e9530eda9d
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cps/admin.py
View File

@ -1579,7 +1579,7 @@ def import_ldap_users():
log.debug_or_exception(e) log.debug_or_exception(e)
continue continue
if user_data: if user_data:
user_count, message = ldap_import_create_user(user, user_data, showtext) user_count, message = ldap_import_create_user(user, user_data)
if message: if message:
showtext['text'] = message showtext['text'] = message
else: else:

5
cps/updater.py
View File

@ -510,15 +510,14 @@ class Updater(threading.Thread):
# before major update # before major update
if i == (len(commit) - 1): if i == (len(commit) - 1):
i -= 1 i -= 1
status, parents = self._stable_updater_parse_major_version(self, status, parents = self._stable_updater_parse_major_version(commit,
commit,
i, i,
parents, parents,
current_version, current_version,
status) status)
break break
status = self._stable_updater_set_status(self, i, newer, status, parents, commit) status = self._stable_updater_set_status(i, newer, status, parents, commit)
return json.dumps(status) return json.dumps(status)
def _get_request_path(self): def _get_request_path(self):