#232 Fix the absolute path used in ng-include

TheHive-Project · Jun 30, 2017 · 44418c8 · 44418c8
1 parent 84bd530
commit 44418c8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html
@@ -102,7 +102,7 @@ <h4 class="vpad10 text-primary">
                     <!-- <div>
                         <pre>{{dialog.event.similarCases | json}}</pre>
                     </div> -->
-                    <div ng-include="'/views/partials/alert/event.similarity.html'"></div>
+                    <div ng-include="'views/partials/alert/event.similarity.html'"></div>
                 </div>
             </div>
         </div>

diff --git a/ui/app/views/partials/case/case.creation.html b/ui/app/views/partials/case/case.creation.html
@@ -91,7 +91,7 @@ <h4 class="vpad10 text-primary">Case details</h4>
         </div>
 
         <h4 class="vpad10 text-primary">Case tasks
-            <span ng-if="fromTemplate">(from [{{template.name | uppercase}}] template)</span>
+            <small ng-if="fromTemplate">(from [{{template.name | uppercase}}] template)</small>
         </h4>
         <div class="row" ng-if="!fromTemplate">
             <div class="col-md-12">
@@ -104,9 +104,7 @@ <h4 class="vpad10 text-primary">Case tasks
             </div>
         </div>
         <div class="row vpad5" ng-if="tasks.length === 0">
-            <div class="col-md-12 text-danger">
-                No tasks have been specified
-            </div>
+            <div class="col-md-12 text-danger">No tasks have been specified</div>
         </div>
         <div class="row vpad5" ng-if="tasks.length !== 0" ng-repeat="t in tasks">
             <div class="col-md-12">
@@ -117,9 +115,15 @@ <h4 class="vpad10 text-primary">Case tasks
             </div>
         </div>
 
-        <h4 class="vpad10 text-primary" ng-if="fromTemplate">Case metrics (from [{{template.name | uppercase}}] template)</h4>
+        <h4 class="vpad10 text-primary" ng-if="fromTemplate">Case metrics <small> (from [{{template.name | uppercase}}] template)</small></h4>
+        <!-- <pre>{{template | json}}</pre> -->
         <div class="row vpad5">
-            <div class="col-md-12"><span class="rm2 label label-default" ng-repeat="m in template.metricNames">{{metricsCache[m].title}}</span></div>
+            <div class="col-md-12" ng-if="template.metricNames.length > 0">
+                <span class="rm2 label label-default" ng-repeat="m in template.metricNames">{{metricsCache[m].title}}</span>
+            </div>
+            <div class="col-md-12 text-danger" ng-if="!template.metricNames || template.metricNames.length === 0">
+                No metrics have been specified
+            </div>
         </div>
 
     </div>