diff --git a/rd_ui/app/scripts/controllers/admin_controllers.js b/rd_ui/app/scripts/controllers/admin_controllers.js index dd8c11cea9c..ec7cead6690 100644 --- a/rd_ui/app/scripts/controllers/admin_controllers.js +++ b/rd_ui/app/scripts/controllers/admin_controllers.js @@ -1,4 +1,11 @@ (function() { + var dateFormatter = function(date) { + value = moment(date); + if (!value) return "-"; + return value.format("DD/MM/YY HH:mm"); + } + + var AdminStatusCtrl = function($scope, Events, $http, $timeout) { Events.record(currentUser, "view", "page", "admin/status"); $scope.$parent.pageTitle = "System Status"; @@ -118,10 +125,37 @@ // tables $scope.groups = groups; + + user.queries().$promise.then(function(result){ + $scope.queries = result; + }); + + user.dashboards().$promise.then(function(result){ + $scope.dashboards = result; + }) + }) } } + $scope.queryColumns = [ + {label: "Name", map: "name"}, + {label: "Created At", map: "created_at", formatFunction: dateFormatter}, + {label: "Actions", cellTemplateUrl: "/views/admin_user_form_query_actions_cell.html"} + ]; + $scope.dashboardColumns = [ + {label: "Name", map: "name"}, + {label: "Created At", map: "created_at", formatFunction: dateFormatter}, + {label: "Actions", cellTemplateUrl: "/views/admin_user_form_dashboard_actions_cell.html"} + ]; + + $scope.tableConfig = { + isPaginationEnabled: true, + itemsByPage: 50, + maxSize: 8, + isGlobalSearchActivated: false + } + var groups = new Groups(); groups.get().$promise.then(function(result) { @@ -225,12 +259,6 @@ admin_users: false }; - var dateFormatter = function(date) { - value = moment(date); - if (!value) return "-"; - return value.format("DD/MM/YY HH:mm"); - } - var permissionsFormatter = function(permissions) { value = permissions.join(', '); if (!value) return "-"; @@ -514,12 +542,6 @@ $location.path("/"); } - var dateFormatter = function(date) { - value = moment(date); - if (!value) return "-"; - return value.format("DD/MM/YY HH:mm"); - } - var permissionsFormatter = function(permissions) { value = permissions.join(', '); if (!value) return "-"; diff --git a/rd_ui/app/scripts/services/resources.js b/rd_ui/app/scripts/services/resources.js index 1dc9fba25d3..9e355209d8a 100644 --- a/rd_ui/app/scripts/services/resources.js +++ b/rd_ui/app/scripts/services/resources.js @@ -449,6 +449,12 @@ User.new = function (data) { return new User(data); }; + User.prototype.queries = function(){ + return $resource('/api/users/:id/queries', {id: '@id'}).query({id: this.id}); + } + User.prototype.dashboards = function(){ + return $resource('/api/users/:id/dashboards', {id: '@id'}).query({id: this.id}); + } return User; } @@ -481,7 +487,7 @@ .factory('Group', ['$resource', Group]) .factory('Users', ['$resource', Users]) .factory('User', ['$resource', User]) - .factory('Widget', ['$resource', 'Query', Widget]) + .factory('Widget', ['$resource', 'Query', Widget]) .factory('Table', ['$resource', Table]); })(); diff --git a/rd_ui/app/views/admin_user_form.html b/rd_ui/app/views/admin_user_form.html index 093b7fbb470..2771e772775 100644 --- a/rd_ui/app/views/admin_user_form.html +++ b/rd_ui/app/views/admin_user_form.html @@ -2,7 +2,7 @@