Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

start on code to convert from settings version 1.2 to 1.3

Browse source
This commit is contained in:
Seth Alves 2016-06-02 13:28:36 -07:00
parent 83f2c723eb
commit 83cba2dd82
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/src/DomainGatekeeper.cpp
View file

@ -173,8 +173,6 @@ SharedNodePointer DomainGatekeeper::processAssignmentConnectRequest(const NodeCo
} }
const QString MAXIMUM_USER_CAPACITY = "security.maximum_user_capacity"; const QString MAXIMUM_USER_CAPACITY = "security.maximum_user_capacity";
// const QString ALLOWED_EDITORS_SETTINGS_KEYPATH = "security.allowed_editors";
// const QString EDITORS_ARE_REZZERS_KEYPATH = "security.editors_are_rezzers";
SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnectionData& nodeConnection, SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnectionData& nodeConnection,
const QString& username, const QString& username,

17
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -101,6 +101,11 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
double oldVersion = appSettings.value(JSON_SETTINGS_VERSION_KEY, 0.0).toDouble(); double oldVersion = appSettings.value(JSON_SETTINGS_VERSION_KEY, 0.0).toDouble();
if (oldVersion != _descriptionVersion) { if (oldVersion != _descriptionVersion) {
const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users";
const QString RESTRICTED_ACCESS_SETTINGS_KEYPATH = "security.restricted_access";
const QString ALLOWED_EDITORS_SETTINGS_KEYPATH = "security.allowed_editors";
const QString EDITORS_ARE_REZZERS_KEYPATH = "security.editors_are_rezzers";
qDebug() << "Previous domain-server settings version was" qDebug() << "Previous domain-server settings version was"
<< QString::number(oldVersion, 'g', 8) << "and the new version is" << QString::number(oldVersion, 'g', 8) << "and the new version is"
<< QString::number(_descriptionVersion, 'g', 8) << "- checking if any re-mapping is required"; << QString::number(_descriptionVersion, 'g', 8) << "- checking if any re-mapping is required";
@ -110,8 +115,6 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
// This was prior to the introduction of security.restricted_access // This was prior to the introduction of security.restricted_access
// If the user has a list of allowed users then set their value for security.restricted_access to true // If the user has a list of allowed users then set their value for security.restricted_access to true
const QString ALLOWED_USERS_SETTINGS_KEYPATH = "security.allowed_users";
const QString RESTRICTED_ACCESS_SETTINGS_KEYPATH = "security.restricted_access";
QVariant* allowedUsers = valueForKeyPath(_configMap.getMergedConfig(), ALLOWED_USERS_SETTINGS_KEYPATH); QVariant* allowedUsers = valueForKeyPath(_configMap.getMergedConfig(), ALLOWED_USERS_SETTINGS_KEYPATH);
if (allowedUsers if (allowedUsers
@ -198,7 +201,17 @@ void DomainServerSettingsManager::setupConfigMap(const QStringList& argumentList
if (oldVersion < 1.3) { if (oldVersion < 1.3) {
// This was prior to the permissions-grid in the domain-server settings page // This was prior to the permissions-grid in the domain-server settings page
// bool isRestrictingAccess = valueOrDefaultValueForKeyPath(RESTRICTED_ACCESS_SETTINGS_KEYPATH).toBool();
// const QVariant* allowedEditorsVariant = valueForKeyPath(getSettingsMap(), ALLOWED_EDITORS_SETTINGS_KEYPATH);
// const QVariant* editorsAreRezzersVariant = valueForKeyPath(getSettingsMap(), EDITORS_ARE_REZZERS_KEYPATH);
// bool onlyEditorsAreRezzers = false;
// if (editorsAreRezzersVariant) {
// onlyEditorsAreRezzers = editorsAreRezzersVariant->toBool();
// }
// XXX
} }
} }