BZ1008369 - Organizational Unit Manager: group appears not to be deleted

(cherry picked from commit a26ecfb)
kiegroup · Sep 23, 2013 · e030374 · e030374
1 parent fc4402e
commit e030374
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/...n/screens/organizationalunit/manager/client/editor/OrganizationalUnitManagerViewImpl.java b/...n/screens/organizationalunit/manager/client/editor/OrganizationalUnitManagerViewImpl.java
@@ -144,29 +144,32 @@ public void setOrganizationalUnits( final Collection<OrganizationalUnit> organiz
         final OrganizationalUnit selectedOrganizationalUnit = ( selectedOrganizationalUnitIndex < 0 ? null : sortedOrganizationalUnits.get( selectedOrganizationalUnitIndex ) );
 
         lstOrganizationalUnits.clear();
+        sortedOrganizationalUnits.clear();
         if ( !( organizationalUnits == null || organizationalUnits.isEmpty() ) ) {
             lstOrganizationalUnits.setEnabled( true );
             sortedOrganizationalUnits = sortOrganizationalUnits( organizationalUnits );
             for ( OrganizationalUnit group : sortedOrganizationalUnits ) {
                 lstOrganizationalUnits.addItem( group.getName() );
             }
+
         } else {
             lstOrganizationalUnits.setEnabled( false );
             lstOrganizationalUnits.addItem( OrganizationalUnitManagerConstants.INSTANCE.NoOrganizationalUnitsDefined() );
         }
 
-        if ( selectedOrganizationalUnit == null ) {
+        if ( sortedOrganizationalUnits.contains( selectedOrganizationalUnit ) ) {
+            lstOrganizationalUnits.setSelectedIndex( sortedOrganizationalUnits.indexOf( selectedOrganizationalUnit ) );
+            presenter.organizationalUnitSelected( selectedOrganizationalUnit );
+            btnDeleteOrganizationalUnit.setEnabled( true );
+
+        } else {
             lstOrganizationalUnitRepositories.clear();
             lstOrganizationalUnitRepositories.setEnabled( false );
             lstOrganizationalUnitRepositories.addItem( OrganizationalUnitManagerConstants.INSTANCE.NoOrganizationalUnitSelected() );
             lstAvailableRepositories.clear();
             lstAvailableRepositories.setEnabled( false );
             lstAvailableRepositories.addItem( OrganizationalUnitManagerConstants.INSTANCE.NoOrganizationalUnitSelected() );
             btnDeleteOrganizationalUnit.setEnabled( false );
-        } else {
-            lstOrganizationalUnits.setSelectedIndex( sortedOrganizationalUnits.indexOf( selectedOrganizationalUnit ) );
-            presenter.organizationalUnitSelected( selectedOrganizationalUnit );
-            btnDeleteOrganizationalUnit.setEnabled( true );
         }
 
     }