diff --git a/cps/config_sql.py b/cps/config_sql.py index e20f7ac2..743b2ce7 100644 --- a/cps/config_sql.py +++ b/cps/config_sql.py @@ -296,7 +296,7 @@ class _ConfigSQL(object): def toDict(self): storage = {} for k, v in self.__dict__.items(): - if k[0] != '_' and not k.endswith("password") and not k.endswith("secret"): + if k[0] != '_' and not k.endswith("password") and not k.endswith("secret") and not k == "cli": storage[k] = v return storage diff --git a/cps/templates/detail.html b/cps/templates/detail.html index 5d7c846e..3af205fb 100644 --- a/cps/templates/detail.html +++ b/cps/templates/detail.html @@ -71,9 +71,9 @@ {% endif %} {% endif %} - {% if entry.audioentries|length > 0 and g.user.role_viewer() %} + {% if entry.audio_entries|length > 0 and g.user.role_viewer() %}
- {% if entry.audioentries|length > 1 %} + {% if entry.audio_entries|length > 1 %}
{% endif %} diff --git a/setup.cfg b/setup.cfg index 9daae0c9..aff22e9e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -38,7 +38,7 @@ console_scripts = [options] include_package_data = True install_requires = - APScheduler>=3.6.3,<3.8.0 + APScheduler>=3.6.3,<3.10.0 werkzeug<2.1.0 Babel>=1.3,<3.0 Flask-Babel>=0.11.1,<2.1.0 @@ -62,7 +62,7 @@ install_requires = [options.extras_require] gdrive = - google-api-python-client>=1.7.11,<2.46.0 + google-api-python-client>=1.7.11,<2.50.0 gevent>20.6.0,<22.0.0 greenlet>=0.4.17,<1.2.0 httplib2>=0.9.2,<0.21.0 @@ -75,7 +75,7 @@ gdrive = rsa>=3.4.2,<4.9.0 gmail = google-auth-oauthlib>=0.4.3,<0.6.0 - google-api-python-client>=1.7.11,<2.46.0 + google-api-python-client>=1.7.11,<2.50.0 goodreads = goodreads>=0.3.2,<0.4.0 python-Levenshtein>=0.12.0,<0.13.0