SSDM-5706 : Showing information about the dataset owner when showing it on the...

SSDM-5706 : Showing information about the dataset owner when showing it on the entity search dropdown.

SVN: 38912

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js

@@ -867,9 +867,15 @@ function ServerFacade(openbisServer) {
 					}
 					if(fetchOptions.withSample) {
 						fetchOptions.withSample();
+						if(advancedFetchOptions && advancedFetchOptions.withSampleProperties) {
+							fetchOptions.withSample().withProperties();
+						}
 					}
 					if(fetchOptions.withExperiment) {
 						fetchOptions.withExperiment();
+						if(advancedFetchOptions && advancedFetchOptions.withExperimentProperties) {
+							fetchOptions.withExperiment().withProperties();
+						}
 					}
 					if(fetchOptions.withTags) {
 						fetchOptions.withTags();

openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/AdvancedEntitySearchDropdown.js

@@ -131,6 +131,16 @@ function AdvancedEntitySearchDropdown(	isMultiple,
 		} else {
 			text = entity.code;
 		}
+		
+		if(entity["@type"] === "as.dto.dataset.DataSet") {
+			if(entity.sample) {
+				text += " " + ELNDictionary.Sample + " [" + getDisplayName(entity.sample) + "]";
+			}
+			
+			if(entity.experiment) {
+				text += " " + ELNDictionary.getExperimentDualName() + " [" + getDisplayName(entity.experiment) + "]";
+			}
+		}
 		return text;
 	}
 	
@@ -172,7 +182,7 @@ function AdvancedEntitySearchDropdown(	isMultiple,
 						}
 					};
 		
-		mainController.serverFacade.searchForDataSetsAdvanced(criteria, null, function(results) { results.type = "DataSets"; action(results) });
+		mainController.serverFacade.searchForDataSetsAdvanced(criteria, { withSampleProperties : true, withExperimentProperties : true }, function(results) { results.type = "DataSets"; action(results) });
 	}
 	
 	//