Huge change, removed Status class and all "alert" messages are now shown as BS toast() and are via the DB and handled async in the F/E in jscript via Ajax. Fixed BUG-113 where toasts() were repeating. Removed many of the explicit alert messages (other than errors) and hooked {New|Finish}Job to consistently send messages to the F/E. Other messages (F/E without a job, like save settings) now use this model as well. Finally converted most of the older POST responses to formal json
This commit is contained in:
8
main.py
8
main.py
@@ -11,7 +11,6 @@ from datetime import datetime
|
||||
import os
|
||||
import re
|
||||
import socket
|
||||
from status import st, Status
|
||||
from shared import CreateSelect, CreateFoldersSelect, LocationIcon, DB_URL, PROD_HOST, OLDEST_LOG_LIMIT
|
||||
|
||||
# for ldap auth
|
||||
@@ -59,19 +58,12 @@ Compress(app)
|
||||
from ai import aistats
|
||||
from files import Entry
|
||||
from person import Person
|
||||
from job import Job, GetNumActiveJobs, GetJM_Message, ClearJM_Message
|
||||
from settings import Settings
|
||||
from user import PAUser
|
||||
|
||||
####################################### GLOBALS #######################################
|
||||
# allow jinja2 to call these python functions directly
|
||||
app.jinja_env.add_extension('jinja2.ext.loopcontrols')
|
||||
app.jinja_env.globals['ClearStatus'] = st.ClearStatus
|
||||
app.jinja_env.globals['GetAlert'] = st.GetAlert
|
||||
app.jinja_env.globals['GetMessage'] = st.GetMessage
|
||||
app.jinja_env.globals['GetNumActiveJobs'] = GetNumActiveJobs
|
||||
app.jinja_env.globals['GetJM_Message'] = GetJM_Message
|
||||
app.jinja_env.globals['ClearJM_Message'] = ClearJM_Message
|
||||
app.jinja_env.globals['CreateSelect'] = CreateSelect
|
||||
app.jinja_env.globals['CreateFoldersSelect'] = CreateFoldersSelect
|
||||
app.jinja_env.globals['LocationIcon'] = LocationIcon
|
||||
|
||||
Reference in New Issue
Block a user