From a465d8920f7692d34e61a4bba76f19bb0fcfeb85 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 24 May 2013 08:53:52 +0000
Subject: [PATCH] SP-629 BIS-398: When an error occurs during a property type
assignment the property type pop up don't closes anymore.
SVN: 29205
---
.../web/client/application/ui/amc/AddPropertyTypeDialog.java | 3 +--
.../ui/property_type/PropertyTypeAssignmentGrid.java | 5 +++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java
index ce273b205ea..7d3a54dc48c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/amc/AddPropertyTypeDialog.java
@@ -489,8 +489,7 @@ public class AddPropertyTypeDialog extends AbstractRegistrationDialog
propertyType = propertyTypeSelectionWidget.tryGetSelectedPropertyType();
}
- inMemoryGridCallback.callback(isExixtingPropertyType, propertyType, assignment);
- this.close();
+ inMemoryGridCallback.callback(isExixtingPropertyType, propertyType, assignment, this);
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
index 31cb7d783c3..86a9ca40167 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/property_type/PropertyTypeAssignmentGrid.java
@@ -370,7 +370,7 @@ public class PropertyTypeAssignmentGrid extends TypedTableGrid<EntityTypePropert
public class InMemoryGridAddCallback
{
- public void callback(boolean isExixtingPropertyType, PropertyType propertyType, NewETPTAssignment assignment)
+ public void callback(boolean isExixtingPropertyType, PropertyType propertyType, NewETPTAssignment assignment, AddPropertyTypeDialog dialog)
{
NewPTNewAssigment newPTNewAssigment = new NewPTNewAssigment();
newPTNewAssigment.setExistingPropertyType(isExixtingPropertyType);
@@ -379,11 +379,12 @@ public class PropertyTypeAssignmentGrid extends TypedTableGrid<EntityTypePropert
try
{
newTypeWithAssigments.refreshOrderAdd(newPTNewAssigment);
+ dialog.close();
+ refresh();
} catch (Exception ex)
{
MessageBox.alert("Error", ex.getMessage(), null);
}
- refresh();
}
}
--
GitLab