burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

* Added "HIDDEN_FIELD" and "READ_ONLY_FIELD" to Configuration

Browse Source 
* Added a "default" UDS Server (cluster) ID, so we can use it for a lot
of things :)
This commit is contained in:
Adolfo Gómez García 2018-05-28 09:54:23 +02:00
parent b5ebd1f1fb
commit e9d23cf170
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/uds/core/util/Config.py
View File

@ -50,6 +50,7 @@ getLater = []
# For custom params (for choices mainly)
configParams = {}
class Config(object):
'''
Keeps persistence configuration data
@ -61,8 +62,11 @@ class Config(object):
NUMERIC_FIELD = 2
BOOLEAN_FIELD = 3
CHOICE_FIELD = 4 # Choice fields must set its parameters on global "configParams" (better by calling ".setParams" method)
READ_FIELD = 5 # Only can viewed, but not changed (can be changed througn API, it's just read only to avoid "mistakes")
HIDDEN_FIELD = 6 # Not visible on "admin" config edition
class _Value(object):
def __init__(self, section, key, default='', crypt=False, longText=False, **kwargs):
logger.debug('Var: {} {} KWARGS: {}'.format(section, key, kwargs))
self._type = kwargs.get('type', -1)
@ -169,6 +173,7 @@ class Config(object):
logger.info("Could not save configuration key {0}.{1}".format(self._section.name(), self._key))
class _Section(object):
def __init__(self, sectionName):
self._sectionName = sectionName
@ -324,6 +329,9 @@ class GlobalConfig(object):
# This is used so templates can change "styles" from admin interface
LOWERCASE_USERNAME = Config.section(SECURITY_SECTION).value('Convert username to lowercase', '1', type=Config.BOOLEAN_FIELD)
# Global UDS ID (common for all servers on the same cluster)
UDS_ID = Config.section(GLOBAL_SECTION).value('UDS ID', CryptoManager.manager().uuid(), type=Config.READ_FIELD)
initDone = False
@staticmethod
@ -339,7 +347,6 @@ class GlobalConfig(object):
GlobalConfig.UDS_THEME.setParams(themes)
@staticmethod
def initialize():
if GlobalConfig.initDone is False:

6
server/src/uds/templates/uds/admin/tmpl/configuration.html
View File

@ -36,6 +36,9 @@
{{ set_var "cfg_section" key }}
{{# eachKeySorted value }}
{{ set_var "cfg_key" key }}
{{# ifequals value.type 6 }}
<!-- hidden -->
{{ else }}
<div class="form-group">
<label for="fld_{{ clean_whitespace ../key }}{{ key }}" class="col-sm-5 control-label">{{ key }}</label>
<div class="col-sm-6">
@ -58,7 +61,7 @@
</select>
{{ else }}
<div>
<input type="{{# ifequals value.type 2 }}numeric{{ else }}text{{/ ifequals}}" class="form-control config-ctrl" data-section="{{ cfg_section }}" data-key="{{ cfg_key }}" value="{{ value.value }}">
<input type="{{# ifequals value.type 2 }}numeric{{ else }}text{{/ ifequals}}" {{# ifequals value.type 5 }}readonly{{/ ifequals }} class="form-control config-ctrl" data-section="{{ cfg_section }}" data-key="{{ cfg_key }}" value="{{ value.value }}">
</div>
{{/ ifequals }}
{{/ ifequals }}
@ -66,6 +69,7 @@
{{/ if }}
</div>
</div>
{{/ ifequals }}
{{ unset_var "cfg_key" }}
{{/ eachKeySorted }}
</div>