From 73d7915fb5cabc674ea810d20078c54a4f5a9937 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 16 May 2017 13:14:29 +0200
Subject: [PATCH] fixes: U4-9900 Add support for selecting an editor sub view
 trough route params

---
 .../src/views/users/overview.controller.js             | 10 ++++++----
 .../src/views/users/role.controller.js                 |  2 +-
 .../src/views/users/user.controller.js                 |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
index ffee2a6775..e0acfbc30a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/overview.controller.js
@@ -1,9 +1,10 @@
 (function () {
     "use strict";
 
-    function UsersOverviewController($scope) {
+    function UsersOverviewController($scope, $location) {
 
         var vm = this;
+        var usersUri =  $location.search().subview;
 
         vm.page = {};
         vm.page.name = "User Management";
@@ -12,17 +13,18 @@
                 "name": "Users",
                 "icon": "icon-user",
                 "view": "views/users/views/users/users.html",
-                "active": true
+                "active": !usersUri || usersUri === "users"
             },
             {
                 "name": "Roles",
                 "icon": "icon-users",
-                "view": "views/users/views/roles/roles.html"
+                "view": "views/users/views/roles/roles.html",
+                "active": usersUri === "roles"
             }
         ];
 
         function init() {
-            
+
         }
  
         init();
diff --git a/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js
index 3381fd81a1..12cb81e08d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/users/role.controller.js
@@ -28,7 +28,7 @@
         }
 
         function goBack() {
-            $location.path("users/users/overview");
+            $location.path("/users/users/overview").search("subview", "roles");
         }
  
         init();
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 09e74c5455..fd3950bde6 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
@@ -28,7 +28,7 @@
         }
 
         function goBack() {
-            $location.path("users/users/overview");
+            $location.path("/users/users/overview").search("subview", "users");
         }
  
         init();