From 1b4d7c37331027e71e9cf52ffc8f45a062949cfd Mon Sep 17 00:00:00 2001
From: AndyButland <abutland73@gmail.com>
Date: Sat, 7 May 2016 23:52:47 +0200
Subject: [PATCH] Migrated user permissions tree to new format; updated icon to
 indicate single user being acted on

---
 src/Umbraco.Core/Constants-Applications.cs    |  5 ++
 src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml |  1 +
 src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml |  1 +
 src/Umbraco.Web.UI/config/trees.config        |  2 +-
 src/Umbraco.Web.UI/umbraco/config/lang/da.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/de.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/en.xml |  1 +
 .../umbraco/config/lang/en_us.xml             |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/es.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/fr.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/he.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/it.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/ja.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/ko.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/nl.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/pl.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/pt.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/ru.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/sv.xml |  1 +
 src/Umbraco.Web.UI/umbraco/config/lang/zh.xml |  1 +
 .../Trees/UserPermissionsTreeController.cs    | 53 +++++++++++++++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 22 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 src/Umbraco.Web/Trees/UserPermissionsTreeController.cs

diff --git a/src/Umbraco.Core/Constants-Applications.cs b/src/Umbraco.Core/Constants-Applications.cs
index 2feae59bad..39ab8ea37f 100644
--- a/src/Umbraco.Core/Constants-Applications.cs
+++ b/src/Umbraco.Core/Constants-Applications.cs
@@ -114,6 +114,11 @@
             /// </summary>
             public const string UserTypes = "userTypes";
 
+            /// <summary>
+            /// alias for the user permissions tree.
+            /// </summary>
+            public const string UserPermissions = "userPermissions";
+
             /// <summary>
             /// alias for the users tree.
             /// </summary>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
index 20e252c431..ddb7263681 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
@@ -963,6 +963,7 @@
     <key alias="stylesheets">Stylopisy</key>
     <key alias="templates">Šablony</key>
     <key alias="xslt">XSLT soubory</key>
+    <key alias="userPermissions">Oprávnění Uživatele</key>
     <key alias="userTypes">Typy Uživatelů</key>
     <key alias="users">Uživatelé</key>
   </area>
diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
index 12031dc0e0..fe8ad9d4ca 100644
--- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
+++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
@@ -928,6 +928,7 @@ Vennlig hilsen Umbraco roboten
     <key alias="templates">Maler</key>
     <key alias="xslt">XSLT Filer</key>
     <key alias="analytics">Analytics</key>
+    <key alias="userPermissions">Brukertillatelser</key>
     <key alias="userTypes">Brukertyper typer</key>
     <key alias="users">Brukere</key>
   </area>
diff --git a/src/Umbraco.Web.UI/config/trees.config b/src/Umbraco.Web.UI/config/trees.config
index e2e1e7dc10..c0a9155d75 100644
--- a/src/Umbraco.Web.UI/config/trees.config
+++ b/src/Umbraco.Web.UI/config/trees.config
@@ -25,7 +25,7 @@
   <!--Users-->
   <add application="users" alias="users" title="Users" type="Umbraco.Web.Trees.UsersTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
   <add application="users" alias="userTypes" title="User Types" type="Umbraco.Web.Trees.UserTypesTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
-  <add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
+  <add application="users" alias="userPermissions" title="User Permissions" type="Umbraco.Web.Trees.UserPermissionsTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
   <!--Members-->
   <add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" />
   <add initialize="true" sortOrder="1" alias="memberTypes" application="member" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" />
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
index df4318ec2a..4de625c299 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml
@@ -998,6 +998,7 @@ Mange hilsner fra Umbraco robotten
     <key alias="templates">Skabeloner</key>
     <key alias="xslt">XSLT-filer</key>
     <key alias="analytics">Analytics</key>
+    <key alias="userPermissions">Brugertilladelser</key>
     <key alias="userTypes">Bruger Typer</key>
     <key alias="users">Brugere</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
index 4bb906f983..3f3c3dcfc5 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml
@@ -946,6 +946,7 @@ Ihr freundlicher Umbraco-Robot
     <key alias="templates">Vorlagen</key>
     <key alias="xslt">XSLT-Dateien</key>
     <key alias="analytics">Auswertungen</key>
