From b7a048c6eae264e8d42436357c2cb18e2f96cd54 Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Fri, 18 Aug 2017 21:44:44 +0200
Subject: [PATCH 1/2] Adopt clonable settings to new styling

---
 scripts/system/html/entityProperties.html | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 24a8b2fee0..f94d339f84 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -133,20 +133,20 @@
                             </div>
                         </div>
                     </fieldset>
-                    <fieldset style="display:none;">
-                        <!-- extra column ------------------------------------------------------------------------------------ -->
-                        <div class="column" id="group-cloneable-group" style="display:none;">
-                            <div class="sub-section-header">
-                                <span>Cloneable Settings</span>
-                            </div>
-                            <div class="cloneable-group property gen">
-                                <div><label>Clone Lifetime</label><input type="number" data-user-data-type="cloneLifetime" id="property-cloneable-lifetime"></div>
-                                <div><label>Clone Limit</label><input type="number" data-user-data-type="cloneLimit" id="property-cloneable-limit"></div>
-                                <div class="property checkbox">
-                                    <input type="checkbox" id="property-cloneable-dynamic">
-                                    <label for="property-cloneable-dynamic">Clone Dynamic</label>
-                                </div>
-                            </div>
+
+                    <fieldset class="column" id="group-cloneable-group" style="display:none;">
+                        <legend class="sub-section-header">
+                             <span>Cloneable Settings</span>
+                        </legend>
+                        <fieldset class="minor">
+                             <div><label>Clone Lifetime</label><input type="number" data-user-data-type="cloneLifetime" id="property-cloneable-lifetime"></div>
+                        </fieldset>
+                        <fieldset class="minor">
+                             <div><label>Clone Limit   </label><input type="number" data-user-data-type="cloneLimit" id="property-cloneable-limit"></div>
+                        </fieldset>
+                        <div class="property checkbox">
+                             <input type="checkbox" id="property-cloneable-dynamic">
+                             <label for="property-cloneable-dynamic">Clone Dynamic</label>
                         </div>
                     </fieldset>
                 </div>
@@ -681,4 +681,4 @@
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>

From 9dfc74de574c6eec004a60f79434a22fb9bc0112 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 21 Aug 2017 17:15:44 -0700
Subject: [PATCH 2/2] always write rank ID to variant when present

---
 libraries/networking/src/NodePermissions.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/networking/src/NodePermissions.cpp b/libraries/networking/src/NodePermissions.cpp
index cc5df515aa..e94c43b6fb 100644
--- a/libraries/networking/src/NodePermissions.cpp
+++ b/libraries/networking/src/NodePermissions.cpp
@@ -53,8 +53,12 @@ QVariant NodePermissions::toVariant(QHash<QUuid, GroupRank> groupRanks) {
     values["permissions_id"] = _id;
     if (_groupIDSet) {
         values["group_id"] = _groupID;
-        if (groupRanks.contains(_rankID)) {
+
+        if (!_rankID.isNull()) {
             values["rank_id"] = _rankID;
+        }
+
+        if (groupRanks.contains(_rankID)) {
             values["rank_name"] = groupRanks[_rankID].name;
             values["rank_order"] = groupRanks[_rankID].order;
         }