Log fixes (#534)
* tying up some loose ends with event logging * Ensuring creators can access
This commit is contained in:
2
lemur/static/app/angular/logs/services.js
vendored
2
lemur/static/app/angular/logs/services.js
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
angular.module('lemur')
|
||||
.service('LogApi', function (LemurRestangular) {
|
||||
return LemurRestangular.all('domains');
|
||||
return LemurRestangular.all('logs');
|
||||
})
|
||||
.service('LogService', function () {
|
||||
var LogService = this;
|
||||
|
8
lemur/static/app/angular/logs/view/view.js
vendored
8
lemur/static/app/angular/logs/view/view.js
vendored
@ -6,11 +6,11 @@ angular.module('lemur')
|
||||
$stateProvider.state('logs', {
|
||||
url: '/logs',
|
||||
templateUrl: '/angular/logs/view/view.tpl.html',
|
||||
controller: 'DomainsViewController'
|
||||
controller: 'LogsViewController'
|
||||
});
|
||||
})
|
||||
|
||||
.controller('DomainsViewController', function ($scope, $uibModal, DomainApi, DomainService, ngTableParams) {
|
||||
.controller('LogsViewController', function ($scope, $uibModal, LogApi, LogService, ngTableParams, MomentService) {
|
||||
$scope.filter = {};
|
||||
$scope.logsTable = new ngTableParams({
|
||||
page: 1, // show first page
|
||||
@ -22,10 +22,12 @@ angular.module('lemur')
|
||||
}, {
|
||||
total: 0, // length of data
|
||||
getData: function ($defer, params) {
|
||||
DomainApi.getList(params.url()).then(function (data) {
|
||||
LogApi.getList(params.url()).then(function (data) {
|
||||
params.total(data.total);
|
||||
$defer.resolve(data);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
$scope.momentService = MomentService;
|
||||
});
|
||||
|
@ -12,17 +12,22 @@
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
<div class="table-responsive">
|
||||
<table ng-table="domainsTable" class="table table-striped" show-filter="showFilter" template-pagination="angular/pager.html">
|
||||
<table ng-table="logsTable" class="table table-striped" show-filter="showFilter" template-pagination="angular/pager.html">
|
||||
<tbody>
|
||||
<tr ng-repeat="log in $data track by $index">
|
||||
<td data-title="'Logged At'" sortable="'logged_at'" filter="{ 'logged_at': 'text' }">
|
||||
{{ log.logged_at }}
|
||||
<td data-title="'Logged'" sortable="'logged_at'" filter="{ 'logged_at': 'text' }">
|
||||
<span class="pull-right" uib-tooltip="{{ log.loggedAt }}">
|
||||
{{ momentService.createMoment(log.loggedAt) }}
|
||||
</span>
|
||||
</td>
|
||||
<td data-title="'Certificate'" sortable="'certificate'" filter="{ 'certificate.name': 'text' }">
|
||||
{{ log.certificate.name }}
|
||||
</td>
|
||||
<td data-title="'User'" sortable="'user'" filter="{ 'user.email': 'text' }">
|
||||
{{ log.user.email }}
|
||||
</td>
|
||||
<td data-title="'Type'" sortable="'type'" filter="{ 'type': 'text' }">
|
||||
{{ log.type }}
|
||||
{{ log.logType }}
|
||||
</td>
|
||||
</tbody>
|
||||
</table>
|
||||
|
@ -62,7 +62,7 @@
|
||||
<li><a ui-sref="roles">Roles</a></li>
|
||||
<li><a ui-sref="users">Users</a></li>
|
||||
<li><a ui-sref="domains">Domains</a></li>
|
||||
<li><a ui-sref="log">Log</a></li>
|
||||
<li><a ui-sref="logs">Logs</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
Reference in New Issue
Block a user