From af79f1b27edd49efd24ee6a4b7d3fc7c73778eb3 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 3 Jun 2014 11:55:08 +0000
Subject: [PATCH] SSDM-306: Don't show generate children for inventory items.
SVN: 31638
---
.../newbrowser/html/js/views/SampleForm.js | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
index a0c24deaf4e..42cb74d8dbb 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
@@ -80,9 +80,13 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
localReference.repaint();
//Check Mode
- if(localReference.mode === SampleFormMode.CREATE) {
- //Set the default space or project if available
- $("#sampleSpaceProject").val();
+ if(localReference.mode === SampleFormMode.CREATE) {
+ //Set the default space or project if available
+ $("#sampleSpaceProject").val();
+
+ if(localReference.isELNSubExperiment) {
+ $("#sampleSpaceProject").val(localReference.experimentIdentifier);
+ } else {
//Check if default space is available
var defaultSpace = localReference.profile.displaySettings.spaceCode;
if(defaultSpace !== null) {
@@ -93,9 +97,11 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
if(spaceForSampleType !== null) {
$("#sampleSpaceProject").val(spaceForSampleType);
}
- localReference.serverFacade.generateCode(sampleType.codePrefix, function(data) {
- $("#sampleCode").val(data.result);
- });
+ }
+
+ localReference.serverFacade.generateCode(sampleType.codePrefix, function(data) {
+ $("#sampleCode").val(data.result);
+ });
} else if(localReference.mode === SampleFormMode.EDIT || localReference.mode === SampleFormMode.VIEW) {
var dataStoreURL = null;
if(localReference.profile.allDataStores.length > 0) {
--
GitLab