Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

code review

Browse source
This commit is contained in:
Seth Alves 2016-07-27 11:46:52 -07:00
parent 8663b260f6
commit 3a3b1489c6
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -701,19 +701,17 @@ NodePermissions DomainServerSettingsManager::getForbiddensForGroup(const QString
if (_groupForbiddens.contains(groupRankKey)) { if (_groupForbiddens.contains(groupRankKey)) {
return *(_groupForbiddens[groupRankKey].get()); return *(_groupForbiddens[groupRankKey].get());
} }
NodePermissions nullForbiddens; NodePermissions allForbiddens;
// XXX should this be setAll(true) ? allForbiddens.setAll(true);
nullForbiddens.setAll(false); return allForbiddens;
return nullForbiddens;
} }
NodePermissions DomainServerSettingsManager::getForbiddensForGroup(const QUuid& groupID, QUuid rankID) const { NodePermissions DomainServerSettingsManager::getForbiddensForGroup(const QUuid& groupID, QUuid rankID) const {
GroupByUUIDKey byUUIDKey = GroupByUUIDKey(groupID, rankID); GroupByUUIDKey byUUIDKey = GroupByUUIDKey(groupID, rankID);
if (!_groupForbiddensByUUID.contains(byUUIDKey)) { if (!_groupForbiddensByUUID.contains(byUUIDKey)) {
NodePermissions nullForbiddens; NodePermissions allForbiddens;
// XXX should this be setAll(true) ? allForbiddens.setAll(true);
nullForbiddens.setAll(false); return allForbiddens;
return nullForbiddens;
} }
NodePermissionsKey groupKey = _groupForbiddensByUUID[byUUIDKey]->getKey(); NodePermissionsKey groupKey = _groupForbiddensByUUID[byUUIDKey]->getKey();
@ -1104,11 +1102,6 @@ bool permissionVariantLessThan(const QVariant &v1, const QVariant &v2) {
return v1.toString() < v2.toString(); return v1.toString() < v2.toString();
} }
// if (m1.contains("rank_name") && m2.contains("rank_name") &&
// m1["permissions_id"].toString() == m2["permissions_id"].toString()) {
// return m1["rank_name"].toString() < m2["rank_name"].toString();
// }
if (m1.contains("rank_order") && m2.contains("rank_order") && if (m1.contains("rank_order") && m2.contains("rank_order") &&
m1["permissions_id"].toString() == m2["permissions_id"].toString()) { m1["permissions_id"].toString() == m2["permissions_id"].toString()) {
return m1["rank_order"].toInt() < m2["rank_order"].toInt(); return m1["rank_order"].toInt() < m2["rank_order"].toInt();