We set a TOASTER_MANAGED env variable in the startup script, which has a value of "1" if Toaster should run in build mode.
Add a BUILD_MODE variable to settings.py which is True if TOASTER_MANAGED is set to "1", False otherwise. Add this to the context for every template, so we can use this information to conditionally alter the content of pages according to the mode we're in. [YOCTO #8514] Signed-off-by: Elliot Smith <[email protected]> --- bitbake/lib/toaster/toastergui/views.py | 4 ++++ bitbake/lib/toaster/toastermain/settings.py | 6 ++---- bitbake/lib/toaster/toastermain/urls.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index e2f2874..10bbef5 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -1880,6 +1880,10 @@ def managedcontextprocessor(request): "projects": projects, "non_cli_projects": projects.exclude(is_default=True), "DEBUG" : toastermain.settings.DEBUG, + + # True if Toaster is in build mode, False otherwise + "BUILD_MODE": toastermain.settings.BUILD_MODE, + "CUSTOM_IMAGE" : toastermain.settings.CUSTOM_IMAGE, "TOASTER_BRANCH": toastermain.settings.TOASTER_BRANCH, "TOASTER_REVISION" : toastermain.settings.TOASTER_REVISION, diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index 6439d68..b28ddb2 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py @@ -92,11 +92,9 @@ if 'DATABASE_URL' in os.environ: else: raise Exception("FIXME: Please implement missing database url schema for url: %s" % dburl) - +BUILD_MODE = False if 'TOASTER_MANAGED' in os.environ and os.environ['TOASTER_MANAGED'] == "1": - MANAGED = True -else: - MANAGED = False + BUILD_MODE = True # Allows current database settings to be exported as a DATABASE_URL environment variable value diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index 521588a..6c4a953 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py @@ -60,7 +60,7 @@ if toastermain.settings.DEBUG_PANEL_ENABLED: #logger.info("Enabled django_toolbar extension") -if toastermain.settings.MANAGED: +if toastermain.settings.BUILD_MODE: urlpatterns = [ # Uncomment the next line to enable the admin: url(r'^admin/', include(admin.site.urls)), -- Elliot Smith Software Engineer Intel OTC --------------------------------------------------------------------- Intel Corporation (UK) Limited Registered No. 1134945 (England) Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47 This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -- _______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
