[LMS-1906] disable save+upload

SVN: 18880

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java

@@ -234,7 +234,7 @@ public abstract class AbstractRegistrationForm extends ContentPanel
         protected AbstractRegistrationCallback(final IViewContext<?> viewContext)
         {
             super(viewContext, new InfoBoxCallbackListener<T>(infoBox));
-            saveButton.disable();
+            setUploadEnabled(false);
         }
 
         //
@@ -254,7 +254,6 @@ public abstract class AbstractRegistrationForm extends ContentPanel
                 // server
             }
             setUploadEnabled(true);
-            saveButton.enable();
         }
 
         protected abstract String createSuccessfullRegistrationInfo(T result);
@@ -263,7 +262,6 @@ public abstract class AbstractRegistrationForm extends ContentPanel
         public final void finishOnFailure(final Throwable caught)
         {
             setUploadEnabled(true);
-            saveButton.enable();
         }
 
     }

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/AbstractGenericSampleRegisterEditForm.java

@@ -99,6 +99,8 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
 
     private String openUploadWindowWithSampleOrNull = null;
 
+    private Button saveUploadButton;
+
     protected AbstractGenericSampleRegisterEditForm(
             IViewContext<IGenericClientServiceAsync> viewContext, ActionContext actionContext)
     {
@@ -116,6 +118,7 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
         sesionKeys.add(attachmentsSessionKey);
         addUploadFeatures(sesionKeys);
         extractInitialValues(actionContext);
+        saveUploadButton = createSaveAndUploadButton();
         boolean cifexConfigured =
                 StringUtils
                         .isBlank(viewContext.getModel().getApplicationInfo().getCifexRecipient()) == false
@@ -123,7 +126,7 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
                                 .getCIFEXURL()) == false;
         if (cifexConfigured)
         {
-            formPanel.addButton(createSaveAndUploadButton());
+            formPanel.addButton(saveUploadButton);
         }
     }
 
@@ -151,6 +154,13 @@ abstract public class AbstractGenericSampleRegisterEditForm extends
                 viewContext.getCommonViewContext());
     }
 
+    @Override
+    protected void setUploadEnabled(boolean enabled)
+    {
+        super.setUploadEnabled(enabled);
+        saveUploadButton.setEnabled(enabled);
+    }
+
     private void redefineSaveListeners()
     {
         saveButton.removeAllListeners();