From cc46accfa2f79cc8e1bab1c40b8e48f50e64a448 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Wed, 8 Apr 2020 15:47:54 -0400
Subject: [PATCH] updated parent of ManageOrganizationsDialog when launching
 from OptionalCasePropertiesPanel

---
 .../OptionalCasePropertiesPanel.java          |  4 +-
 .../ManageOrganizationsDialog.java            | 37 +++++++++++++++++--
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java
index b5706027a3..9b753900b1 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/OptionalCasePropertiesPanel.java
@@ -19,8 +19,10 @@
 package org.sleuthkit.autopsy.casemodule;
 
 import java.awt.Cursor;
+import java.awt.Dialog;
 import java.util.logging.Level;
 import javax.swing.JComboBox;
+import javax.swing.SwingUtilities;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationCase;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CentralRepoException;
@@ -516,7 +518,7 @@ final class OptionalCasePropertiesPanel extends javax.swing.JPanel {
     }//GEN-LAST:event_comboBoxOrgNameActionPerformed
 
     private void bnNewOrganizationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_bnNewOrganizationActionPerformed
-        ManageOrganizationsDialog dialog = new ManageOrganizationsDialog();
+        ManageOrganizationsDialog dialog = new ManageOrganizationsDialog((Dialog) SwingUtilities.getWindowAncestor(this));
         // update the combobox options and org data fields
         loadOrganizationData();
         if (dialog.isChanged()) {
diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java
index dff44aa0c5..85373c06d2 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/optionspanel/ManageOrganizationsDialog.java
@@ -19,6 +19,7 @@
 package org.sleuthkit.autopsy.centralrepository.optionspanel;
 
 import java.awt.Component;
+import java.awt.Dialog;
 import java.util.List;
 import java.util.logging.Level;
 import javax.swing.DefaultListCellRenderer;
@@ -51,12 +52,41 @@ public final class ManageOrganizationsDialog extends JDialog {
 
     @Messages({"ManageOrganizationsDialog.title.text=Manage Organizations"})
     /**
-     * Creates new form ManageOrganizationsPanel
+     * Creates new form ManageOrganizationsPanel.
+     * @param parent      The dialog parent.
      */
-    public ManageOrganizationsDialog() {
-        super((JFrame) WindowManager.getDefault().getMainWindow(),
+    public ManageOrganizationsDialog(Dialog parent) {
+        super(parent,
                 Bundle.ManageOrganizationsDialog_title_text(),
                 true); // NON-NLS
+        init();
+    }
+    
+    
+    /**
+     * Creates new form ManageOrganizationsPanel.
+     * @param parent        The JFrame parent.
+     */
+    public ManageOrganizationsDialog(JFrame parent) {
+        super(parent,
+                Bundle.ManageOrganizationsDialog_title_text(),
+                true); // NON-NLS
+        init();
+    }
+    
+    
+    /**
+     * Creates new form ManageOrganizationsPanel.
+     */
+    public ManageOrganizationsDialog() {
+        this((JFrame) WindowManager.getDefault().getMainWindow());
+    }
+    
+    
+    /**
+     * To be run as a part of constructor initialization.
+     */
+    private void init() {
         initComponents();
         try {
             this.dbManager = CentralRepository.getInstance();
@@ -85,6 +115,7 @@ public final class ManageOrganizationsDialog extends JDialog {
     private void display() {
         this.setLocationRelativeTo(WindowManager.getDefault().getMainWindow());
         setVisible(true);
+        toFront();
     }
 
     private void populateListAndSelect(CentralRepoOrganization selected) throws CentralRepoException {