real data for user group

This commit is contained in:
Shannon
2017-06-06 02:05:17 +02:00
parent 5a5bdb6328
commit 9bf61bb487
15 changed files with 219 additions and 155 deletions

View File

@@ -164,42 +164,16 @@
"Failed to save user");
}
function getUserGroup() {
var deferred = $q.defer();
var user = {
"name": "Admin",
"alias": "admin",
"id": 1,
"icon": "icon-medal",
"users": [
{
"id": 1,
"name": "Angela Stone",
"avatar": "https://s3.amazonaws.com/uifaces/faces/twitter/jina/128.jpg",
"state": "active"
},
{
"id": 2,
"name": "Beverly Silva",
"avatar": "",
"state": "disabled"
},
{
"id": 3,
"name": "Ruth Turner",
"avatar": "",
"state": "pending"
},
{
"id": 4,
"name": "Arthur Welch",
"avatar": "https://s3.amazonaws.com/uifaces/faces/twitter/ashleyford/128.jpg",
"state": "active"
}
]
};
deferred.resolve(user);
return deferred.promise;
function getUserGroup(id) {
return umbRequestHelper.resourcePromise(
$http.get(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"GetUserGroup",
{ id: id })),
"Failed to retrieve data for user group " + id);
}
function getUserGroups() {

View File

@@ -1,7 +1,7 @@
(function () {
"use strict";
function UserGroupEditController($scope, $timeout, $location, usersResource) {
function UserGroupEditController($scope, $timeout, $location, usersResource, $routeParams) {
var vm = this;
@@ -22,7 +22,7 @@
vm.loading = true;
// get user
usersResource.getUserGroup().then(function (userGroup) {
usersResource.getUserGroup($routeParams.id).then(function (userGroup) {
vm.userGroup = userGroup;
makeBreadcrumbs();
});