modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 56 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java | 2 2 files changed, 30 insertions(+), 28 deletions(-)
New commits: commit e0696937a8a649f14808417b2538229fe41d1616 Author: Jay Shaughnessy jshaughn@redhat.com Date: Wed Aug 21 16:51:44 2013 -0400
Bundle create wizard, fix issue where "token" workflow generated an exception in the message center.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java index 3e19936..f86adff 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java @@ -336,35 +336,37 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
private void processUpload() { if (Boolean.TRUE.equals(uploadDistroForm.getUploadResult())) { - int bvId = uploadDistroForm.getBundleVersionId(); - BundleVersionCriteria criteria = new BundleVersionCriteria(); - criteria.addFilterId(bvId); - criteria.fetchBundle(true); - BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); - bundleServer.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() { - @Override - public void onSuccess(PageList<BundleVersion> result) { - BundleVersion bv = result.get(0); - CoreGUI.getMessageCenter().notify( - new Message(MSG.view_bundle_createWizard_createSuccessful(bv.getName(), bv.getVersion()), - Message.Severity.Info)); - wizard.setBundleVersion(bv); - setButtonsDisableMode(false); - incrementStep(); // go to the next step - } + if (null != uploadDistroForm.getCreateInitialBundleVersionToken()) { + handleBundleNotFoundException(new BundleNotFoundException( + uploadDistroForm.getCreateInitialBundleVersionToken()));
- @Override - public void onFailure(Throwable caught) { - wizard.getView().showMessage(caught.getMessage()); - CoreGUI.getErrorHandler().handleError(MSG.view_bundle_createWizard_createFailure(), caught); - wizard.setBundleVersion(null); - setButtonsDisableMode(false); - } - }); - } else if (null != uploadDistroForm.getCreateInitialBundleVersionToken()) { - handleBundleNotFoundException(new BundleNotFoundException( - uploadDistroForm.getCreateInitialBundleVersionToken())); + } else { + int bvId = uploadDistroForm.getBundleVersionId(); + BundleVersionCriteria criteria = new BundleVersionCriteria(); + criteria.addFilterId(bvId); + criteria.fetchBundle(true); + BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(); + bundleServer.findBundleVersionsByCriteria(criteria, new AsyncCallback<PageList<BundleVersion>>() { + @Override + public void onSuccess(PageList<BundleVersion> result) { + BundleVersion bv = result.get(0); + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_bundle_createWizard_createSuccessful(bv.getName(), bv.getVersion()), + Message.Severity.Info)); + wizard.setBundleVersion(bv); + setButtonsDisableMode(false); + incrementStep(); // go to the next step + }
+ @Override + public void onFailure(Throwable caught) { + wizard.getView().showMessage(caught.getMessage()); + CoreGUI.getErrorHandler().handleError(MSG.view_bundle_createWizard_createFailure(), caught); + wizard.setBundleVersion(null); + setButtonsDisableMode(false); + } + }); + } } else { String errorMessage = uploadDistroForm.getUploadError(); handleUploadError(errorMessage, true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java index e57b852..c37dd36 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java @@ -57,7 +57,7 @@ public class BundleDistributionFileUploadForm extends FileUploadForm {
protected boolean processSubmitCompleteResults(String submitCompleteEventResults) { bundleVersionId = parseResponse(submitCompleteEventResults); - return (bundleVersionId > 0); + return (bundleVersionId > 0 || null != createInitialBundleVersionToken); }
private int parseResponse(String results) {
rhq-commits@lists.fedorahosted.org