TheHive-Project#890 Fix UiSettingsSrv service injection

posey4545 · Feb 22, 2019 · aab6ec2 · aab6ec2
1 parent b8fd37a
commit aab6ec2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/ui/app/scripts/controllers/RootCtrl.js b/ui/app/scripts/controllers/RootCtrl.js
@@ -180,9 +180,9 @@ angular.module('theHiveControllers').controller('RootCtrl',
                     templates: function(){
                         return $scope.templates;
                     },
-                    uiSettings: function(UiSettingsSrv) {
+                    uiSettings: ['UiSettingsSrv', function(UiSettingsSrv) {
                         return UiSettingsSrv.all();
-                    }
+                    }]
                 }
             });
 

diff --git a/ui/app/scripts/controllers/alert/AlertEventCtrl.js b/ui/app/scripts/controllers/alert/AlertEventCtrl.js
@@ -1,7 +1,7 @@
 (function() {
     'use strict';
     angular.module('theHiveControllers')
-        .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, clipboard, event, templates) {
+        .controller('AlertEventCtrl', function($scope, $rootScope, $state, $uibModal, $uibModalInstance, CustomFieldsCacheSrv, CaseResolutionStatus, AlertingSrv, NotificationSrv, UiSettingsSrv, clipboard, event, templates) {
             var self = this;
             var eventId = event.id;
 
@@ -25,6 +25,8 @@
             self.similarCasesStats = [];
             self.customFieldsCache = CustomFieldsCacheSrv;
 
+            self.hideEmptyCaseButton = UiSettingsSrv.hideEmptyCaseButton();
+
             var getTemplateCustomFields = function(customFields) {
                 var result = [];
 

diff --git a/ui/app/scripts/controllers/alert/AlertListCtrl.js b/ui/app/scripts/controllers/alert/AlertListCtrl.js
@@ -328,10 +328,10 @@
                           resolve: {
                               templates: function(){
                                   return templates;
-                              },                              
-                              uiSettings: function(UiSettingsSrv) {
+                              },
+                              uiSettings: ['UiSettingsSrv', function(UiSettingsSrv) {
                                   return UiSettingsSrv.all();
-                              }
+                              }]
                           }
                       });
 

diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html
@@ -166,7 +166,7 @@ <h4 class="vpad10 text-primary">
             <label class="col-sm-4 control-label">Import alert as</label>
             <div class="col-sm-8 input-group">
                 <select class="form-control" ng-model="dialog.event.caseTemplate" ng-options="template for template in dialog.templates">
-                    <option value="">Empty case</option>
+                    <option value="" ng-if="dialog.templates.length === 0 || !!!dialog.hideEmptyCaseButton">Empty case</option>
                 </select>
                 <span class="input-group-btn">
                     <button class="btn btn-primary" type="submit" ng-disabled="dialog.loading">Yes, Import</button>