From 2952b8258ab0f0fbe272b26c2eb0294e8a595731 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Thu, 11 Aug 2016 14:54:56 +0000
Subject: [PATCH] SSDM-3888: Renaming lefts found during testing
SVN: 36900
---
.../eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js | 2 +-
.../html/js/views/AdvancedSearch/AdvancedSearchView.js | 6 ++++++
.../eln-lims/html/js/views/DataSetForm/DataSetFormView.js | 2 +-
.../html/js/views/ExperimentForm/ExperimentFormView.js | 2 +-
.../eln-lims/html/js/views/SampleForm/SampleFormView.js | 2 +-
.../eln-lims/html/js/views/SampleTable/SampleTableView.js | 2 +-
6 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index b9ac31f53e0..9004a96da0a 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -224,7 +224,7 @@ var FormUtil = new function() {
$component.attr('required', '');
}
- $component.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select a " + ELNDictionary.sample + " type"));
+ $component.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select an " + ELNDictionary.sample + " type"));
for(var i = 0; i < sampleTypes.length; i++) {
var sampleType = sampleTypes[i];
if(profile.isSampleTypeHidden(sampleType.code)) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index 4c992685c91..4615fc388e9 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -584,6 +584,12 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
//properties
rowData.entityKind = entity["@type"].substring(entity["@type"].lastIndexOf(".") + 1, entity["@type"].length);
+ if(rowData.entityKind === "Sample") {
+ rowData.entityKind = ELNDictionary.Sample;
+ } else if(rowData.entityKind === "Experiment") {
+ rowData.entityKind = ELNDictionary.getExperimentKindName(entity.identifier.identifier);
+ }
+
if(entity.experiment) {
rowData.experiment = entity.experiment.code;
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
index 75934aa7f17..7b659ab48b6 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
@@ -143,7 +143,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
$dataSetTypeFieldSet.append($dataSetCodeLabel);
}
- var ownerName = "Sample";
+ var ownerName = ELNDictionary.Sample;
var owner = this._dataSetFormModel.sample.identifier;
if(this._dataSetFormModel.sample.experimentIdentifierOrNull) {
owner = this._dataSetFormModel.sample.experimentIdentifierOrNull + "/" + this._dataSetFormModel.sample.code;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
index 20e7a51af4f..d5483c64bd2 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentForm/ExperimentFormView.js
@@ -146,7 +146,7 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
//Sample List Container
if(this._experimentFormModel.mode !== FormMode.CREATE) {
- $formColumn.append($("<legend>").append("Samples"));
+ $formColumn.append($("<legend>").append(ELNDictionary.Samples));
var sampleListContainer = $("<div>");
$formColumn.append(sampleListContainer);
var sampleList = new SampleTableController(this._experimentFormController, null, this._experimentFormModel.experiment.identifier, null, null, this._experimentFormModel.experiment);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
index 2502054fba7..b5b4f0aa2f3 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormView.js
@@ -582,7 +582,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
//
$formColumn.append($("<legend>").append("Identification Info"));
$formColumn.append(FormUtil.getFieldForLabelWithText("Type", this._sampleFormModel.sample.sampleTypeCode));
- $formColumn.append(FormUtil.getFieldForLabelWithText("Experiment", this._sampleFormModel.sample.experimentIdentifierOrNull));
+ $formColumn.append(FormUtil.getFieldForLabelWithText(ELNDictionary.getExperimentKindName("/" + this._sampleFormModel.sample.spaceCode), this._sampleFormModel.sample.experimentIdentifierOrNull));
//
// Identification Info - Code
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
index cef4bf7cafe..2a804de30e5 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
@@ -140,7 +140,7 @@ function SampleTableView(sampleTableController, sampleTableModel) {
this._getLoadedSampleTypesDropdown = function() {
var _this = this;
var $sampleTypesSelector = $('<select>', { 'id' : 'sampleTypeCodesToShow', class : 'form-control' });
- $sampleTypesSelector.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select a " + ELNDictionary.sample + " type"));
+ $sampleTypesSelector.append($("<option>").attr('value', '').attr('selected', '').attr('disabled', '').text("Select an " + ELNDictionary.sample + " type"));
for(sampleTypeCode in this._sampleTableModel.sampleTypes) {
$sampleTypesSelector.append($('<option>', { 'value' : sampleTypeCode }).text(sampleTypeCode));
}
--
GitLab