[trafficcontrol] branch master updated: sorts roles by privlevel in descending fashion. issue#3519 (#3563)

[dgelinas]

This is an automated email from the ASF dual-hosted git repository.

dgelinas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new de432a2  sorts roles by privlevel in descending fashion. issue#3519 
(#3563)
de432a2 is described below

commit de432a259283e55122ba0b614abbb57625bb5eb4
Author: Jeremy Mitchell <mitchell...@users.noreply.github.com>
AuthorDate: Fri May 10 08:51:00 2019 -0600

    sorts roles by privlevel in descending fashion. issue#3519 (#3563)
---
 traffic_portal/app/src/common/modules/form/user/FormUserController.js | 4 ++--
 .../common/modules/form/user/register/FormRegisterUserController.js   | 4 ++--
 traffic_portal/app/src/modules/private/user/UserController.js         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/traffic_portal/app/src/common/modules/form/user/FormUserController.js 
b/traffic_portal/app/src/common/modules/form/user/FormUserController.js
index a1ebf62..61ccd55 100644
--- a/traffic_portal/app/src/common/modules/form/user/FormUserController.js
+++ b/traffic_portal/app/src/common/modules/form/user/FormUserController.js
@@ -20,9 +20,9 @@
 var FormUserController = function(user, $scope, $location, formUtils, 
stringUtils, locationUtils, tenantUtils, roleService, tenantService, userModel) 
{
 
     var getRoles = function() {
-        roleService.getRoles({ orderby: 'priv_level DESC' })
+        roleService.getRoles()
             .then(function(result) {
-                $scope.roles = result;
+                $scope.roles = _.sortBy(result, 'privLevel').reverse();
             });
     };
 
diff --git 
a/traffic_portal/app/src/common/modules/form/user/register/FormRegisterUserController.js
 
b/traffic_portal/app/src/common/modules/form/user/register/FormRegisterUserController.js
index ebe799e..195b156 100644
--- 
a/traffic_portal/app/src/common/modules/form/user/register/FormRegisterUserController.js
+++ 
b/traffic_portal/app/src/common/modules/form/user/register/FormRegisterUserController.js
@@ -20,9 +20,9 @@
 var FormRegisterUserController = function($scope, $location, formUtils, 
tenantUtils, locationUtils, roleService, tenantService, userService, userModel) 
{
 
        var getRoles = function() {
-               roleService.getRoles({ orderby: 'priv_level DESC' })
+               roleService.getRoles()
                        .then(function(result) {
-                               $scope.roles = result;
+                               $scope.roles = _.sortBy(result, 
'privLevel').reverse();
                        });
        };
 
diff --git a/traffic_portal/app/src/modules/private/user/UserController.js 
b/traffic_portal/app/src/modules/private/user/UserController.js
index ad49320..e6e4caf 100644
--- a/traffic_portal/app/src/modules/private/user/UserController.js
+++ b/traffic_portal/app/src/modules/private/user/UserController.js
@@ -29,9 +29,9 @@ var UserController = function($scope, $state, $location, 
$uibModal, formUtils, l
     };
 
     var getRoles = function() {
-        roleService.getRoles({ orderby: 'priv_level DESC' })
+        roleService.getRoles()
             .then(function(result) {
-                $scope.roles = result;
+                $scope.roles = _.sortBy(result, 'privLevel').reverse();
             });
     };