From 86cb750ca15f61a95e37dd0ca680c5d2dcf91ec4 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Sun, 25 Jun 2017 21:51:17 +0200
Subject: [PATCH] permissions dialog: filter out selected groups from dropdown

---
 .../content/content.rights.controller.js      |  8 ++++-
 .../src/views/content/rights.html             | 32 +++++++++----------
 2 files changed, 23 insertions(+), 17 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 50e07fa950..2ed2d9662d 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
@@ -146,12 +146,18 @@
                     }
                 });
             });
-
+            
+            // set to selected so we can remove from the dropdown easily
+            group.selected = true;
+            
             vm.selectedUserGroups.push(group);
             setViewSate("manageGroups");
         }
 
         function removePermissions(index) {
+            // remove as selected so we can select it from the dropdown again
+            var group = vm.selectedUserGroups[index];
+            group.selected = false;
             vm.selectedUserGroups.splice(index, 1);
         }
 
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 853efdad3a..b28c6465a2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/rights.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/rights.html
@@ -8,7 +8,22 @@
                 <h5>Ut tempor dui nec consectetur efficitur.</h5>
                 <p class="abstract" style="margin-bottom: 20px;">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam tellus purus, malesuada sed purus ut, semper sollicitudin odio.</p>
 
-                <div style="margin-bottom: 10px;">
+                <div style="position: relative; display: inline-block; margin-bottom: 20px;">
+                    <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#">
+                        Add permissions for...
+                        <span class="caret" style="margin-left: 10px;"></span>
+                    </a>
+                    <ul class="dropdown-menu" style="width: 100%;">
+                        <li 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>
+                </div>
+
+                <div>
                     <umb-user-group-preview
                         ng-repeat="group in vm.selectedUserGroups"
                         icon="group.icon"
@@ -19,21 +34,6 @@
                     </umb-user-group-preview>
                 </div>
 
-                <div style="position: relative; display: inline-block;">
-                    <a class="btn btn-info dropdown-toggle" data-toggle="dropdown" href="#">
-                        Add permissions for...
-                        <span class="caret" style="margin-left: 10px;"></span>
-                    </a>
-                    <ul class="dropdown-menu" style="width: 100%;">
-                        <li ng-repeat="group in vm.availableUserGroups">
-                            <a href="" ng-click="vm.editPermissions(group)" prevent-default>
-                                <i class="{{group.icon}}"></i>
-                                {{group.name}}
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-
             </div>
         </div>