From 2ab823459aef8f8f3c2191c6315bfea964ad94c5 Mon Sep 17 00:00:00 2001
From: Xin Tan <mactanxin@gmail.com>
Date: Thu, 6 Apr 2017 15:02:08 -0700
Subject: [PATCH 1/2] ADDED: user/group permissions

---
 .../share.reel/smb-share.reel/smb-share.html  | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/ui/sections/storage/inspectors/share.reel/smb-share.reel/smb-share.html b/ui/sections/storage/inspectors/share.reel/smb-share.reel/smb-share.html
index d040cf79f0..782fe90fb4 100644
--- a/ui/sections/storage/inspectors/share.reel/smb-share.reel/smb-share.html
+++ b/ui/sections/storage/inspectors/share.reel/smb-share.reel/smb-share.html
@@ -133,6 +133,69 @@
                 "element": {"#": "advancedSection"},
                 "title": "Advanced"
             }
+        },
+
+        "users_allow": {
+            "prototype": "blue-shark/ui/field-multiple-select.reel",
+            "properties": {
+                "element": {"#": "users_allow"},
+                "label": "Users allowed for Samba",
+                "placeholder": "eg. Xin",
+                "delegate": {"@": "owner"},
+                "inputTitle": "Add an allowed user",
+                "valuesTitle": "Added Users",
+                "emptyMessage": "No Users added :("
+            },
+            "bindings": {
+                "values": {"<->": "@owner.properties.users_allow"}
+            }
+        },
+        "groups_allow": {
+            "prototype": "blue-shark/ui/field-multiple-select.reel",
+            "properties": {
+                "element": {"#": "groups_allow"},
+                "label": "Groups Allowed for Samba",
+                "placeholder": "eg. Xin",
+                "delegate": {"@": "owner"},
+                "inputTitle": "Add an allowed group",
+                "valuesTitle": "Added groups",
+                "emptyMessage": "No groups added :("
+            },
+            "bindings": {
+                "options": {"<-": "@owner.networkInterfacesAliases.map{address}.filter{!@owner.object.bind_addresses.has(this)}"},
+                "values": {"<->": "@owner.properties.groups_allow"}
+            }
+        },
+        "users_deny": {
+            "prototype": "blue-shark/ui/field-multiple-select.reel",
+            "properties": {
+                "element": {"#": "users_deny"},
+                "label": "Users Deny for Samba",
+                "placeholder": "eg. Xin",
+                "delegate": {"@": "owner"},
+                "inputTitle": "Deny a user",
+                "valuesTitle": "Added Users",
+                "emptyMessage": "No users added :("
+            },
+            "bindings": {
+                "options": {"<-": "@owner.networkInterfacesAliases.map{address}.filter{!@owner.object.bind_addresses.has(this)}"},
+                "values": {"<->": "@owner.properties.users_deny"}
+            }
+        },
+        "groups_deny": {
+            "prototype": "blue-shark/ui/field-multiple-select.reel",
+            "properties": {
+                "element": {"#": "groups_deny"},
+                "label": "Groups Deny for Samba",
+                "placeholder": "eg. Xin",
+                "delegate": {"@": "owner"},
+                "inputTitle": "Deny a group",
+                "valuesTitle": "Added Groups",
+                "emptyMessage": "No groups added :("
+            },
+            "bindings": {
+                "values": {"<->": "@owner.properties.groups_deny"}
+            }
         }
     }
     </script>
@@ -149,6 +212,10 @@
             <div data-montage-id="guestOnly"></div>
             <div data-montage-id="hostAllow"></div>
             <div data-montage-id="hostDeny"></div>
+            <div data-montage-id="users_allow"></div>
+            <div data-montage-id="groups_allow"></div>
+            <div data-montage-id="users_deny"></div>
+            <div data-montage-id="groups_deny"></div>
             <div data-montage-id="vfsObjects"></div>
             <div data-montage-id="previousVersions"></div>
         </div>

