IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Users: revert LDAP admin user page (#19463)

Browse Source
This commit is contained in:
Alexander Zobnin 2019-09-27 13:06:26 +03:00 committed by GitHub
parent 40fbea977e
commit 3520db1c66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/features/admin/partials/users.html
View File

@ -30,27 +30,27 @@
<tbody> <tbody>
<tr ng-repeat="user in ctrl.users"> <tr ng-repeat="user in ctrl.users">
<td class="width-4 text-center link-td"> <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> <img class="filter-table__avatar" ng-src="{{user.avatarUrl}}"></img>
</a> </a>
</td> </td>
<td class="link-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}} {{user.login}}
</a> </a>
</td> </td>
<td class="link-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}} {{user.email}}
</a> </a>
</td> </td>
<td class="link-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}} {{user.lastSeenAtAge}}
</a> </a>
</td> </td>
<td class="link-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> <i class="fa fa-shield" ng-show="user.isAdmin" bs-tooltip="'Grafana Admin'"></i>
</a> </a>
</td> </td>

7
public/app/routes/routes.ts
View File

@ -6,7 +6,6 @@ import CreateFolderCtrl from 'app/features/folders/CreateFolderCtrl';
import FolderDashboardsCtrl from 'app/features/folders/FolderDashboardsCtrl'; import FolderDashboardsCtrl from 'app/features/folders/FolderDashboardsCtrl';
import DashboardImportCtrl from 'app/features/manage-dashboards/DashboardImportCtrl'; import DashboardImportCtrl from 'app/features/manage-dashboards/DashboardImportCtrl';
import LdapPage from 'app/features/admin/ldap/LdapPage'; import LdapPage from 'app/features/admin/ldap/LdapPage';
import LdapUserPage from 'app/features/admin/ldap/LdapUserPage';
import config from 'app/core/config'; import config from 'app/core/config';
import { route, ILocationProvider } from 'angular'; import { route, ILocationProvider } from 'angular';
// Types // Types
@ -284,12 +283,6 @@ export function setupAngularRoutes($routeProvider: route.IRouteProvider, $locati
templateUrl: 'public/app/features/admin/partials/edit_user.html', templateUrl: 'public/app/features/admin/partials/edit_user.html',
controller: 'AdminEditUserCtrl', controller: 'AdminEditUserCtrl',
}) })
.when('/admin/users/ldap/edit/:id', {
template: '<react-container />',
resolve: {
component: () => LdapUserPage,
},
})
.when('/admin/orgs', { .when('/admin/orgs', {
templateUrl: 'public/app/features/admin/partials/orgs.html', templateUrl: 'public/app/features/admin/partials/orgs.html',
controller: 'AdminListOrgsCtrl', controller: 'AdminListOrgsCtrl',