+    <key alias="userPermissions">Berechtigungen</key>
     <key alias="userTypes">Benutzertypen</key>
     <key alias="users">Benutzer</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
index 1360c09667..e8ef07bf01 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml
@@ -1202,6 +1202,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="templates">Templates</key>
     <key alias="xslt">XSLT Files</key>
     <key alias="analytics">Analytics</key>
+    <key alias="userPermissions">User Permissions</key>
     <key alias="userTypes">User Types</key>
     <key alias="users">Users</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
index 700c252cde..ba5298af7b 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
@@ -1207,6 +1207,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="templates">Templates</key>
     <key alias="xslt">XSLT Files</key>
     <key alias="analytics">Analytics</key>
+    <key alias="userPermissions">User Permissions</key>
     <key alias="userTypes">User Types</key>
     <key alias="users">Users</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
index 097c028d2b..257411cae4 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml
@@ -850,6 +850,7 @@
     <key alias="stylesheets">Hojas de estilo</key>
     <key alias="templates">Plantillas</key>
     <key alias="xslt">Archivos XSLT</key>
+    <key alias="userPermissions">Permisos de Usuarios</key>
     <key alias="userTypes">Tipos de Usuarios</key>
     <key alias="users">Usuarios</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
index 853f1b11f1..a8b48492a1 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
@@ -984,6 +984,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="stylesheets">Feuilles de style</key>
     <key alias="templates">Modèles</key>
     <key alias="xslt">Fichiers XSLT</key>
+    <key alias="userPermissions">Permissions utilisateur</key>
     <key alias="userTypes">Types d'utilisateurs</key>
     <key alias="users">Utilisateurs</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
index e42c382b20..75c5dc5e85 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml
@@ -869,6 +869,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="stylesheets">גיליונות סגנון</key>
     <key alias="templates">תבניות</key>
     <key alias="xslt">קבצי XSLT</key>
+    <key alias="userPermissions">הרשאות משתמש</key>
     <key alias="userTypes">משתמש מקליד</key>
     <key alias="users">משתמש</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
index 039d727044..a25e49b4a0 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml
@@ -842,6 +842,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
     <key alias="stylesheets">Fogli di stile</key>
     <key alias="templates">Templates</key>
     <key alias="xslt">Files XSLT</key>
+    <key alias="userPermissions">Permessi Utente</key>
     <key alias="userTypes">Tipi di Utente</key>
     <key alias="users">Utenti</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
index bbe3152464..de47edefff 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
@@ -1173,6 +1173,7 @@ Runwayをインストールして作られた新しいウェブサイトがど
     <key alias="templates">テンプレート</key>
     <key alias="xslt">XSLT ファイル</key>
     <key alias="analytics">アナリティクス</key>
+    <key alias="userPermissions">ユーザーの権限</key>
     <key alias="userTypes">ユーザータイプ</key>
     <key alias="users">ユーザー</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
index 8435cb9c48..ac25c123a7 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
@@ -846,6 +846,7 @@
     <key alias="stylesheets">스타일시트</key>
     <key alias="templates">템플릿</key>
     <key alias="xslt">XSLT 파일</key>
+    <key alias="userPermissions">사용자권한</key>
     <key alias="userTypes">사용자 유형</key>
     <key alias="users">사용자</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
index d69d5954dd..fab92f2e61 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
@@ -951,6 +951,7 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op de
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Sjablonen</key>
     <key alias="xslt">XSLT Bestanden</key>
+    <key alias="userPermissions">Gebruikersrechten</key>
     <key alias="userTypes">Gebruiker Types</key>
     <key alias="users">Gebruikers</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
index dbdefcb6c2..45f0159fdf 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
@@ -742,6 +742,7 @@ Miłego dnia!]]></key>
     <key alias="stylesheets">Arkusze stylów</key>
     <key alias="templates">Szablony</key>
     <key alias="xslt">Pliki XSLT</key>
+    <key alias="userPermissions">Prawa dostępu użytkownika</key>
     <key alias="userTypes">Typy Użytkowników</key>
     <key alias="users">Użytkowników</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
