#1243 Fix the display of user selection component and use user API v1…

… to list users
TheHive-Project · Apr 30, 2020 · 3fbed45 · 3fbed45
1 parent 480fb40
commit 3fbed45
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/frontend/app/scripts/directives/updatableUser.js b/frontend/app/scripts/directives/updatableUser.js
@@ -1,7 +1,7 @@
 (function() {
     'use strict';
     angular.module('theHiveDirectives')
-        .directive('updatableUser', function(UserSrv, UtilsSrv, PSearchSrv) {
+        .directive('updatableUser', function(UserSrv, UtilsSrv, AuthenticationSrv, NotificationSrv) {
             return {
                 restrict: 'E',
                 link: function(scope, element, attrs, ctrl, transclude) {
@@ -17,15 +17,15 @@
                     scope.$watch('updatable.updating', function(value) {
 
                         if(value === true && !cached) {
-                            scope.userList = PSearchSrv(undefined, 'user', {
-                                scope: scope,
-                                baseFilter: {
-                                    'status': 'Ok'
-                                },
-                                loadAll: true,
-                                sort:  '+name',
-                                skipStream: true
-                            });
+                            UserSrv.list(AuthenticationSrv.currentUser.organisation, {_is: { locked: false }})
+                                .then(function(users) {
+                                    scope.userList = users;
+
+                                    console.log(scope.userList);
+                                })
+                                .catch(function(err) {
+                                    NotificationSrv.error('Fetching users', err.data, err.status);
+                                });
                             cached = true;
                         }
                     });

diff --git a/frontend/app/views/directives/updatable-user.html b/frontend/app/views/directives/updatable-user.html
@@ -15,7 +15,7 @@
             <span class="caret"></span>
         </button>
         <ul class="dropdown-menu scroll-dropdown" uib-dropdown-menu>
-            <li ng-repeat="user in userList.allValues">
+            <li ng-repeat="user in userList">
                 <a ng-click="update(user.login)">{{user.organisation}}/{{user.name}}</a>
             </li>
         </ul>

diff --git a/frontend/app/views/partials/case/case.details.html b/frontend/app/views/partials/case/case.details.html
@@ -48,7 +48,7 @@ <h4 class="vpad10 text-primary">Summary</h4>
             </dd>
         </dl>
 
-        <dl class="dl-horizontal clear">
+        <dl class="dl-horizontal">
             <dt class="pull-left">Assignee</dt>
             <dd ng-if="canEdit">
                 <updatable-user on-update="updateField('owner', newValue)" value="caze.owner"/>