diff --git a/cps/__init__.py b/cps/__init__.py index 157dd14e..5ecc00eb 100644 --- a/cps/__init__.py +++ b/cps/__init__.py @@ -85,7 +85,9 @@ app.config.update( SESSION_COOKIE_HTTPONLY=True, SESSION_COOKIE_SAMESITE='Strict', REMEMBER_COOKIE_SAMESITE='Strict', # will be available in flask-login 0.5.1 earliest - WTF_CSRF_SSL_STRICT=False + WTF_CSRF_SSL_STRICT=False, + SESSION_COOKIE_NAME=os.environ.get('COOKIE_PREFIX', "") + "session", + REMEMBER_COOKIE_NAME=os.environ.get('COOKIE_PREFIX', "") + "remember_token" ) lm = MyLoginManager() diff --git a/cps/constants.py b/cps/constants.py index 13d1529d..0736a354 100644 --- a/cps/constants.py +++ b/cps/constants.py @@ -175,7 +175,7 @@ BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, d 'series_id, languages, publisher, pubdate, identifiers') # python build process likes to have x.y.zbw -> b for beta and w a counting number -STABLE_VERSION = {'version': '0.6.23'} +STABLE_VERSION = {'version': '0.6.24b'} NIGHTLY_VERSION = dict() NIGHTLY_VERSION[0] = '$Format:%H$' diff --git a/cps/jinjia.py b/cps/jinjia.py index f0b3489d..80c2b7ea 100644 --- a/cps/jinjia.py +++ b/cps/jinjia.py @@ -26,6 +26,7 @@ from markupsafe import escape import datetime import mimetypes from uuid import uuid4 +import re from flask import Blueprint, request, url_for from flask_babel import format_date @@ -112,7 +113,10 @@ def yesno(value, yes, no): @jinjia.app_template_filter('formatfloat') def formatfloat(value, decimals=1): value = 0 if not value else value - return ('{0:.' + str(decimals) + 'f}').format(value).rstrip('0').rstrip('.') + formated_value = ('{0:.' + str(decimals) + 'f}').format(value) + if formated_value.endswith('.' + "0" * decimals): + formated_value = formated_value.rstrip('0').rstrip('.') + return formated_value @jinjia.app_template_filter('formatseriesindex')