From 1c373ca7712a9af6524721926d6442a40364b099 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 6 Jun 2017 01:10:36 +0200
Subject: [PATCH 1/3] fix render in user group picker

---
 .../common/overlays/usergrouppicker/usergrouppicker.html  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html
index 110465101b..6a0f0a0446 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/usergrouppicker/usergrouppicker.html
@@ -39,16 +39,16 @@
                     <div class="umb-user-group-picker-list-item__permission">
                         <span>
                             <span class="bold">Content start node:</span>
-                            <span ng-repeat="startNode in userGroup.startNodesContent">{{ startNode.name }}<span ng-if="!$last">, </span></span>
-                            <span ng-if="userGroup.startNodeContent === 0">Content root</span>
+                            <span ng-if="userGroup.startContentId">{{ startNode.name }}</span>
+                            <span ng-if="!userGroup.startContentId">Content root</span>
                         </span>
                     </div>
                     
                     <div class="umb-user-group-picker-list-item__permission">
                         <span>
                             <span class="bold">Media start node:</span>
-                            <span ng-repeat="startNode in userGroup.startNodesMedia">{{ startNode.name }}<span ng-if="!$last">, </span></span>
-                            <span ng-if="userGroup.startNodeMedia === 0">Media root</span>
+                            <span ng-if="userGroup.startMediaId">{{ startNode.name }}</span>
+                            <span ng-if="!userGroup.startMediaId">Media root</span>
                         </span>
                     </div>
                 </div>

From 1eba16579ae4f3c51267a688e807b07311904e11 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 6 Jun 2017 01:10:55 +0200
Subject: [PATCH 2/3] remove search on user groups

---
 .../src/views/users/views/groups/groups.html  | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
index c7e0c0e504..4aef5a2458 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
+++ b/src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
@@ -12,28 +12,6 @@
             </umb-button>
         </umb-editor-sub-header-content-left>
 
-        <umb-editor-sub-header-content-right ng-if="vm.selection.length === 0">
-
-            <umb-editor-sub-header-section>
-                <ng-form class="form-search -no-margin-bottom pull-right" novalidate>
-                    <div class="inner-addon left-addon">
-                        <i class="icon icon-search" ng-click="enterSearch($event)"></i>
-                        <input
-                            class="form-control search-input"
-                            type="text"
-                            localize="placeholder"
-                            placeholder="@general_typeToSearch"
-                            ng-model="options.filter"
-                            ng-change="enterSearch()"
-                            ng-keydown="forceSearch($event)"
-                            prevent-enter-submit
-                            no-dirty-check>
-                    </div>
-                </ng-form>
-            </umb-editor-sub-header-section>
-
-        </umb-editor-sub-header-content-right>
-
         <!-- With selection -->
         <umb-editor-sub-header-content-left ng-if="vm.selection.length > 0">
             <umb-editor-sub-header-section>

From d72af87790f1b8013e9d4ae4a180cdf5977efbd3 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 6 Jun 2017 01:11:40 +0200
Subject: [PATCH 3/3] rename content picker to media picker

---
 .../src/views/users/user.controller.js                 | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
index 52e3ce992b..43392cecf1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
@@ -116,7 +116,7 @@
         }
 
         function openMediaPicker() {
-            vm.contentPicker = {
+            vm.mediaPicker = {
                 title: "Select media start node",
                 view: "treepicker",
                 section: "media",
@@ -128,12 +128,12 @@
                     if (model.selection) {
                         vm.user.startNodesMedia = model.selection;
                     }
-                    vm.contentPicker.show = false;
-                    vm.contentPicker = null;
+                    vm.mediaPicker.show = false;
+                    vm.mediaPicker = null;
                 },
                 close: function (oldModel) {
-                    vm.contentPicker.show = false;
-                    vm.contentPicker = null;
+                    vm.mediaPicker.show = false;
+                    vm.mediaPicker = null;
                 }
             };
         }