From 477a9bae0e842f593288e3c4417c510369e31bc4 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 19 Nov 2018 13:15:28 +0100
Subject: [PATCH] use umb dropdown instead of boostrap dropdown in permissions
 context menu

---
 .../content/content.rights.controller.js      |  2 ++
 .../src/views/content/rights.html             | 22 +++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
index afab478fc4..a8f87ce2c9 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/content/content.rights.controller.js
@@ -63,6 +63,8 @@
             vm.labels.permissionsSetForGroup = value;
           });
           setViewSate("managePermissions");
+          // hide dropdown
+          vm.groupsDropdownOpen = false;
         }
 
         function assignGroupPermissions(group) {
diff --git a/src/Umbraco.Web.UI.Client/src/views/content/rights.html b/src/Umbraco.Web.UI.Client/src/views/content/rights.html
index afa932e606..35f3d34260 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/rights.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/rights.html
@@ -27,20 +27,24 @@
                     <p class="abstract" style="margin-bottom: 20px;"><localize key="defaultdialogs_permissionsHelp"></localize></p>
 
                     <div style="position: relative; display: inline-block; margin-bottom: 20px;">
+
+                        <umb-button
+                            type="button"
+                            button-style="info"
+                            label-key="defaultdialogs_permissionsSet" 
+                            action="vm.groupsDropdownOpen = !vm.groupsDropdownOpen"
+                            add-ellipsis="true">
+                        </umb-button>
                         
-                        <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#">
-                            <localize key="defaultdialogs_permissionsSet">Set permissions for</localize>...
-                            <span class="caret" style="margin-left: 10px;"></span>
-                        </a>
-                    
-                        <ul class="dropdown-menu">
-                            <li ng-repeat="group in vm.availableUserGroups | filter:{selected: '!true'}">
+                        <umb-dropdown ng-if="vm.groupsDropdownOpen" on-close="vm.groupsDropdownOpen = false">
+                            <umb-dropdown-item ng-repeat="group in vm.availableUserGroups | filter:{selected: '!true'}">
                                 <a href="" ng-click="vm.editPermissions(group)" prevent-default>
                                     <i class="{{group.icon}}"></i>
                                     {{group.name}}
                                 </a>
-                            </li>
-                        </ul>
+                            </umb-dropdown-item>
+                        </umb-dropdown>
+
                     </div>
 
                     <div umb-set-dirty-on-change="{{vm.selectedUserGroups}}">