You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/06/06 18:07:16 UTC
[2/4] incubator-trafficcontrol git commit: fixes ability to edit
current user
fixes ability to edit current user
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/95a6457d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/95a6457d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/95a6457d
Branch: refs/heads/master
Commit: 95a6457dad27ff39a700876e585a37d565f1d08b
Parents: 0137fbf
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Fri Jun 2 16:39:47 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue Jun 6 12:07:01 2017 -0600
----------------------------------------------------------------------
.../ui/app/src/common/api/UserService.js | 28 +++++++-------------
.../src/modules/private/user/UserController.js | 18 ++++++++++---
.../private/user/edit/UserEditController.js | 2 +-
3 files changed, 25 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/95a6457d/traffic_ops/experimental/ui/app/src/common/api/UserService.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/common/api/UserService.js b/traffic_ops/experimental/ui/app/src/common/api/UserService.js
index 0995d62..40e0fa3 100644
--- a/traffic_ops/experimental/ui/app/src/common/api/UserService.js
+++ b/traffic_ops/experimental/ui/app/src/common/api/UserService.js
@@ -17,7 +17,7 @@
* under the License.
*/
-var UserService = function(Restangular, $http, $location, $q, authService, locationUtils, userModel, messageModel, ENV) {
+var UserService = function(Restangular, $http, $location, $q, authService, httpService, locationUtils, userModel, messageModel, ENV) {
var service = this;
@@ -49,20 +49,6 @@ var UserService = function(Restangular, $http, $location, $q, authService, locat
}
};
-
- this.updateCurrentUser = function(user) {
- return user.put()
- .then(
- function() {
- userModel.setUser(user);
- messageModel.setMessages([ { level: 'success', text: 'User updated' } ], false);
- },
- function() {
- messageModel.setMessages([ { level: 'error', text: 'User updated failed' } ], false);
- }
- );
- };
-
this.getUsers = function(queryParams) {
return Restangular.all('users').getList(queryParams);
};
@@ -85,13 +71,17 @@ var UserService = function(Restangular, $http, $location, $q, authService, locat
};
this.updateUser = function(user) {
- return user.put()
+ return $http.put(ENV.api['root'] + "users/" + user.id, user)
.then(
function() {
+ if (userModel.user.id == user.id) {
+ // if you are updating the currently logged in user...
+ userModel.setUser(user);
+ }
messageModel.setMessages([ { level: 'success', text: 'User updated' } ], false);
},
- function(fault) {
- messageModel.setMessages(fault.data.alerts, false);
+ function() {
+ messageModel.setMessages([ { level: 'error', text: 'User updated failed' } ], false);
}
);
};
@@ -110,5 +100,5 @@ var UserService = function(Restangular, $http, $location, $q, authService, locat
};
-UserService.$inject = ['Restangular', '$http', '$location', '$q', 'authService', 'locationUtils', 'userModel', 'messageModel', 'ENV'];
+UserService.$inject = ['Restangular', '$http', '$location', '$q', 'authService', 'httpService', 'locationUtils', 'userModel', 'messageModel', 'ENV'];
module.exports = UserService;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/95a6457d/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js b/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js
index bb68bd1..01439f9 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/user/UserController.js
@@ -17,10 +17,10 @@
* under the License.
*/
-var UserController = function($scope, $state, $uibModal, formUtils, locationUtils, userService, authService, roleService, userModel) {
+var UserController = function($scope, $state, $location, $uibModal, formUtils, locationUtils, userService, authService, roleService, tenantService, userModel) {
var updateUser = function(user, options) {
- userService.updateCurrentUser(user)
+ userService.updateUser(user)
.then(function() {
if (options.signout) {
authService.logout();
@@ -35,6 +35,13 @@ var UserController = function($scope, $state, $uibModal, formUtils, locationUtil
});
};
+ var getTenants = function() {
+ tenantService.getTenants()
+ .then(function(result) {
+ $scope.tenants = result;
+ });
+ };
+
$scope.userName = angular.copy(userModel.user.username);
$scope.user = userModel.user;
@@ -65,6 +72,10 @@ var UserController = function($scope, $state, $uibModal, formUtils, locationUtil
}
};
+ $scope.viewDeliveryServices = function() {
+ $location.path('/admin/users/' + $scope.user.id + '/delivery-services');
+ };
+
$scope.navigateToPath = locationUtils.navigateToPath;
$scope.hasError = formUtils.hasError;
@@ -73,10 +84,11 @@ var UserController = function($scope, $state, $uibModal, formUtils, locationUtil
var init = function () {
getRoles();
+ getTenants();
};
init();
};
-UserController.$inject = ['$scope', '$state', '$uibModal', 'formUtils', 'locationUtils', 'userService', 'authService', 'roleService', 'userModel'];
+UserController.$inject = ['$scope', '$state', '$location', '$uibModal', 'formUtils', 'locationUtils', 'userService', 'authService', 'roleService', 'tenantService', 'userModel'];
module.exports = UserController;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/95a6457d/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js b/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js
index 1f85508..b52613e 100644
--- a/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js
+++ b/traffic_ops/experimental/ui/app/src/modules/private/user/edit/UserEditController.js
@@ -20,7 +20,7 @@
var UserEditController = function($scope) {
$scope.settings = {
- isNew: true,
+ isNew: false,
saveLabel: 'Update'
};