Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 13:56:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

use ID from new domain settings, don't disable save button

Browse source
This commit is contained in:
Stephen Birarda 2014-09-26 14:39:50 -07:00
parent 3cbfad69cd
commit e8c3fa3cf1
4 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
domain-server/resources/web/css/style.css
View file

@ -66,10 +66,6 @@ span.port {
margin-top: 10px;
}
.save-button:disabled {
opacity: .45;
}
#small-save-button {
width: 100%;
margin-bottom: 15px;

8
domain-server/resources/web/js/settings.js
View file

@ -64,15 +64,7 @@ $(document).ready(function(){
// this input was changed, add the changed data attribute to it
$(this).attr('data-changed', true)
$('.save-button').removeAttr('disabled')
badgeSidebarForDifferences($(this))
if ($('span.badge:not(:empty)').length == 0) {
// if all badges are empty we have no changed values
// so we can disable the save button again
$('.save-button').attr('disabled', true)
}
})
$('#advanced-toggle-button').click(function(){

4
domain-server/resources/web/settings/index.shtml
View file

@ -22,7 +22,7 @@
</ul>
<button id="advanced-toggle-button" class="btn btn-info">Show advanced</button>
<button class="btn btn-success save-button" disabled>Save and restart</button>
<button class="btn btn-success save-button">Save and restart</button>
</div>
</div>
@ -54,7 +54,7 @@
</div>
<div class="col-xs-12 hidden-sm hidden-md hidden-lg">
<button class="btn btn-success save-button" id="small-save-button" disabled>Save and restart</button>
<button class="btn btn-success save-button" id="small-save-button">Save and restart</button>
</div>
</div>

8
domain-server/src/DomainServer.cpp
View file

@ -179,7 +179,7 @@ void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
const QString CUSTOM_PORT_OPTION = "port";
unsigned short domainServerPort = DEFAULT_DOMAIN_SERVER_PORT;
const QVariantMap& settingsMap = _settingsManager.getSettingsMap();
QVariantMap& settingsMap = _settingsManager.getSettingsMap();
if (settingsMap.contains(CUSTOM_PORT_OPTION)) {
domainServerPort = (unsigned short) settingsMap.value(CUSTOM_PORT_OPTION).toUInt();
@ -206,7 +206,11 @@ void DomainServer::setupNodeListAndAssignments(const QUuid& sessionUUID) {
// set our LimitedNodeList UUID to match the UUID from our config
// nodes will currently use this to add resources to data-web that relate to our domain
nodeList->setSessionUUID(settingsMap.value(DOMAIN_CONFIG_ID_KEY).toString());
const QString METAVERSE_DOMAIN_ID_KEY_PATH = "metaverse.id";
const QVariant* idValueVariant = valueForKeyPath(settingsMap, METAVERSE_DOMAIN_ID_KEY_PATH);
if (idValueVariant) {
nodeList->setSessionUUID(idValueVariant->toString());
}
connect(nodeList, &LimitedNodeList::nodeAdded, this, &DomainServer::nodeAdded);
connect(nodeList, &LimitedNodeList::nodeKilled, this, &DomainServer::nodeKilled);