From e5e6baa55e60fbefc9384928ffb353c4f9cb7a2e Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Fri, 13 Nov 2009 08:27:27 +0000
Subject: [PATCH] [LMS-1236] fixed ('Refreshing sample type combo box')
SVN: 13370
---
.../application/ui/data/DataSetTypeSelectionWidget.java | 8 +++++++-
.../ui/experiment/ExperimentTypeSelectionWidget.java | 8 +++++++-
.../ui/material/MaterialTypeSelectionWidget.java | 8 +++++++-
.../application/ui/sample/SampleTypeSelectionWidget.java | 8 +++++++-
4 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeSelectionWidget.java
index 5d97708a220..2b2f126ed9b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/data/DataSetTypeSelectionWidget.java
@@ -16,6 +16,9 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.data;
+import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
+import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.edit;
+
import java.util.List;
import com.extjs.gxt.ui.client.widget.form.ComboBox;
@@ -77,6 +80,9 @@ public final class DataSetTypeSelectionWidget extends DropDownList<DataSetTypeMo
public DatabaseModificationKind[] getRelevantModifications()
{
- return DatabaseModificationKind.any(ObjectKind.DATASET_TYPE);
+ return new DatabaseModificationKind[]
+ { createOrDelete(ObjectKind.DATASET_TYPE), edit(ObjectKind.DATASET_TYPE),
+ createOrDelete(ObjectKind.PROPERTY_TYPE_ASSIGNMENT),
+ edit(ObjectKind.PROPERTY_TYPE_ASSIGNMENT) };
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeSelectionWidget.java
index 0d399050a8f..8ab25041d32 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/experiment/ExperimentTypeSelectionWidget.java
@@ -16,6 +16,9 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experiment;
+import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
+import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.edit;
+
import java.util.List;
import com.extjs.gxt.ui.client.widget.form.ComboBox;
@@ -88,7 +91,10 @@ public final class ExperimentTypeSelectionWidget extends
public DatabaseModificationKind[] getRelevantModifications()
{
- return DatabaseModificationKind.any(ObjectKind.EXPERIMENT_TYPE);
+ return new DatabaseModificationKind[]
+ { createOrDelete(ObjectKind.EXPERIMENT_TYPE), edit(ObjectKind.EXPERIMENT_TYPE),
+ createOrDelete(ObjectKind.PROPERTY_TYPE_ASSIGNMENT),
+ edit(ObjectKind.PROPERTY_TYPE_ASSIGNMENT) };
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeSelectionWidget.java
index 2eab360a923..03a2a57a058 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialTypeSelectionWidget.java
@@ -16,6 +16,9 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.material;
+import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
+import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.edit;
+
import java.util.List;
import com.extjs.gxt.ui.client.widget.form.ComboBox;
@@ -130,6 +133,9 @@ public final class MaterialTypeSelectionWidget extends
public DatabaseModificationKind[] getRelevantModifications()
{
- return DatabaseModificationKind.any(ObjectKind.MATERIAL_TYPE);
+ return new DatabaseModificationKind[]
+ { createOrDelete(ObjectKind.MATERIAL_TYPE), edit(ObjectKind.MATERIAL_TYPE),
+ createOrDelete(ObjectKind.PROPERTY_TYPE_ASSIGNMENT),
+ edit(ObjectKind.PROPERTY_TYPE_ASSIGNMENT) };
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeSelectionWidget.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeSelectionWidget.java
index 3775416eb4c..8c08e6a4fce 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeSelectionWidget.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleTypeSelectionWidget.java
@@ -16,6 +16,9 @@
package ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.sample;
+import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.createOrDelete;
+import static ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.edit;
+
import java.util.List;
import com.extjs.gxt.ui.client.widget.form.ComboBox;
@@ -110,6 +113,9 @@ public final class SampleTypeSelectionWidget extends DropDownList<SampleTypeMode
public DatabaseModificationKind[] getRelevantModifications()
{
- return DatabaseModificationKind.any(ObjectKind.SAMPLE_TYPE);
+ return new DatabaseModificationKind[]
+ { createOrDelete(ObjectKind.SAMPLE_TYPE), edit(ObjectKind.SAMPLE_TYPE),
+ createOrDelete(ObjectKind.PROPERTY_TYPE_ASSIGNMENT),
+ edit(ObjectKind.PROPERTY_TYPE_ASSIGNMENT) };
}
}
--
GitLab