Reflect Sahana upstream commit cacaadf

This commit is contained in:
Disassembler 2018-02-27 21:41:47 +01:00
parent c9591ed649
commit 4f1539de2e
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
4 changed files with 11 additions and 2 deletions

View File

@ -236,7 +236,7 @@ settings.import_template()
# e.g.
#settings.base.system_name = T("Sahana TEST")
#settings.base.prepopulate = ("MY_TEMPLATE_ONLY")
settings.base.prepopulate += ("${TEMPLATE}", "default/users")
settings.base.prepopulate += ("${TEMPLATE}")
#settings.base.theme = "default"
#settings.L10n.default_language = "en"
#settings.security.policy = 7 # Organisation-ACLs
@ -250,6 +250,9 @@ settings.base.prepopulate += ("${TEMPLATE}", "default/users")
# - NB Only templates with adaptive menus will work nicely with this!
#del settings.modules["irs"]
# Production instances should set this before prepopulate is run
#settings.base.prepopulate_demo = 0
# After 1st_run, set this for Production to save 1x DAL hit/request
#settings.base.prepopulate = 0

View File

@ -254,6 +254,9 @@ settings.import_template()
# - NB Only templates with adaptive menus will work nicely with this!
#del settings.modules["irs"]
# Production instances should set this before prepopulate is run
settings.base.prepopulate_demo = 0
# After 1st_run, set this for Production to save 1x DAL hit/request
#settings.base.prepopulate = 0

View File

@ -253,6 +253,9 @@ settings.L10n.default_language = "cs"
# After 1st_run, set this for Production to save 1x DAL hit/request
#settings.base.prepopulate = 0
# Production instances should set this before prepopulate is run
#settings.base.prepopulate_demo = 0
# =============================================================================
# A version number to tell update_check if there is a need to refresh the
# running copy of this file

View File

@ -23,7 +23,7 @@ def config(settings):
settings.base.system_name_short = T("SAMBRO")
# Pre-Populate
settings.base.prepopulate += ("SAMBRO", "default/users")
settings.base.prepopulate += ("SAMBRO",)
# Theme (folder to use for views/layout.html)
#settings.base.theme = "SAMBRO"