index 86887b00df..0b3ae99e12 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
@@ -830,6 +830,7 @@ Para fechar a tarefa de tradução vá até os detalhes e clique no botão "Fech
     <key alias="stylesheets">Stylesheets</key>
     <key alias="templates">Modelos</key>
     <key alias="xslt">Arquivos XSLT</key>
+    <key alias="userPermissions">Permissões de usuário</key>
     <key alias="userTypes">Tipos de Usuários</key>
     <key alias="users">Usuários</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
index 09edfdeb6a..3e9aafb954 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
@@ -1162,6 +1162,7 @@
     <key alias="stylesheets">Стили CSS</key>
     <key alias="templates">Шаблоны</key>
     <key alias="xslt">Файлы XSLT</key>
+    <key alias="userPermissions">Разрешения для пользователя</key>
     <key alias="userTypes">Типы пользователей</key>
     <key alias="users">пользователи</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
index ae7e8a479e..4d9c111fd1 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
@@ -851,6 +851,7 @@
     <key alias="stylesheets">Stilmallar</key>
     <key alias="templates">Sidmallar</key>
     <key alias="xslt">XSLT-filer</key>
+    <key alias="userPermissions">Användarrättigheter</key>
     <key alias="userTypes">Användartyper</key>
     <key alias="users">Användare</key>
   </area>
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
index 4e25e92ef2..9239eeabee 100644
--- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
+++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
@@ -920,6 +920,7 @@
     <key alias="stylesheets">样式表</key>
     <key alias="templates">模板</key>
     <key alias="xslt">XSLT文件</key>
+    <key alias="userPermissions">用户权限</key>
     <key alias="userTypes">用户类型</key>
     <key alias="users">Users</key>
   </area>
diff --git a/src/Umbraco.Web/Trees/UserPermissionsTreeController.cs b/src/Umbraco.Web/Trees/UserPermissionsTreeController.cs
new file mode 100644
index 0000000000..3ed2b2b9d1
--- /dev/null
+++ b/src/Umbraco.Web/Trees/UserPermissionsTreeController.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Linq;
+using System.Net.Http.Formatting;
+using Umbraco.Core;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.Trees;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi.Filters;
+using Umbraco.Web._Legacy.Actions;
+using Constants = Umbraco.Core.Constants;
+
+namespace Umbraco.Web.Trees
+{
+    [UmbracoTreeAuthorize(Constants.Trees.UserPermissions)]
+    [Tree(Constants.Applications.Users, Constants.Trees.UserPermissions, null, sortOrder: 2)]
+    [PluginController("UmbracoTrees")]
+    [CoreTree]
+    public class UserPermissionsTreeController : TreeController
+    {
+        protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
+        {
+            var nodes = new TreeNodeCollection();
+            int totalUsers;
+            nodes.AddRange(
+                Services.UserService.GetAll(0, int.MaxValue, out totalUsers)
+                    .Where(x => x.Id > 0 && x.IsApproved)
+                    .Select(x => CreateTreeNode(x.Id.ToString(), 
+                        id, 
+                        queryStrings, 
+                        x.Name, 
+                        "icon-user", 
+                        false,
+                        "/" + queryStrings.GetValue<string>("application") + "/framed/"
+                        + Uri.EscapeDataString("users/PermissionEditor.aspx?id=" + x.Id))));
+
+            return nodes;
+        }
+
+        protected override MenuItemCollection GetMenuForNode(string id, FormDataCollection queryStrings)
+        {
+            var menu = new MenuItemCollection();
+
+            if (id == Constants.System.Root.ToInvariantString())
+            {
+                // root actions              
+                menu.Items.Add<RefreshNode, ActionRefresh>(Services.TextService.Localize("actions", ActionRefresh.Instance.Alias), true);
+                return menu;
+            }
+
+            return menu;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index bd8a6b102d..e1da74100c 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -340,6 +340,7 @@
     <Compile Include="Trees\ScriptsTreeController.cs" />
     <Compile Include="Trees\DictionaryTreeController.cs" />
     <Compile Include="Trees\StylesheetsTreeController.cs" />
+    <Compile Include="Trees\UserPermissionsTreeController.cs" />
     <Compile Include="Trees\UserTypesTreeController.cs" />
     <Compile Include="Trees\XsltTreeController.cs" />
     <Compile Include="Trees\UsersTreeController.cs" />