From 3520db1c6656471dd575864e211ce1478f899274 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Fri, 27 Sep 2019 13:06:26 +0300
Subject: [PATCH] Users: revert LDAP admin user page (#19463)

---
 public/app/features/admin/partials/users.html | 10 +++++-----
 public/app/routes/routes.ts                   |  7 -------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index 9122300cc62..21346b92aa7 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -30,27 +30,27 @@
       <tbody>
         <tr ng-repeat="user in ctrl.users">
           <td class="width-4 text-center link-td">
-              <a href="admin/users/{{user.authLabel === 'LDAP' ? 'ldap/' : ''}}edit/{{user.id}}">
+            <a href="admin/users/edit/{{user.id}}">
               <img class="filter-table__avatar" ng-src="{{user.avatarUrl}}"></img>
             </a>
           </td>
           <td class="link-td">
-              <a href="admin/users/{{user.authLabel === 'LDAP' ? 'ldap/' : ''}}edit/{{user.id}}">
+            <a href="admin/users/edit/{{user.id}}">
               {{user.login}}
             </a>
           </td>
           <td class="link-td">
-              <a href="admin/users/{{user.authLabel === 'LDAP' ? 'ldap/' : ''}}edit/{{user.id}}">
+            <a href="admin/users/edit/{{user.id}}">
               {{user.email}}
             </a>
           </td>
           <td class="link-td">
-            <a href="admin/users/{{user.authLabel === 'LDAP' ? 'ldap/' : ''}}edit/{{user.id}}">
+            <a href="admin/users/edit/{{user.id}}">
               {{user.lastSeenAtAge}}
             </a>
           </td>
           <td class="link-td">
-              <a href="admin/users/{{user.authLabel === 'LDAP' ? 'ldap/' : ''}}edit/{{user.id}}">
+            <a href="admin/users/edit/{{user.id}}">
               <i class="fa fa-shield" ng-show="user.isAdmin" bs-tooltip="'Grafana Admin'"></i>
             </a>
           </td>
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index b21243984bc..8d351b1cbb4 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -6,7 +6,6 @@ import CreateFolderCtrl from 'app/features/folders/CreateFolderCtrl';
 import FolderDashboardsCtrl from 'app/features/folders/FolderDashboardsCtrl';
 import DashboardImportCtrl from 'app/features/manage-dashboards/DashboardImportCtrl';
 import LdapPage from 'app/features/admin/ldap/LdapPage';
-import LdapUserPage from 'app/features/admin/ldap/LdapUserPage';
 import config from 'app/core/config';
 import { route, ILocationProvider } from 'angular';
 // Types
@@ -284,12 +283,6 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
       templateUrl: 'public/app/features/admin/partials/edit_user.html',
       controller: 'AdminEditUserCtrl',
     })
-    .when('/admin/users/ldap/edit/:id', {
-      template: '<react-container />',
-      resolve: {
-        component: () => LdapUserPage,
-      },
-    })
     .when('/admin/orgs', {
       templateUrl: 'public/app/features/admin/partials/orgs.html',
       controller: 'AdminListOrgsCtrl',