Rebase master from preprod

This commit is contained in:
Darks 2020-07-23 20:24:26 +02:00
parent 07a5ee4006
commit 2dd7863e89
Signed by: Darks
GPG Key ID: F61F10FA138E797C
2 changed files with 16 additions and 0 deletions

View File

@ -5,7 +5,11 @@ from flask_login import LoginManager
from flask_mail import Mail
from config import Config
import time
<<<<<<< HEAD
import slugify
=======
>>>>>>> e15005a... Ajout des stats sur la durée de chargement
app = Flask(__name__)
app.config.from_object(Config)
@ -18,10 +22,17 @@ db = SQLAlchemy(app)
migrate = Migrate(app, db)
mail = Mail(app)
@app.before_request
def request_time():
g.request_start_time = time.time()
g.request_time = lambda: "%.5fs" % (time.time() - g.request_start_time)
login = LoginManager(app)
login.login_view = 'login'
login.login_message = "Veuillez vous authentifier avant de continuer."
<<<<<<< HEAD
from app.utils.converters import *
app.url_map.converters['forum'] = ForumConverter
app.url_map.converters['topicpage'] = TopicPageConverter
@ -34,6 +45,8 @@ def request_time():
from app.processors.menu import menu_processor
from app.processors.utilities import utilities_processor
=======
>>>>>>> e15005a... Ajout des stats sur la durée de chargement
from app import models # IDK why this is here, but it works
from app.models.comment import Comment

View File

@ -4,5 +4,8 @@
{% if current_user.is_authenticated and current_user.priv('footer-statistics') %}
<p>Page générée en {{ g.request_time() }}</p>
{% endif %}
<<<<<<< HEAD
<p>Ceci est un environnement de test. Tout contenu peut être supprimé sans avertissement préalable.</p>
=======
>>>>>>> e15005a... Ajout des stats sur la durée de chargement
</footer>