From dffeb32b17528eea8de8d8590f9c8895c4588f7b Mon Sep 17 00:00:00 2001
From: Xin Tan <mactanxin@gmail.com>
Date: Fri, 7 Apr 2017 10:33:53 -0700
Subject: [PATCH 2/2] UPDATED: use search-users/groups-multiple instead

---
 .../share.reel/smb-share.reel/smb-share.html  | 47 +++++++------------
 1 file changed, 16 insertions(+), 31 deletions(-)

diff --git a/ui/sections/storage/inspectors/share.reel/smb-share.reel/smb-share.html b/ui/sections/storage/inspectors/share.reel/smb-share.reel/smb-share.html
index 782fe90fb4..90e3c36735 100644
--- a/ui/sections/storage/inspectors/share.reel/smb-share.reel/smb-share.html
+++ b/ui/sections/storage/inspectors/share.reel/smb-share.reel/smb-share.html
@@ -134,64 +134,49 @@
                 "title": "Advanced"
             }
         },
-
         "users_allow": {
-            "prototype": "blue-shark/ui/field-multiple-select.reel",
+            "prototype": "ui/controls/search-users-multiple.reel",
             "properties": {
                 "element": {"#": "users_allow"},
-                "label": "Users allowed for Samba",
-                "placeholder": "eg. Xin",
-                "delegate": {"@": "owner"},
-                "inputTitle": "Add an allowed user",
-                "valuesTitle": "Added Users",
-                "emptyMessage": "No Users added :("
+                "label": "Users Allowed",
+                "emptyMessage": "No allowed users added",
+                "valuePath": "username"
             },
             "bindings": {
                 "values": {"<->": "@owner.properties.users_allow"}
             }
         },
         "groups_allow": {
-            "prototype": "blue-shark/ui/field-multiple-select.reel",
+            "prototype": "ui/controls/search-groups-multiple.reel",
             "properties": {
                 "element": {"#": "groups_allow"},
-                "label": "Groups Allowed for Samba",
-                "placeholder": "eg. Xin",
-                "delegate": {"@": "owner"},
-                "inputTitle": "Add an allowed group",
-                "valuesTitle": "Added groups",
-                "emptyMessage": "No groups added :("
+                "label": "Groups Allowed",
+                "emptyMessage": "No allowed groups added",
+                "valuePath": "name"
             },
             "bindings": {
-                "options": {"<-": "@owner.networkInterfacesAliases.map{address}.filter{!@owner.object.bind_addresses.has(this)}"},
                 "values": {"<->": "@owner.properties.groups_allow"}
             }
         },
         "users_deny": {
-            "prototype": "blue-shark/ui/field-multiple-select.reel",
+            "prototype": "ui/controls/search-users-multiple.reel",
             "properties": {
                 "element": {"#": "users_deny"},
-                "label": "Users Deny for Samba",
-                "placeholder": "eg. Xin",
-                "delegate": {"@": "owner"},
-                "inputTitle": "Deny a user",
-                "valuesTitle": "Added Users",
-                "emptyMessage": "No users added :("
+                "label": "Users Allowed",
+                "emptyMessage": "No allowed users added",
+                "valuePath": "username"
             },
             "bindings": {
-                "options": {"<-": "@owner.networkInterfacesAliases.map{address}.filter{!@owner.object.bind_addresses.has(this)}"},
                 "values": {"<->": "@owner.properties.users_deny"}
             }
         },
         "groups_deny": {
-            "prototype": "blue-shark/ui/field-multiple-select.reel",
+            "prototype": "ui/controls/search-groups-multiple.reel",
             "properties": {
                 "element": {"#": "groups_deny"},
-                "label": "Groups Deny for Samba",
-                "placeholder": "eg. Xin",
-                "delegate": {"@": "owner"},
-                "inputTitle": "Deny a group",
-                "valuesTitle": "Added Groups",
-                "emptyMessage": "No groups added :("
+                "label": "Groups Allowed",
+                "emptyMessage": "No allowed groups added",
+                "valuePath": "name"
             },
             "bindings": {
                 "values": {"<->": "@owner.properties.groups_deny"}