From 56e9a9aaf999b17f042c5b073d500271e8c1a8bd Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 27 Oct 2017 17:23:16 -0700 Subject: [PATCH] Handle old configs --- domain-server/resources/describe-settings.json | 2 +- domain-server/resources/web/wizard/js/wizard.js | 2 ++ domain-server/src/DomainServerSettingsManager.cpp | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 706ac18b33..d55da6c848 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -1,5 +1,5 @@ { - "version": 1.9, + "version": 2.0, "settings": [ { "name": "label", diff --git a/domain-server/resources/web/wizard/js/wizard.js b/domain-server/resources/web/wizard/js/wizard.js index a9e1329f45..24a82402a6 100644 --- a/domain-server/resources/web/wizard/js/wizard.js +++ b/domain-server/resources/web/wizard/js/wizard.js @@ -383,7 +383,9 @@ function savePermissions() { "id_can_kick": localhostPermissions, "id_can_replace_content": localhostPermissions, "id_can_rez": localhostPermissions, + "id_can_rez_certified": localhostPermissions, "id_can_rez_tmp": localhostPermissions, + "id_can_rez_tmp_certified": localhostPermissions, "id_can_write_to_asset_server": localhostPermissions, "permissions_id": "localhost" } diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 1d5515b61a..43262a1a81 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -310,6 +310,16 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList _standardAgentPermissions[NodePermissions::standardNameLocalhost]->set(NodePermissions::Permission::canRezTemporaryCertifiedEntities); packPermissions(); } + if (oldVersion < 2.0) { + const QString WIZARD_COMPLETED_ONCE = "wizard.completed_once"; + + QVariant* wizardCompletedOnce = _configMap.valueForKeyPath(WIZARD_COMPLETED_ONCE, true); + + *wizardCompletedOnce = QVariant(true); + + // write the new settings to the json file + persistToFile(); + } } unpackPermissions();