#369 Add support to case template import/export

TheHive-Project · Nov 16, 2017 · c1e514b · c1e514b
1 parent 15a5541
commit c1e514b
Show file tree

Hide file tree

Showing 14 changed files with 315 additions and 213 deletions.
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -235,6 +235,7 @@
     <script src="scripts/services/CaseSrv.js"></script>
     <script src="scripts/services/CaseTabsSrv.js"></script>
     <script src="scripts/services/CaseTaskSrv.js"></script>
+    <script src="scripts/services/CaseTemplate.js"></script>
     <script src="scripts/services/CasesUISrv.js"></script>
     <script src="scripts/services/ChartSrv.js"></script>
     <script src="scripts/services/Constants.js"></script>
@@ -262,7 +263,6 @@
     <script src="scripts/services/StreamStatSrv.js"></script>
     <script src="scripts/services/TagSrv.js"></script>
     <script src="scripts/services/TaskLogSrv.js"></script>
-    <script src="scripts/services/TemplateSrv.js"></script>
     <script src="scripts/services/UserInfoSrv.js"></script>
     <script src="scripts/services/UserSrv.js"></script>
     <script src="scripts/services/UtilsSrv.js"></script>

diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js
@@ -164,7 +164,13 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstra
                 url: '/case-templates',
                 templateUrl: 'views/partials/admin/case-templates.html',
                 controller: 'AdminCaseTemplatesCtrl',
-                title: 'Templates administration'
+                controllerAs: '$vm',
+                title: 'Templates administration',
+                resolve: {
+                    templates: function(CaseTemplateSrv) {
+                        return CaseTemplateSrv.list();
+                    }
+                }
             })
             .state('app.administration.report-templates', {
                 url: '/report-templates',

diff --git a/ui/app/scripts/controllers/RootCtrl.js b/ui/app/scripts/controllers/RootCtrl.js
@@ -2,7 +2,7 @@
  * Controller for main page
  */
 angular.module('theHiveControllers').controller('RootCtrl',
-    function($scope, $rootScope, $uibModal, $location, $state, AuthenticationSrv, AlertingSrv, StreamSrv, StreamStatSrv, TemplateSrv, CustomFieldsCacheSrv, MetricsCacheSrv, NotificationSrv, AppLayoutSrv, currentUser, appConfig) {
+    function($scope, $rootScope, $uibModal, $location, $state, AuthenticationSrv, AlertingSrv, StreamSrv, StreamStatSrv, CaseTemplateSrv, CustomFieldsCacheSrv, MetricsCacheSrv, NotificationSrv, AppLayoutSrv, currentUser, appConfig) {
         'use strict';
 
         if(currentUser === 520) {
@@ -26,7 +26,9 @@ angular.module('theHiveControllers').controller('RootCtrl',
         StreamSrv.init();
         $scope.currentUser = currentUser;
 
-        $scope.templates = TemplateSrv.query();
+        CaseTemplateSrv.list().then(function(templates) {
+            $scope.templates = templates;
+        });
 
         $scope.myCurrentTasks = StreamStatSrv({
             scope: $scope,
@@ -62,8 +64,10 @@ angular.module('theHiveControllers').controller('RootCtrl',
         // Get Alert counts
         $scope.alertEvents = AlertingSrv.stats($scope);
 
-        $scope.$on('templates:refresh', function(){
-            $scope.templates = TemplateSrv.query();
+        $scope.$on('templates:refresh', function(){            
+            CaseTemplateSrv.list().then(function(templates) {
+                $scope.templates = templates;
+            });
         });
 
         $scope.$on('metrics:refresh', function() {