fix(ui):component merge wizzard check that components' ids are not same

sw360 · Apr 11, 2018 · 9187bd5 · 9187bd5
1 parent 3d33403
commit 9187bd5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/frontend/sw360-portlet/src/main/webapp/html/components/mergeComponent.jsp b/frontend/sw360-portlet/src/main/webapp/html/components/mergeComponent.jsp
@@ -131,8 +131,8 @@
 
         function submitChosenComponent($stepElement) {
             var checkedList = $stepElement.find('input:checked');
-            if (checkedList.size() !== 1) {
-                $stepElement.find('.stepFeedback').html('<div class="alert">Please choose exactly one component!</div>');
+            if (checkedList.size() !== 1 || $(checkedList.get(0)).val() ===  $wizardRoot.data('componentTargetId')) {
+                $stepElement.find('.stepFeedback').html('<div class="alert">Please choose exactly one component, which is not the component itself!</div>');
                 $('html, body').stop().animate({ scrollTop: 0 }, 300, 'swing');
                 setTimeout(function() {
                     $stepElement.find('.stepFeedback').html('');