From 20293a552c3edd86f486faec03e7ba17531b5215 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 24 Jun 2009 13:13:05 +0000
Subject: [PATCH] fixed attachments in sample edition
SVN: 11559
---
.../sample/GenericSampleEditForm.java | 21 +++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
index b241777c5cb..37ce976c8c6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleEditForm.java
@@ -25,7 +25,7 @@ import java.util.List;
import com.extjs.gxt.ui.client.Events;
import com.extjs.gxt.ui.client.event.ButtonEvent;
import com.extjs.gxt.ui.client.event.SelectionListener;
-import com.extjs.gxt.ui.client.widget.form.FileUploadField;
+import com.extjs.gxt.ui.client.widget.form.FormPanel;
import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAsyncCallback;
@@ -150,7 +150,6 @@ public final class GenericSampleEditForm extends
return editor;
}
- @SuppressWarnings("unchecked")
@Override
protected List<DatabaseModificationAwareField<?>> getEntitySpecificFormFields()
{
@@ -160,13 +159,23 @@ public final class GenericSampleEditForm extends
{
fields.add(wrapUnaware(experimentFieldOrNull.getField()));
}
- for (FileUploadField f : attachmentsManager.getFields())
- {
- fields.add(DatabaseModificationAwareField.wrapUnaware(f));
- }
return fields;
}
+ @Override
+ protected void addFormFieldsToPanel(FormPanel panel)
+ {
+ super.addFormFieldsToPanel(panel);
+ attachmentsManager.addAttachmentFieldSetsToPanel(panel);
+ }
+
+ @Override
+ protected void resetPanel()
+ {
+ super.resetPanel();
+ attachmentsManager.resetAttachmentFieldSetsInPanel(formPanel);
+ }
+
private static boolean canAttachToExperiment(Sample sample)
{
return sample.getGroup() != null;
--
GitLab