modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java | 2 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java | 14 +++++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java | 2 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java | 4 +- 4 files changed, 14 insertions(+), 8 deletions(-)
New commits: commit bcfc55f8b74f8884abcf4f3dd96b2c2dfe0ef0a7 Author: Jay Shaughnessy jshaughn@redhat.com Date: Fri Nov 19 11:31:41 2010 -0500
A HiddenItem FormItem now requires that its value be set via setDefaultValue() as opposed to setValue(). With the latter signature your getString() (for example) will now return "". This had completely broken our file upload mechanism (bundles, etc).
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java index 73c3e2e..4957d90 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java @@ -48,7 +48,7 @@ public class BundleFileUploadForm extends FileUploadForm { List<FormItem> onDrawItems = super.getOnDrawItems();
HiddenItem bundleVersionIdField = new HiddenItem("bundleVersionId"); - bundleVersionIdField.setValue(this.bundleVersion.getId()); + bundleVersionIdField.setDefaultValue(this.bundleVersion.getId());
onDrawItems.add(bundleVersionIdField); return onDrawItems; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java index bf834d8..62aba36 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java @@ -163,15 +163,15 @@ public class FileUploadForm extends DynamicCallbackForm { List<FormItem> onDrawItems = new ArrayList<FormItem>();
HiddenItem sessionIdField = new HiddenItem("sessionid"); - sessionIdField.setValue(UserSessionManager.getSessionSubject().getSessionId().intValue()); + sessionIdField.setDefaultValue(UserSessionManager.getSessionSubject().getSessionId().intValue()); onDrawItems.add(sessionIdField);
HiddenItem nameField = new HiddenItem("name"); - nameField.setValue(this.name); + nameField.setDefaultValue(this.name); onDrawItems.add(nameField);
HiddenItem versionField = new HiddenItem("version"); - versionField.setValue(version); + versionField.setDefaultValue(version); onDrawItems.add(versionField);
fileUploadItem = new UploadItem("fileUploadItem", name); @@ -264,7 +264,13 @@ public class FileUploadForm extends DynamicCallbackForm { super.onDraw();
List<FormItem> onDrawItems = getOnDrawItems(); - setNumCols(onDrawItems.size()); + int numCols = 0; + for (FormItem fi : onDrawItems) { + if (!(fi instanceof HiddenItem)) { + ++numCols; + } + } + setNumCols(numCols); setItems(onDrawItems.toArray(new FormItem[onDrawItems.size()]));
// push the form handler so it executes first if the form creator has also added a handler diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java index 80019f2..bd41379 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java @@ -68,7 +68,7 @@ public class PackageVersionFileUploadForm extends FileUploadForm {
if (null != archId) { HiddenItem archIdField = new HiddenItem("archId"); - archIdField.setValue(archId); + archIdField.setDefaultValue(archId); onDrawItems.add(archIdField); }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java index 93282ee..e91a4a2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/TextFileRetrieverForm.java @@ -56,10 +56,10 @@ public class TextFileRetrieverForm extends DynamicCallbackForm { // the "retrieve" indicates to FileUploadServlet to expect a single text file and return its contents // in the response. HiddenItem retrieveField = new HiddenItem("retrieve"); - retrieveField.setValue(true); + retrieveField.setDefaultValue(true);
HiddenItem sessionIdField = new HiddenItem("sessionid"); - sessionIdField.setValue(UserSessionManager.getSessionSubject().getSessionId().intValue()); + sessionIdField.setDefaultValue(UserSessionManager.getSessionSubject().getSessionId().intValue());
setNumCols(4);