mirror of
https://github.com/janeczku/calibre-web.git
synced 2024-11-24 08:42:24 +02:00
Fix updater
Bugfixes from testruns Update Testresults
This commit is contained in:
parent
2b17bf4114
commit
f4e134742b
@ -42,6 +42,7 @@ except NameError:
|
||||
|
||||
|
||||
oauth_check = {}
|
||||
oauthblueprints = []
|
||||
oauth = Blueprint('oauth', __name__)
|
||||
log = logger.create()
|
||||
|
||||
@ -203,7 +204,6 @@ def unlink_oauth(provider):
|
||||
return redirect(url_for('web.profile'))
|
||||
|
||||
def generate_oauth_blueprints():
|
||||
oauthblueprints = []
|
||||
if not ub.session.query(ub.OAuthProvider).count():
|
||||
for provider in ("github", "google"):
|
||||
oauthProvider = ub.OAuthProvider()
|
||||
|
@ -222,7 +222,7 @@ $(function() {
|
||||
function updateTimer() {
|
||||
$.ajax({
|
||||
dataType: "json",
|
||||
url: window.location.pathname + "/get_updater_status",
|
||||
url: window.location.pathname + "/../../get_updater_status",
|
||||
success: function success(data) {
|
||||
// console.log(data.status);
|
||||
$("#DialogContent").html(updateText[data.status]);
|
||||
|
@ -31,12 +31,12 @@ from flask_login import AnonymousUserMixin, current_user
|
||||
try:
|
||||
from flask_dance.consumer.backend.sqla import OAuthConsumerMixin
|
||||
oauth_support = True
|
||||
except ImportError:
|
||||
except ImportError as e:
|
||||
# fails on flask-dance >1.3, due to renaming
|
||||
try:
|
||||
from flask_dance.consumer.storage.sqla import OAuthConsumerMixin
|
||||
oauth_support = True
|
||||
except ImportError:
|
||||
except ImportError as e:
|
||||
oauth_support = False
|
||||
from sqlalchemy import create_engine, exc, exists, event, text
|
||||
from sqlalchemy import Column, ForeignKey
|
||||
|
@ -9,7 +9,7 @@ iso-639>=0.4.5,<0.5.0
|
||||
PyPDF3>=1.0.0,<1.0.4
|
||||
pytz>=2016.10
|
||||
requests>=2.11.1,<2.25.0
|
||||
SQLAlchemy>=1.3.0,<1.5.0
|
||||
SQLAlchemy>=1.3.0,<1.5.0 # oauth fails on 1.4+ due to import problems in flask_dance
|
||||
tornado>=4.1,<6.2
|
||||
Wand>=0.4.4,<0.7.0
|
||||
unidecode>=0.04.19,<1.2.0
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user