Fix for ChooseTypePanel - when assigning multiple roles, the deletion…

… of tenant attribute in one role cause next assignment to crash.
Evolveum · Oct 3, 2014 · e35365c · e35365c
1 parent f26ed43
commit e35365c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...in/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java b/...in/java/com/evolveum/midpoint/web/page/admin/configuration/component/ChooseTypePanel.java
@@ -69,13 +69,15 @@ public String getObject(){
         name.setOutputMarkupId(true);
 
         AjaxLink choose = new AjaxLink(ID_LINK_CHOOSE) {
+
             @Override
             public void onClick(AjaxRequestTarget target) {
                  changeOptionPerformed(target);
             }
         };
 
         AjaxLink remove = new AjaxLink(ID_LINK_REMOVE) {
+
             @Override
             public void onClick(AjaxRequestTarget target) {
                 setToDefault();
@@ -91,7 +93,7 @@ public void onClick(AjaxRequestTarget target) {
     }
 
     private void initDialog(){
-        ModalWindow dialog = new ChooseTypeDialog(MODAL_ID_SHOW_CHOOSE_OPTIONS, getModel().getObject().getType()){
+        ModalWindow dialog = new ChooseTypeDialog(MODAL_ID_SHOW_CHOOSE_OPTIONS, getObjectTypeClass()){
 
             @Override
             protected void chooseOperationPerformed(AjaxRequestTarget target, ObjectType object){
@@ -151,7 +153,13 @@ private void changeOptionPerformed(AjaxRequestTarget target){
     }
 
     private void setToDefault(){
-        getModel().setObject(new ObjectViewDto());
+        ObjectViewDto dto = new ObjectViewDto();
+        dto.setType(getObjectTypeClass());
+        getModel().setObject(dto);
+    }
+
+    private Class<T> getObjectTypeClass(){
+        return getModel().getObject().getType();
     }
 
     public StringResourceModel createStringResource(String resourceKey, Object... objects) {