#1470 Fix the merge into case button, in the alert similar cases panel

TheHive-Project · Sep 28, 2020 · 7b56046 · 7b56046
1 parent a076dcf
commit 7b56046
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/frontend/app/scripts/components/alert/AlertSimilarCaseListCmp.js b/frontend/app/scripts/components/alert/AlertSimilarCaseListCmp.js
@@ -49,12 +49,20 @@
                     });
                 };
 
+                self.merge = function(caseId) {
+                    this.onMergeIntoCase({
+                        caseId: caseId
+                    });
+                };
+
+
             },
             controllerAs: '$cmp',
             templateUrl: 'views/components/alert/similar-case-list.component.html',
             bindings: {
                 alertId: '<',
-                onListLoad: '&'
+                onListLoad: '&',
+                onMergeIntoCase: '&'
             }
         });
 })();
diff --git a/frontend/app/views/components/alert/similar-case-list.component.html b/frontend/app/views/components/alert/similar-case-list.component.html
@@ -78,7 +78,7 @@
                     </div>
 
                     <div class="case-similarity-merge text-center">
-                        <button class="btn btn-sm btn-primary" ng-click="$cmp.mergeIntoCase(item.case._id)">Merge in this case</button>
+                        <button class="btn btn-sm btn-primary" ng-click="$cmp.merge(item.case._id)">Merge in this case</button>
                     </div>
                 </div>
             </div>

diff --git a/frontend/app/views/partials/alert/event.dialog.html b/frontend/app/views/partials/alert/event.dialog.html
@@ -83,7 +83,9 @@ <h4 class="vpad10 text-primary">
                         </span>
                     </uib-tab-heading>
                     <div>
-                        <alert-similar-case-list alert-id="dialog.event._id" on-list-load="dialog.updateSimilarCasesCount(count)"></alert-similar-case-list>
+                        <alert-similar-case-list alert-id="dialog.event._id"
+                            on-list-load="dialog.updateSimilarCasesCount(count)"
+                            on-merge-into-case="dialog.mergeIntoCase(caseId)"></alert-similar-case-list>
                     </div>
                 </uib-tab>
             </uib-tabset>
-Original file line number
+Diff line change
@@ Expand Up / @@ -78,7 +78,7 @@ @@
                         </div>
                         <div class="case-similarity-merge text-center">
-                            <button class="btn btn-sm btn-primary" ng-click="$cmp.mergeIntoCase(item.case._id)">Merge in this case</button>
+                            <button class="btn btn-sm btn-primary" ng-click="$cmp.merge(item.case._id)">Merge in this case</button>
                         </div>
                     </div>
                 </div>
@@ Expand Down @@