From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 26 Nov 2007 09:44:31 +0000 (+0000)
Subject: fixes #1134
X-Git-Tag: 6.7.0.beta1~5472
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d1a92955588b35d03887626aa9a467833ea77f5c;p=vaadin-framework.git

fixes #1134

svn changeset:2945/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
index aef421a983..60fd35cc37 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
@@ -50,6 +50,8 @@ public class IUpload extends FormPanel implements Paintable, ClickListener,
      */
     private boolean submitted = false;
 
+    private boolean enabled;
+
     public IUpload() {
         super();
         setEncoding(FormPanel.ENCODING_MULTIPART);
@@ -76,6 +78,12 @@ public class IUpload extends FormPanel implements Paintable, ClickListener,
         submitButton.setText(uidl.getStringAttribute("buttoncaption"));
         fu.setName(paintableId + "_file");
 
+        if (uidl.hasAttribute("disabled")) {
+            disableUpload();
+        } else if (uidl.getBooleanAttribute("state")) {
+            enableUploaod();
+        }
+
     }
 
     public void onClick(Widget sender) {
@@ -83,10 +91,12 @@ public class IUpload extends FormPanel implements Paintable, ClickListener,
     }
 
     public void onSubmit(FormSubmitEvent event) {
-        if (fu.getFilename().length() == 0 || submitted) {
+        if (fu.getFilename().length() == 0 || submitted || !enabled) {
             event.setCancelled(true);
-            ApplicationConnection.getConsole().log(
-                    "Submit cancelled (no file or already submitted)");
+            ApplicationConnection
+                    .getConsole()
+                    .log(
+                            "Submit cancelled (disabled, no file or already submitted)");
             return;
         }
         submitted = true;
@@ -109,11 +119,13 @@ public class IUpload extends FormPanel implements Paintable, ClickListener,
     protected void disableUpload() {
         submitButton.setEnabled(false);
         fu.setVisible(false);
+        enabled = false;
     }
 
     protected void enableUploaod() {
         submitButton.setEnabled(true);
         fu.setVisible(true);
+        enabled = true;
     }
 
     public void onSubmitComplete(FormSubmitCompleteEvent event) {