#345 Fix user dialog's title

TheHive-Project · Nov 21, 2017 · 59ad377 · 59ad377
1 parent 8bb3570
commit 59ad377
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/ui/app/scripts/controllers/admin/AdminUserDialogCtrl.js b/ui/app/scripts/controllers/admin/AdminUserDialogCtrl.js
@@ -1,11 +1,11 @@
 (function() {
     'use strict';
 
-    angular.module('theHiveControllers').controller('AdminUserDialogCtrl', function($scope, $uibModalInstance, UserSrv, NotificationSrv, user) {
+    angular.module('theHiveControllers').controller('AdminUserDialogCtrl', function($scope, $uibModalInstance, UserSrv, NotificationSrv, user, isEdit) {
         var self = this;
 
         self.user = user;
-        self.isEdit = user.id;
+        self.isEdit = isEdit;
 
         var formData = _.defaults(_.pick(self.user, 'id', 'name', 'roles'), {
             id: null,

diff --git a/ui/app/scripts/controllers/admin/AdminUsersCtrl.js b/ui/app/scripts/controllers/admin/AdminUsersCtrl.js
@@ -113,7 +113,8 @@
                     controllerAs: '$vm',
                     size: 'lg',
                     resolve: {
-                        user: angular.copy(user) || {}
+                        user: angular.copy(user) || {},
+                        isEdit: !!user
                     }
                 });
 

diff --git a/ui/app/views/partials/admin/user-dialog.html b/ui/app/views/partials/admin/user-dialog.html
@@ -1,6 +1,6 @@
 <form class="form-horizontal" name="userForm" ng-submit="$vm.saveUser(userForm)" novalidate>
     <div class="modal-header bg-primary">
-        <h3 class="modal-title">{{$vm.formData.id ? 'Update' : 'Add'}} user</h3>
+        <h3 class="modal-title">{{$vm.isEdit ? 'Update' : 'Add'}} user</h3>
     </div>
     <div class="modal-body">
         <div class="form-group" ng-class="{ 'has-error' : userForm.id.$invalid && !userForm.id.$pristine }">
@@ -39,7 +39,7 @@ <h3 class="modal-title">{{$vm.formData.id ? 'Update' : 'Add'}} user</h3>
             </label>
             <div class="col-sm-9">
                 <div class="btn-group" uib-dropdown>
-                    <button class="btn btn-sm dropdown-toggle" uib-dropdown-toggle type="button">
+                    <button class="btn btn-default btn-sm dropdown-toggle" uib-dropdown-toggle type="button">
                         {{$vm.formData.roles.join(', ') || 'none'}}&nbsp;&nbsp;
                         <span class="caret"></span>
                     </button>

diff --git a/ui/app/views/partials/admin/users.html b/ui/app/views/partials/admin/users.html
@@ -4,7 +4,7 @@ <h3 class="box-title">User management</h3>
     </div>
     <div class="box-body">
 
-        <button class="btn btn-sm btn-primary" type="button" ng-click="showUserDialog({})">Add user</button>
+        <button class="btn btn-sm btn-primary" type="button" ng-click="showUserDialog()">Add user</button>
 
         <div class="row mt-xs">
             <div class="col-md-12">