Changeset 5519

Timestamp:

08/05/14 09:00:34 (10 years ago)

Author:

Twan Goosen

Message:

Fixed issue with editing creators

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui

Files:

• dialog/ModalEditDialogBase.java (modified) (2 diffs)
• wizard/CreateVirtualCollectionWizard.java (modified) (5 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/dialog/ModalEditDialogBase.java

@@ -129 +129 @@
         close(target);
         final T object = form.getModelObject();
-        form.setModelObject(null);
         onSubmit(target, object);
     }
@@ -136 +135 @@
         close(target);
         final T object = form.getModelObject();
-        form.setModelObject(null);
         onCancel(target, object);
     }

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/wizard/CreateVirtualCollectionWizard.java

@@ -405 +405 @@
                             @Override
                             public void onClick(AjaxRequestTarget target) {
-                                    movingResource.setObject(model.getObject());
+                                movingResource.setObject(model.getObject());
                                 target.addComponent(resourcesContainer);
                             }
@@ -417 +417 @@
                         };
                 add(moveLink);
-                
+
                 final AjaxLink<Resource> cancelLink
                         = new AjaxLink<Resource>("cancel") {
@@ -423 +423 @@
                             @Override
                             public void onClick(AjaxRequestTarget target) {
-                                    movingResource.setObject(null);
+                                movingResource.setObject(null);
                                 target.addComponent(resourcesContainer);
                             }
@@ -429 +429 @@
                             @Override
                             protected void onConfigure() {
-                                    // only allow cancelling resource being moved
-                                    setVisible(model.getObject().equals(movingResource.getObject())
+                                // only allow cancelling resource being moved
+                                setVisible(model.getObject().equals(movingResource.getObject())
                                 );
                             }
@@ -436 +436 @@
                         };
                 add(cancelLink);
-                
+
                 final AjaxLink<Resource> targetLink
                         = new AjaxLink<Resource>("target") {