Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:35:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't return gui only values from DS settings json

Browse source
This commit is contained in:
Stephen Birarda 2015-05-11 13:44:35 -07:00
parent 27f06e2d37
commit 5afb0792dc
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/describe-settings.json
View file

@ -10,7 +10,7 @@
"help": "Click the button above to connect your High Fidelity metaverse account.", "help": "Click the button above to connect your High Fidelity metaverse account.",
"button_label": "Connect High Fidelity Account", "button_label": "Connect High Fidelity Account",
"href": "https://metaverse.highfidelity.com/oauth/authorize?client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Foauth&response_type=code&scope=domains", "href": "https://metaverse.highfidelity.com/oauth/authorize?client_id=38e572ed35bc4d34c41fbf1fb4d00071bb7328b3d0ba06d1fba64aa3f44e71e4&redirect_uri=http%3A%2F%2Flocalhost%3A40100%2Foauth&response_type=code&scope=domains",
"persist": false "gui-only": true
}, },
{ {
"name": "access_token", "name": "access_token",

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

@ -31,6 +31,7 @@ const QString SETTING_DEFAULT_KEY = "default";
const QString DESCRIPTION_NAME_KEY = "name"; const QString DESCRIPTION_NAME_KEY = "name";
const QString SETTING_DESCRIPTION_TYPE_KEY = "type"; const QString SETTING_DESCRIPTION_TYPE_KEY = "type";
const QString DESCRIPTION_COLUMNS_KEY = "columns"; const QString DESCRIPTION_COLUMNS_KEY = "columns";
const QString VALUE_GUI_ONLY_FLAG_KEY = "gui-only";
DomainServerSettingsManager::DomainServerSettingsManager() : DomainServerSettingsManager::DomainServerSettingsManager() :
_descriptionArray(), _descriptionArray(),
@ -187,7 +188,7 @@ QJsonObject DomainServerSettingsManager::responseObjectForType(const QString& ty
QJsonObject settingObject = settingValue.toObject(); QJsonObject settingObject = settingValue.toObject();
if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool()) { if (!settingObject[VALUE_HIDDEN_FLAG_KEY].toBool() && !settingObject[VALUE_GUI_ONLY_FLAG_KEY].toBool()) {
QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray(); QJsonArray affectedTypesArray = settingObject[AFFECTED_TYPES_JSON_KEY].toArray();
if (affectedTypesArray.isEmpty()) { if (affectedTypesArray.isEmpty()) {
affectedTypesArray = groupObject[AFFECTED_TYPES_JSON_KEY].toArray(); affectedTypesArray = groupObject[AFFECTED_TYPES_JSON_KEY].toArray();