SSDM-4187: dataset-uploader plugin refactored as a preparation for handling project samples.

SVN: 37616

openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/index.html

@@ -66,12 +66,14 @@
         var context = new openbisWebAppContext();
         openBIS.useSession(context.getSessionId());
         
-        var isSharedSample = context.getEntityIdentifier().split("/").length === 2;
-        if(context.getEntityKind() === "SAMPLE" && isSharedSample) { //Is sample
+        var isSample = context.getEntityKind() === "SAMPLE";
+        var identifier = context.getEntityIdentifier();
+        var isSharedSample = identifier.split("/").length === 2;
+        if (isSample && isSharedSample) {
         	$("#dataset-uploader-form").append("This sample does not belong to a space and therefore cannot hold datasets.");
-        } else { //Is experiment
+        } else { 
         	var datasetFormController = new DataSetFormController();
-        	datasetFormController.init($("#dataset-uploader-form"), { identifier : context.getEntityIdentifier() });
+        	datasetFormController.init($("#dataset-uploader-form"), {identifier : identifier, isSample : isSample});
         }
 	});
 	</script>

openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormController.js

@@ -114,9 +114,9 @@ function DataSetFormController() {
 		};
 		
 		var sampleOrExperimentIdentifier = dataSetFormModel.sampleOrExperiment.identifier;
-		if(sampleOrExperimentIdentifier.split("/").length === 3) {
+		if (dataSetFormModel.sampleOrExperiment.isSample) {
 			parameters["sampleIdentifier"] = sampleOrExperimentIdentifier;
-		} else if(sampleOrExperimentIdentifier.split("/").length === 4) {
+		} else {
 			parameters["experimentIdentifier"] = sampleOrExperimentIdentifier;
 		}
 			

openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/as/webapps/dataset-uploader/html/js/DataSetFormView.js

@@ -52,7 +52,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 		$dataSetTypeFieldSet.append($dataSetTypeDropDown);
 		
 		var owner = dataSetFormModel.sampleOrExperiment.identifier;
-		var ownerLabel = (owner.split("/").length === 3) ? entityTypes.sample : entityTypes.experiment;
+		var ownerLabel = dataSetFormModel.sampleOrExperiment.isSample ? entityTypes.sample : entityTypes.experiment;
 		$dataSetTypeFieldSet.append(FormUtil.getFieldForTextWithLabel(owner, ownerLabel));
 		
 		//