diff --git a/admin/server/services.py b/admin/server/services.py index a1b4d5f1e..fe23996ff 100644 --- a/admin/server/services.py +++ b/admin/server/services.py @@ -274,7 +274,7 @@ class SettingsMgr: for setting in settings: result.append({ 'name': setting.name, - 'setting_type': setting.setting_type, + 'source': setting.source, 'data_type': setting.data_type, 'value': setting.value, }) @@ -289,7 +289,7 @@ class SettingsMgr: for setting in settings: result.append({ 'name': setting.name, - 'setting_type': setting.setting_type, + 'source': setting.source, 'data_type': setting.data_type, 'value': setting.value, }) diff --git a/api/db/db_models.py b/api/db/db_models.py index dff2f2f70..77b357dcf 100644 --- a/api/db/db_models.py +++ b/api/db/db_models.py @@ -1199,7 +1199,7 @@ class Memory(DataBaseModel): class SystemSettings(DataBaseModel): name = CharField(max_length=128, primary_key=True) - setting_type = CharField(max_length=32, null=False, index=False) + source = CharField(max_length=32, null=False, index=False) data_type = CharField(max_length=32, null=False, index=False) value = CharField(max_length=1024, null=False, index=False) class Meta: diff --git a/conf/system_settings.json b/conf/system_settings.json index 5ac6b4ceb..fd6c7a119 100644 --- a/conf/system_settings.json +++ b/conf/system_settings.json @@ -2,61 +2,61 @@ "system_settings": [ { "name": "enable_whitelist", - "setting_type": "config", + "source": "variable", "data_type": "bool", "value": "true" }, { "name": "default_role", - "setting_type": "config", + "source": "variable", "data_type": "string", "value": "" }, { "name": "mail.server", - "setting_type": "config", + "source": "variable", "data_type": "string", "value": "" }, { "name": "mail.port", - "setting_type": "config", + "source": "variable", "data_type": "integer", "value": "" }, { "name": "mail.use_ssl", - "setting_type": "config", + "source": "variable", "data_type": "bool", "value": "false" }, { "name": "mail.use_tls", - "setting_type": "config", + "source": "variable", "data_type": "bool", "value": "false" }, { "name": "mail.username", - "setting_type": "config", + "source": "variable", "data_type": "string", "value": "" }, { "name": "mail.password", - "setting_type": "config", + "source": "variable", "data_type": "string", "value": "" }, { "name": "mail.timeout", - "setting_type": "config", + "source": "variable", "data_type": "integer", "value": "10" }, { "name": "mail.default_sender", - "setting_type": "config", + "source": "variable", "data_type": "string", "value": "" } diff --git a/docs/guides/admin/admin_cli.md b/docs/guides/admin/admin_cli.md index 387e66853..adc2cdfb1 100644 --- a/docs/guides/admin/admin_cli.md +++ b/docs/guides/admin/admin_cli.md @@ -405,18 +405,18 @@ Revoke successfully! ``` admin> list vars; +-----------+---------------------+--------------+-----------+ -| data_type | name | setting_type | value | +| data_type | name | source | value | +-----------+---------------------+--------------+-----------+ -| string | default_role | config | user | -| bool | enable_whitelist | config | true | -| string | mail.default_sender | config | | -| string | mail.password | config | | -| integer | mail.port | config | 15 | -| string | mail.server | config | localhost | -| integer | mail.timeout | config | 10 | -| bool | mail.use_ssl | config | true | -| bool | mail.use_tls | config | false | -| string | mail.username | config | | +| string | default_role | variable | user | +| bool | enable_whitelist | variable | true | +| string | mail.default_sender | variable | | +| string | mail.password | variable | | +| integer | mail.port | variable | 15 | +| string | mail.server | variable | localhost | +| integer | mail.timeout | variable | 10 | +| bool | mail.use_ssl | variable | true | +| bool | mail.use_tls | variable | false | +| string | mail.username | variable | | +-----------+---------------------+--------------+-----------+ ``` @@ -427,9 +427,9 @@ admin> list vars; ``` admin> show var mail.server; +-----------+-------------+--------------+-----------+ -| data_type | name | setting_type | value | +| data_type | name | source | value | +-----------+-------------+--------------+-----------+ -| string | mail.server | config | localhost | +| string | mail.server | variable | localhost | +-----------+-------------+--------------+-----------+ ```